From 2e174265d13f5a4a3f833cb6a3aec4d03fcce0a9 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Fri, 17 Apr 2015 15:34:43 +0300 Subject: [PATCH 1/3] Variables support --- src/mapcss/__init__.py | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/src/mapcss/__init__.py b/src/mapcss/__init__.py index 169beb1..1259ca6 100644 --- a/src/mapcss/__init__.py +++ b/src/mapcss/__init__.py @@ -41,6 +41,7 @@ CONDITION = re.compile(r'^ \[(.+?)\] \s* ', re.S | re.X) OBJECT = re.compile(r'^ (\*|[\w]+) \s* ', re.S | re.X) DECLARATION = re.compile(r'^ \{(.+?)\} \s* ', re.S | re.X) IMPORT = re.compile(r'^@import\("(.+?)"\); \s* ', re.S | re.X) +VARIABLE_SET = re.compile(r'^@(\w[\w\d]*) \s* : \s* (.+?) \s* ; \s* ', re.S | re.X) UNKNOWN = re.compile(r'^ (\S+) \s* ', re.S | re.X) ZOOM_MINMAX = re.compile(r'^ (\d+)\-(\d+) $', re.S | re.X) @@ -74,6 +75,7 @@ oCONDITION = 4 oOBJECT = 5 oDECLARATION = 6 oSUBPART = 7 +oVARIABLE_SET = 8 DASH = re.compile(r'\-/g') COLOR = re.compile(r'color$/') @@ -84,6 +86,7 @@ CAPS = re.compile(r'^uppercase$/i') CENTER = re.compile(r'^center$/i') HEX = re.compile(r'^#([0-9a-f]+)$/i') +VARIABLE = re.compile(r'@(\w[\w\d]*)') class MapCSS(): def __init__(self, minscale=0, maxscale=19): @@ -96,6 +99,7 @@ class MapCSS(): self.scalepair = (minscale, maxscale) self.choosers = [] self.choosers_by_type = {} + self.variables = {} self.style_loaded = False def parseZoom(self, s): @@ -119,8 +123,9 @@ class MapCSS(): if shash in self.cache["style"]: return deepcopy(self.cache["style"][shash]) style = [] - for chooser in self.choosers_by_type[type]: - style = chooser.updateStyles(style, type, tags, zoom, scale, zscale) + if type in self.choosers_by_type: + for chooser in self.choosers_by_type[type]: + style = chooser.updateStyles(style, type, tags, zoom, scale, zscale) style = [x for x in style if x["object-id"] != "::*"] st = [] for x in style: @@ -168,6 +173,17 @@ class MapCSS(): hints.append(p) return hints + def subst_variables(self, t): + """Expects an array from parseDeclaration.""" + for k in t[0]: + t[0][k] = VARIABLE.sub(self.get_variable, t[0][k]) + return t + + def get_variable(self, m): + name = m.group()[1:] + return self.variables[name] if name in self.variables else m.group() + + def parse(self, css=None, clamp=True, stretch=1000, filename=None): """ Parses MapCSS given as string @@ -256,7 +272,7 @@ class MapCSS(): elif DECLARATION.match(css): decl = DECLARATION.match(css).groups()[0] log.debug("declaration found: %s" % (decl)) - sc.addStyles(parseDeclaration(decl)) + sc.addStyles(self.subst_variables(parseDeclaration(decl))) css = DECLARATION.sub("", css) previous = oDECLARATION @@ -276,6 +292,13 @@ class MapCSS(): except IOError: log.warning("cannot import file %s" % (filename)) + elif VARIABLE_SET.match(css): + name = VARIABLE_SET.match(css).groups()[0] + log.debug("variable set found: %s" % name) + self.variables[name] = VARIABLE_SET.match(css).groups()[1] + css = VARIABLE_SET.sub("", css) + previous = oVARIABLE_SET + # Unknown pattern elif UNKNOWN.match(css): log.warning("unknown thing found on line %s: %s" % (unicode(css_orig[:-len(unicode(css))]).count("\n") + 1, UNKNOWN.match(css).group())) From 7fedb5d3eb32c100b43c043e24cf4e7e7d1a86ef Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Wed, 20 May 2015 11:43:24 +0300 Subject: [PATCH 2/3] Fix importing issue --- src/mapcss/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mapcss/__init__.py b/src/mapcss/__init__.py index 1259ca6..507dbdb 100644 --- a/src/mapcss/__init__.py +++ b/src/mapcss/__init__.py @@ -181,6 +181,8 @@ class MapCSS(): def get_variable(self, m): name = m.group()[1:] + if not name in self.variables: + log.error("Variable not found: {}".format(name)) return self.variables[name] if name in self.variables else m.group() @@ -287,10 +289,10 @@ class MapCSS(): filename = os.path.join(basepath, IMPORT.match(css).groups()[0]) try: css = IMPORT.sub("", css) - import_text = open(os.path.join(basepath, filename), "r").read().strip() + import_text = open(filename, "r").read().strip() css = import_text + css - except IOError: - log.warning("cannot import file %s" % (filename)) + except IOError as e: + log.warning("cannot import file %s: %s" % (filename, e)) elif VARIABLE_SET.match(css): name = VARIABLE_SET.match(css).groups()[0] From 082fea6de1fd413f805def4490431d83c42de184 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Wed, 20 May 2015 14:15:11 +0300 Subject: [PATCH 3/3] Fix bugs, enforce first letter of variables to be a character --- src/mapcss/__init__.py | 6 +++--- src/test_stylesheet.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mapcss/__init__.py b/src/mapcss/__init__.py index 507dbdb..f1de7f4 100644 --- a/src/mapcss/__init__.py +++ b/src/mapcss/__init__.py @@ -41,7 +41,7 @@ CONDITION = re.compile(r'^ \[(.+?)\] \s* ', re.S | re.X) OBJECT = re.compile(r'^ (\*|[\w]+) \s* ', re.S | re.X) DECLARATION = re.compile(r'^ \{(.+?)\} \s* ', re.S | re.X) IMPORT = re.compile(r'^@import\("(.+?)"\); \s* ', re.S | re.X) -VARIABLE_SET = re.compile(r'^@(\w[\w\d]*) \s* : \s* (.+?) \s* ; \s* ', re.S | re.X) +VARIABLE_SET = re.compile(r'^@([a-z][\w\d]*) \s* : \s* (.+?) \s* ; \s* ', re.S | re.X | re.I) UNKNOWN = re.compile(r'^ (\S+) \s* ', re.S | re.X) ZOOM_MINMAX = re.compile(r'^ (\d+)\-(\d+) $', re.S | re.X) @@ -86,7 +86,7 @@ CAPS = re.compile(r'^uppercase$/i') CENTER = re.compile(r'^center$/i') HEX = re.compile(r'^#([0-9a-f]+)$/i') -VARIABLE = re.compile(r'@(\w[\w\d]*)') +VARIABLE = re.compile(r'@([a-z][\w\d]*)') class MapCSS(): def __init__(self, minscale=0, maxscale=19): @@ -182,7 +182,7 @@ class MapCSS(): def get_variable(self, m): name = m.group()[1:] if not name in self.variables: - log.error("Variable not found: {}".format(name)) + logging.error("Variable not found: {}".format(name)) return self.variables[name] if name in self.variables else m.group() diff --git a/src/test_stylesheet.py b/src/test_stylesheet.py index 506065b..f9bcb29 100644 --- a/src/test_stylesheet.py +++ b/src/test_stylesheet.py @@ -198,6 +198,7 @@ has_darker_casings({'highway': 'residential'}) has_darker_casings({'highway': 'unclassified'}) -print "Failed tests: %s (%s%%)" % (FAILED_TESTS, 100 * FAILED_TESTS / TOTAL_TESTS) +if TOTAL_TESTS > 0: + print "Failed tests: %s (%s%%)" % (FAILED_TESTS, 100 * FAILED_TESTS / TOTAL_TESTS) print "Passed tests:", TOTAL_TESTS - FAILED_TESTS print "Total tests:", TOTAL_TESTS