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

fixed [foo=no] and [foo!=bar] where foo isn't present in tags

Browse source
This commit is contained in:
Komzpa 2010-07-18 15:30:54 +03:00
parent 65e0db5abc
commit 60d726ccab
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mapcss/Condition.py
View file

@ -44,13 +44,13 @@ class Condition:
if t == 'eq':
return tags[params[0]]==params[1]
if t == 'ne':
return tags[params[0]]!=params[1]
return tags.get(params[0], "")!=params[1]
if t == 'regex':
return bool(self.regex.match(tags[params[0]]))
if t == 'true':
return (tags[params[0]]=='true') | (tags[params[0]]=='yes') | (tags[params[0]]=='1')
if t == 'untrue':
return (tags[params[0]]!='true') & (tags[params[0]]!='yes') & (tags[params[0]]!='1')
if t == 'false':
return (tags.get(params[0], "")=='false') | (tags.get(params[0], "")=='no') | (tags.get(params[0], "")=='')
if t == 'set':
if params[0] in tags:
return tags[params[0]]!=''

4
src/mapcss/StyleChooser.py
View file

@ -121,11 +121,11 @@ class StyleChooser:
elif "dashes" in a:
"these things are arrays of float's or not in table at all"
try:
print b
b = b.split(",")
b = [float(x) for x in b]
ra[a]= b
print b
except ValueError:
pass
else: