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

Support for prop() in eval()

Browse source
This commit is contained in:
Komяpa 2010-07-16 12:11:53 +03:00
parent d4cd7710b3
commit 2bee32f97d
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mapcss/StyleChooser.py
View file

@ -18,6 +18,7 @@
from Rule import Rule
from webcolors.webcolors import whatever_to_cairo as colorparser
from webcolors.webcolors import cairo_to_hex
from Eval import Eval
class StyleChooser:
@ -88,14 +89,20 @@ class StyleChooser:
## // Update StyleList
object_id = 1
for r in self.styles:
### FIXME: here we should do all the eval()'s
ra = {}
for a,b in r.iteritems():
if __builtins__["type"](b) == self.eval_type:
combined_style = {}
for t in sl:
combined_style.update(t)
for p,q in combined_style.iteritems():
if "color" in p:
combined_style[p] = cairo_to_hex(q)
## FIXME: properties && metrics
b = b.compute(tags,{}, scale, zscale)
b = b.compute(tags,combined_style, scale, zscale)
ra[a] = b
r = ra
ra = {}

3
src/mapcss/webcolors/webcolors.py
View file

@ -851,7 +851,8 @@ def whatever_to_rgb(string):
def whatever_to_cairo(string):
a = whatever_to_rgb(string)
return a[0]/255.,a[1]/255.,a[2]/255.,
def cairo_to_hex (cairo):
return rgb_to_hex((cairo[0]*255,cairo[1]*255,cairo[2]*255,))