From 593c8a483846647a2bd5e00e84a5f2d237117b49 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Fri, 3 Feb 2012 23:24:32 +0100
Subject: [PATCH] Correctly register objects.

---
 bindings/python/mapnik/__init__.py        | 5 +++++
 bindings/python/mapnik_text_placement.cpp | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bindings/python/mapnik/__init__.py b/bindings/python/mapnik/__init__.py
index f646133cb..d093c78a8 100644
--- a/bindings/python/mapnik/__init__.py
+++ b/bindings/python/mapnik/__init__.py
@@ -598,6 +598,7 @@ register_fonts()
 # and ensure correct documentation processing
 __all__ = [
     # classes
+    'CharProperties',
     'Color',
     'Coord',
     'Palette',
@@ -610,6 +611,7 @@ __all__ = [
     'Featureset',
     'FontEngine',
     'FontSet',
+    'FormatingNode',
     'Geometry2d',
     'Image',
     'ImageView',
@@ -640,7 +642,10 @@ __all__ = [
     'Style',
     'Symbolizer',
     'Symbolizers',
+    'TextPlacements',
+    'TextPlacementInfo',
     'TextSymbolizer',
+    'TextSymbolizerProperties',
     'ViewTransform',
     # enums
     'aspect_fix_mode',
diff --git a/bindings/python/mapnik_text_placement.cpp b/bindings/python/mapnik_text_placement.cpp
index 3d758861b..87ef68055 100644
--- a/bindings/python/mapnik_text_placement.cpp
+++ b/bindings/python/mapnik_text_placement.cpp
@@ -175,13 +175,14 @@ void export_text_placement()
         /* from_xml, to_xml operate on mapnik's internal XML tree and don't make sense in python.*/
         ;
 
-    class_<TextPlacementsWrap, boost::noncopyable>("TextPlacements")
+    class_<TextPlacementsWrap, boost::shared_ptr<TextPlacementsWrap>, boost::noncopyable>("TextPlacements")
         .def_readwrite("defaults", &text_placements::properties)
         .def("get_placement_info", pure_virtual(&text_placements::get_placement_info))
         /* TODO: get_all expressions. */
         ;
+    register_ptr_to_python<boost::shared_ptr<text_placements> >();
 
-    class_<TextPlacementInfoWrap, boost::noncopyable>("TextPlacementInfo",
+    class_<TextPlacementInfoWrap, boost::shared_ptr<TextPlacementInfoWrap>, boost::noncopyable>("TextPlacementInfo",
         init<text_placements const*, double, dimension_type, bool>())
         .def("next", pure_virtual(&text_placement_info::next))
         .def("get_actual_label_spacing", &text_placement_info::get_actual_label_spacing)
@@ -196,9 +197,10 @@ void export_text_placement()
         .def_readwrite("additional_boxes", &text_placement_info::additional_boxes)
         .def_readwrite("envelopes", &text_placement_info::envelopes)
 //        .def_readwrite("placements", &text_placement_info::placements)
-
         ;
 
+    register_ptr_to_python<boost::shared_ptr<text_placement_info> >();
+
     //TODO: Python namespace
     class_<NodeWrap, boost::noncopyable>("FormatingNode")
         .def("apply", pure_virtual(&formating::node::apply))