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

repaired mapnik komap styling

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-03-21 10:55:48 +03:00
parent 0272f91918
commit 4785abcea9
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mapcss/StyleChooser.py
View file

@ -53,9 +53,8 @@ class StyleChooser:
Returns a set of number-compared values.
"""
a = set()
for c in self.ruleChains:
for r in c:
a.update(r.get_numerics())
for r in self.ruleChains:
a.update(r.get_numerics())
a.discard(False)
return a
@ -65,9 +64,8 @@ class StyleChooser:
"""
### FIXME
a = set()
for c in self.ruleChains:
for r in c:
a.update(r.get_interesting_tags(ztype, zoom))
for r in self.ruleChains:
a.update(r.get_interesting_tags(ztype, zoom))
if a: ## FIXME: semi-illegal optimization, may wreck in future on tagless matches
for r in self.styles:
for c,b in r.iteritems():
@ -84,18 +82,17 @@ class StyleChooser:
needed = set(["width", "casing-width", "fill-color", "fill-image", "icon-image", "text", "extrude", "background-image", "background-color", "pattern-image", "shield-text"])
if not needed.isdisjoint(set(self.styles[0].keys())):
for c in self.ruleChains:
for r in c:
p = r.get_sql_hints(type, zoom)
if p:
q = "("+p[1] + ")"#[t[1] for t in p]
if q == "()":
q = ""
if b and q:
b += " OR "+ q
else:
b = q
a.update(p[0])
for r in self.ruleChains:
p = r.get_sql_hints(type, zoom)
if p:
q = "("+p[1] + ")"#[t[1] for t in p]
if q == "()":
q = ""
if b and q:
b += " OR "+ q
else:
b = q
a.update(p[0])
# no need to check for eval's
return a,b

8
src/mapcss/__init__.py
View file

@ -176,7 +176,7 @@ class MapCSS():
return hints
def parse(self, css, clamp=True):
def parse(self, css, clamp=True, stretch=1000):
"""
Parses MapCSS given as string
"""
@ -300,7 +300,11 @@ class MapCSS():
for chooser in self.choosers:
for stylez in chooser.styles:
if 'z-index' in stylez:
stylez['z-index'] = zindex.index(float(stylez.get('z-index',0)))
if stretch:
stylez['z-index'] = 1.*zindex.index(float(stylez.get('z-index',0)))/len(zindex)*stretch
else:
stylez['z-index'] = zindex.index(float(stylez.get('z-index',0)))
except TypeError:
pass