From 5cb705df650e70e22689ef8406e03ea194c9d3a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kom=D1=8Fpa?= <me@komzpa.net>
Date: Tue, 30 Nov 2010 18:45:39 +0200
Subject: [PATCH] Text opacity

---
 src/komap.py       | 3 ++-
 src/libkomapnik.py | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/komap.py b/src/komap.py
index 0c8fd30..217ff48 100644
--- a/src/komap.py
+++ b/src/komap.py
@@ -336,12 +336,13 @@ for zoom, zsheet in mapniksheet.iteritems():
               tdistance= entry["style"].get("-x-mapnik-min-distance","26")
               twrap= entry["style"].get("max-width",256)
               talign= entry["style"].get("text-align","center")
+              topacity= entry["style"].get("text-opacity",entry["style"].get("opacity","1"))
 
               xml += xml_rule_start()
               xml += x_scale
               
               xml += xml_filter(entry["rulestring"])
-              xml += xml_textsymbolizer(ttext,tface,tsize,tcolor, thcolor, thradius, tplace, toffset,toverlap,tdistance,twrap,talign)
+              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 aaa64ff..9e3d3f0 100644
--- a/src/libkomapnik.py
+++ b/src/libkomapnik.py
@@ -103,15 +103,15 @@ def xml_linepatternsymbolizer(path=""):
   <LinePatternSymbolizer file="%s%s"/>"""%(icons_path, path)
 
 
-def xml_textsymbolizer(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"):
+def xml_textsymbolizer(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)
   
   return """
-  <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" />
-  """%(text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align)
+  <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_filter(string):
   return """