From f596ed3ac25b3dcd9dc879fdf2cd67225ff5bdb6 Mon Sep 17 00:00:00 2001
From: Komzpa <me@komzpa.net>
Date: Mon, 27 Feb 2012 16:24:13 +0300
Subject: [PATCH] josm casing support

---
 src/mapcss/StyleChooser.py | 25 ++++++++++++-------------
 src/mapcss/__init__.py     | 14 --------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/src/mapcss/StyleChooser.py b/src/mapcss/StyleChooser.py
index 41192d8..87cb60d 100644
--- a/src/mapcss/StyleChooser.py
+++ b/src/mapcss/StyleChooser.py
@@ -131,15 +131,6 @@ class StyleChooser:
                     ra = {}
                     for a, b in r.iteritems():
                       "checking and nicifying style table"
-                      if a == "casing-width":
-                        "hack to support josm's style casings"
-                        if b.strip()[0] = "+":
-                          try:
-                            b = float(b) / 2.
-                            ra[a] = b
-                          except ValueError:
-                            pass
-                          
                       if "color" in a:
                         "parsing color value to 3-tuple"
                         ra[a] = colorparser(b)
@@ -160,7 +151,7 @@ class StyleChooser:
                       else:
                         ra[a]=b
                     
-                    ra["layer"] = float(tags.get("layer",0))*100+ra.get("z-index",1) # calculating z-index
+                    ra["layer"] = float(tags.get("layer",0))*1000+ra.get("z-index",1) # calculating z-index
                     for k,v in ra.items():  # if a value is empty, we don't need it - renderer will do as default.
                       if not v:
                         del ra[k]
@@ -297,11 +288,19 @@ class StyleChooser:
     for r in a:
       ra = {}
       for a,b in r.iteritems():
+        a = a.strip()
+        b = b.strip()
+        if a = "casing-width":
+          "josm support"
+          if b[0] = "+":
+            try:
+              b = float(b)/2
+            except:
+              pass
         if "text" == a[-4:]:
-          if b.strip()[:5] != "eval(":
+          if b[:5] != "eval(":
             b = "eval(tag(\""+b+"\"))"
-
-        if b.strip()[:5] == "eval(":
+        if b[:5] == "eval(":
           b = Eval(b)
         ra[a] = b
       rb.append(ra)
diff --git a/src/mapcss/__init__.py b/src/mapcss/__init__.py
index a029bd7..1b7945a 100644
--- a/src/mapcss/__init__.py
+++ b/src/mapcss/__init__.py
@@ -253,12 +253,9 @@ class MapCSS():
                 css=OBJECT.sub("",css)
                 sc.newObject(obj)
                 previous=oOBJECT
-                
 
               #// Declaration - {...}
               elif DECLARATION.match(css):
-                
-                
                 decl = DECLARATION.match(css).groups()[0]
                 log.debug("declaration found: %s"% (decl))
                 sc.addStyles(parseDeclaration(decl))
@@ -356,22 +353,11 @@ def parseDeclaration(s):
                   """
                   styles=[]
                   t = {}
-                  #var t:Object=new Object();
-                  #var o:Object=new Object();
-                  #var a:String, k:String;
-
-                  #// Create styles
-                  #var ss:ShapeStyle =new ShapeStyle() ;
-                  #var ps:PointStyle =new PointStyle() ;
-                  #var ts:TextStyle  =new TextStyle()  ;
-                  #var hs:ShieldStyle=new ShieldStyle();
-                  #var xs:InstructionStyle=new InstructionStyle();
 
                   for a in s.split(';'):
                           #if ((o=ASSIGNMENT_EVAL.exec(a)))   { t[o[1].replace(DASH,'_')]=new Eval(o[2]); }
                           if ASSIGNMENT.match(a):
                             tzz = ASSIGNMENT.match(a).groups()
-                            
                             t[tzz[0]]=tzz[1].strip().strip('"')
                             logging.debug("%s == %s" % (tzz[0],tzz[1]) )
                           else: