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

Merge pull request #10 from kshalnev/fix_process_decl

Browse source 
Fixed processing of declaration without conditions
This commit is contained in:
Ilya Zverev 2015-11-18 19:03:18 +03:00
commit 3bea5777aa
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mapcss/__init__.py
View file

@ -64,6 +64,7 @@ SET_TAG = re.compile(r'^ \s* set \s+(\S+)\s* = \s* (.+?) \s*
SET_TAG_TRUE = re.compile(r'^ \s* set \s+(\S+)\s* $', re.I | re.S | re.X)
EXIT = re.compile(r'^ \s* exit \s* $', re.I | re.S | re.X)
oNONE = 0
oZOOM = 2
oGROUP = 3
oCONDITION = 4
@ -200,7 +201,7 @@ class MapCSS():
self.choosers = []
log = logging.getLogger('mapcss.parser')
previous = 0 # what was the previous CSS word?
previous = oNONE # what was the previous CSS word?
sc = StyleChooser(self.scalepair) # currently being assembled
stck = [] # filename, original, remained
@ -282,6 +283,8 @@ class MapCSS():
# Declaration - {...}
elif DECLARATION.match(css):
if previous == oDECLARATION or previous == oNONE:
raise Exception("Declaration without conditions")
decl = DECLARATION.match(css).groups()[0]
log.debug("declaration found: %s" % (decl))
sc.addStyles(self.subst_variables(parseDeclaration(decl)))