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

Fix bugs, enforce first letter of variables to be a character

Browse source
This commit is contained in:
Ilya Zverev 2015-05-20 14:15:11 +03:00
parent 7fedb5d3eb
commit 082fea6de1
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mapcss/__init__.py
View file

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

3
src/test_stylesheet.py
View file

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