+ align attribute names with W3C standards

rename 'bgcolor' to 'background-color' + update upgrade_map_xml.py
mapnik · Jul 19, 2010 · 91a1091 · 91a1091
1 parent c943447
commit 91a1091
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/load_map.cpp b/src/load_map.cpp
@@ -170,7 +170,7 @@ void map_parser::parse_map( Map & map, ptree const & pt )
 
         try
         {
-            optional<color> bgcolor = get_opt_attr<color>(map_node, "bgcolor");
+            optional<color> bgcolor = get_opt_attr<color>(map_node, "background-color");
             if (bgcolor) 
             {
                 map.set_background( * bgcolor );

diff --git a/src/save_map.cpp b/src/save_map.cpp
@@ -702,7 +702,7 @@ void serialize_map(ptree & pt, Map const & map, bool explicit_defaults)
     optional<color> const& c = map.background();
     if ( c )
     {
-        set_attr( map_node, "bgcolor", * c );
+        set_attr( map_node, "background-color", * c );
     }
 
     optional<std::string> const& image_filename = map.background_image();

diff --git a/utils/upgrade_map_xml/upgrade_map_xml.py b/utils/upgrade_map_xml/upgrade_map_xml.py
@@ -46,6 +46,12 @@ def fixup_sym_attributes(sym):
     xml = sys.argv[1]
     tree = objectify.parse(xml)
     root = tree.getroot()
+
+    # rename 'bgcolor' to 'background-color'
+    if root.attrib.get('bgcolor'):
+        root.attrib['background-color'] = root.attrib.get('bgcolor')
+        root.attrib.pop('bgcolor')
+
     for style in root.Style:
         if len(style.Rule):
             for rule in style.Rule: