From f1280419898d51a92ffec8feb5987163f5893990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kom=D1=8Fpa?= <me@komzpa.net>
Date: Sat, 29 Jan 2011 10:27:31 +0200
Subject: [PATCH] Hide taxt-with-label together when colliding; also leads to
 some SQL robustness

---
 src/komap.py       | 12 ++++++++++--
 src/libkomapnik.py | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/komap.py b/src/komap.py
index 68e1402..352d8d7 100644
--- a/src/komap.py
+++ b/src/komap.py
@@ -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()
diff --git a/src/libkomapnik.py b/src/libkomapnik.py
index f37b652..5dc541a 100644
--- a/src/libkomapnik.py
+++ b/src/libkomapnik.py
@@ -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