organicmaps/kothic
13
Fork 0
Code Issues Pull requests 2 Projects Releases Wiki Activity Actions

josm casing support

Browse source
This commit is contained in:
Komzpa 2012-02-27 16:24:13 +03:00
parent e7a6a6f088
commit f596ed3ac2
2 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/mapcss/StyleChooser.py
View file

@ -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)

14
src/mapcss/__init__.py
View file

@ -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: