From e4a11c0d07c0dcfebd3399cdc7c4971c4f62d517 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 31 Jan 2012 08:35:40 -0800
Subject: [PATCH 1/2] use correct context type

---
 plugins/input/osm/osm_featureset.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/input/osm/osm_featureset.cpp b/plugins/input/osm/osm_featureset.cpp
index 420861aa6..fd589fe64 100644
--- a/plugins/input/osm/osm_featureset.cpp
+++ b/plugins/input/osm/osm_featureset.cpp
@@ -47,7 +47,7 @@ osm_featureset<filterT>::osm_featureset(const filterT& filter,
       feature_id_(1),
       dataset_ (dataset),
       attribute_names_ (attribute_names),
-      ctx_(boost::make_shared<mapnik::context>())
+      ctx_(boost::make_shared<mapnik::context_type>())
 {
     dataset_->rewind();
 }

From 796bd5d8c2148145598337301b5912cb48cfc25d Mon Sep 17 00:00:00 2001
From: Artem Pavlenko <artem@mapnik.org>
Date: Tue, 31 Jan 2012 16:51:14 +0000
Subject: [PATCH 2/2] remove duplicate enumeration registration

---
 bindings/python/mapnik_text_symbolizer.cpp | 35 +---------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/bindings/python/mapnik_text_symbolizer.cpp b/bindings/python/mapnik_text_symbolizer.cpp
index ccb5b99e0..e558861ef 100644
--- a/bindings/python/mapnik_text_symbolizer.cpp
+++ b/bindings/python/mapnik_text_symbolizer.cpp
@@ -145,40 +145,7 @@ struct text_symbolizer_pickle_suite : boost::python::pickle_suite
 void export_text_symbolizer()
 {
     using namespace boost::python;
-
-    enumeration_<label_placement_e>("label_placement")
-        .value("LINE_PLACEMENT",LINE_PLACEMENT)
-        .value("POINT_PLACEMENT",POINT_PLACEMENT)
-        .value("VERTEX_PLACEMENT",VERTEX_PLACEMENT)
-        .value("INTERIOR_PLACEMENT",INTERIOR_PLACEMENT)
-        ;
-    enumeration_<vertical_alignment_e>("vertical_alignment")
-        .value("TOP",V_TOP)
-        .value("MIDDLE",V_MIDDLE)
-        .value("BOTTOM",V_BOTTOM)
-        .value("AUTO",V_AUTO)
-        ;
-
-    enumeration_<horizontal_alignment_e>("horizontal_alignment")
-        .value("LEFT",H_LEFT)
-        .value("MIDDLE",H_MIDDLE)
-        .value("RIGHT",H_RIGHT)
-        .value("AUTO",H_AUTO)
-        ;
-
-    enumeration_<justify_alignment_e>("justify_alignment")
-        .value("LEFT",J_LEFT)
-        .value("MIDDLE",J_MIDDLE)
-        .value("RIGHT",J_RIGHT)
-        ;
-
-    enumeration_<text_transform_e>("text_transform")
-        .value("NONE",NONE)
-        .value("UPPERCASE",UPPERCASE)
-        .value("LOWERCASE",LOWERCASE)
-        .value("CAPITALIZE",CAPITALIZE)
-        ;
-
+    
     class_<text_symbolizer>("TextSymbolizer",init<expression_ptr,std::string const&, unsigned,color const&>())
         /*
         // todo - all python classes can have kwargs and default constructors