+ check expression needs converting

+ convert PolygonSymbolizer to use attributes

utils/upgrade_map_xml/upgrade_map_xml.py

@@ -3,9 +3,12 @@ import os
 import sys
 from lxml import etree
 from lxml import objectify
+import re
 
 def name2expr(sym):
     name = sym.attrib['name']
+    if re.match('^\[.*\]$',name) is None:
+        print>>sys.stderr,"Fixing %s" % name
         expression = '[%s]' % name
         sym.attrib['name'] = expression    
     
@@ -18,13 +21,15 @@ def fixup_pointsym(sym):
     #    sym.attrib.pop('type')
 
 def fixup_sym_attributes(sym):
+    if not hasattr(sym,'CssParameter'):
+        return
     attrib = {}
     for css in sym.CssParameter:
         key = css.attrib.get('name')
         value = css.text
         attrib[key]=value
-    sym.clear() # remove CssParameter children
+    sym.clear() # remove CssParameter elements
-    for k,v in attrib.items(): # insert attributes
+    for k,v in attrib.items(): # insert attributes instead
         sym.attrib[k] = v
     
 
@@ -52,8 +57,9 @@ if __name__ == "__main__":
                 if hasattr(rule,'LineSymbolizer') :
                     for sym in rule.LineSymbolizer:
                         fixup_sym_attributes(sym)
-                        
+                if hasattr(rule,'PolygonSymbolizer') :
-                            
+                    for sym in rule.PolygonSymbolizer:
+                        fixup_sym_attributes(sym)
                         
     print etree.tostring(tree,pretty_print=True,standalone=True)