From 93ffb4c694f33939a4ca75d01751ff58f3a46ae5 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 18 Oct 2011 08:36:17 -0700
Subject: [PATCH] add 0.7.2 forward compatibility with mapnik 2.x text/shield
 symbolizer change (although this is only a deprecation warning in 2.0.0) -
 closes #898

---
 src/load_map.cpp | 26 ++++++++++++++++++++++----
 src/save_map.cpp |  5 ++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/load_map.cpp b/src/load_map.cpp
index 87095ceba..c2fcaeec6 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -894,7 +894,16 @@ void map_parser::parse_text_symbolizer( rule_type & rule, ptree const & sym )
 {
     try
     {
-        std::string name = get_attr<string>(sym, "name");
+        std::string name;
+        // mapnik2 forward compatibility
+        optional<std::string> old_name = get_opt_attr<std::string>(sym, "name");
+        if (old_name) {
+            //std::clog << ": ### WARNING: Using 'name' in TextSymbolizer is deprecated (http://trac.mapnik.org/wiki/TextSymbolizer)\n";
+            name = *old_name;
+        } else {
+            name = get_own<std::string>(sym, "TextSymbolizer");
+            if (name.empty()) throw config_error(std::string("TextSymbolizer needs a non-empty text"));
+        }
 
         // mapnik2 forward compatibility
         if (boost::algorithm::istarts_with(name,"[") && boost::algorithm::iends_with(name,"]"))
@@ -1118,7 +1127,18 @@ void map_parser::parse_shield_symbolizer( rule_type & rule, ptree const & sym )
 {
     try
     {
-        std::string name =  get_attr<string>(sym, "name");
+        // mapnik2 forward compatibility
+        std::string name;
+        optional<std::string> old_name = get_opt_attr<std::string>(sym, "name");
+        optional<boolean> no_text = get_opt_attr<boolean>(sym, "no-text");
+        if (old_name) {
+            //std::clog << ": ### WARNING: Using 'name' in ShieldSymbolizer is deprecated (http://trac.mapnik.org/wiki/TextSymbolizer)\n";
+            name = *old_name;
+        } else {
+            name = get_own<std::string>(sym, "ShieldSymbolizer");
+            if (name.empty() && (!no_text || !*no_text) ) throw config_error(std::string("ShieldSymbolizer needs a non-empty text"));
+            if (name.empty()) throw config_error(std::string("ShieldSymbolizer needs a non-empty text"));
+        }
 
         // mapnik2 forward compatibility
         if (boost::algorithm::istarts_with(name,"[") && boost::algorithm::iends_with(name,"]"))
@@ -1341,8 +1361,6 @@ void map_parser::parse_shield_symbolizer( rule_type & rule, ptree const & sym )
             }
 
             // no text
-            optional<boolean> no_text =
-                get_opt_attr<boolean>(sym, "no_text", "no-text");
             if (no_text)
             {
                 shield_symbol.set_no_text( * no_text );
diff --git a/src/save_map.cpp b/src/save_map.cpp
index e08352a53..f5ffef046 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -249,7 +249,10 @@ namespace mapnik
             {
                 const std::string & name = sym.get_name();
                 if ( ! name.empty() ) {
-                    set_attr( node, "name", name );
+                    //set_attr( node, "name", name );
+                    // mapnik2 forward compatibility
+                    ptree& text_node = node.push_back(ptree::value_type("<xmltext>", ptree()))->second;
+                    text_node.put_own(name);
                 }
                 const std::string & face_name = sym.get_face_name();
                 if ( ! face_name.empty() ) {