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

Hide taxt-with-label together when colliding; also leads to some SQL robustness

Browse source
This commit is contained in:
Komяpa 2011-01-29 10:27:31 +02:00
parent f36203fbcd
commit f128041989
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/komap.py
View file

@ -291,7 +291,7 @@ for zoom, zsheet in mapniksheet.iteritems():
xml = xml_style_start()
for entry in zsheet[zindex]:
if entry["type"] in entry_types:
if "icon-image" in entry["style"]:
if "icon-image" in entry["style"] and "text" not in entry["style"] and entry["style"].get("text-position","center")!='center':
xml += xml_rule_start()
xml += x_scale
xml += xml_filter(entry["rulestring"])
@ -347,7 +347,15 @@ for zoom, zsheet in mapniksheet.iteritems():
xml += x_scale
xml += xml_filter(entry["rulestring"])
xml += xml_textsymbolizer(ttext,tface,tsize,tcolor, thcolor, thradius, tplace, toffset,toverlap,tdistance,twrap,talign,topacity)
if "icon-image" in entry["style"] and entry["style"].get("text-position","center")=='center':
xml += xml_shieldsymbolizer(
entry["style"].get("icon-image", ""),
entry["style"].get("icon-width", ""),
entry["style"].get("icon-height", ""),
ttext,tface,tsize,tcolor, thcolor, thradius, tplace,
toffset,toverlap,tdistance,twrap,talign,topacity)
else:
xml += xml_textsymbolizer(ttext,tface,tsize,tcolor, thcolor, thradius, tplace, toffset,toverlap,tdistance,twrap,talign,topacity)
sql.add(entry["sql"])
itags.update(entry["chooser"].get_interesting_tags(entry["type"], zoom))
xml += xml_rule_end()

15
src/libkomapnik.py
View file

@ -120,6 +120,21 @@ def xml_textsymbolizer(text="name",face="DejaVu Sans Book",size="10",color="#000
<TextSymbolizer name="%s" face_name="%s" size="%s" fill="%s" halo_fill= "%s" halo_radius="%s" placement="%s" dy="%s" max_char_angle_delta="15" allow_overlap="%s" wrap_width="%s" min_distance="%s" horizontal_alignment="%s" opacity="%s" />
"""%(text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity)
def xml_shieldsymbolizer(path="", width="", height="",text="name",face="DejaVu Sans Book",size="10",color="#000000", halo_color="#ffffff", halo_radius="0", placement="line", offset="0", overlap="false", distance="26", wrap_width=256, align="center", opacity="1"):
color = nicecolor(color)
halo_color = nicecolor(halo_color)
placement = {"center": "point"}.get(placement.lower(), placement)
align = {"center": "middle"}.get(align.lower(), align)
if width:
width =' width="%s" '%width
if height:
height =' height="%s" '%height
return """
<ShieldSymbolizer file="%s%s" %s %s name="%s" face_name="%s" size="%s" fill="%s" halo_fill= "%s" halo_radius="%s" placement="%s" dy="%s" allow_overlap="%s" wrap_width="%s" min_distance="%s" horizontal_alignment="%s" opacity="%s" />
"""%(icons_path, \
path, width, height,text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity)
def xml_filter(string):
return """
<Filter>%s</Filter>"""%string