From d36e817e42d4da4d36eaf796e7d3e15806a21c27 Mon Sep 17 00:00:00 2001
From: Komzpa <me@komzpa.net>
Date: Mon, 10 Oct 2011 13:45:49 +0200
Subject: [PATCH] support for text-transform

---
 src/komap.py       |  5 +++--
 src/libkomapnik.py | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/komap.py b/src/komap.py
index 3bbd615..290f592 100644
--- a/src/komap.py
+++ b/src/komap.py
@@ -612,6 +612,7 @@ if options.renderer == "mapnik":
                   talign= entry["style"].get("text-align","center")
                   topacity= relaxedFloat(entry["style"].get("text-opacity",entry["style"].get("opacity","1")))
                   tpos = entry["style"].get("text-placement","X")
+                  ttransform = entry["style"].get("text-transform","none")
 
                   xml += xml_rule_start()
                   xml += x_scale
@@ -623,9 +624,9 @@ if options.renderer == "mapnik":
                                 entry["style"].get("icon-width", ""),
                                 entry["style"].get("icon-height", ""),
                                 ttext,tface,tsize,tcolor, thcolor, thradius, tplace,
-                                toffset,toverlap,tdistance,twrap,talign,topacity)
+                                toffset,toverlap,tdistance,twrap,talign,topacity, ttransform)
                   else:
-                    xml += xml_textsymbolizer(ttext,tface,tsize,tcolor, thcolor, thradius, tplace, toffset,toverlap,tdistance,twrap,talign,topacity,tpos)
+                    xml += xml_textsymbolizer(ttext,tface,tsize,tcolor, thcolor, thradius, tplace, toffset,toverlap,tdistance,twrap,talign,topacity,tpos,ttransform)
                   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 2f43b45..99449d1 100644
--- a/src/libkomapnik.py
+++ b/src/libkomapnik.py
@@ -126,7 +126,7 @@ def xml_linepatternsymbolizer(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", opacity="1", pos="X"):
+                      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", pos="X", transform = "none"):
   color = nicecolor(color)
   halo_color = nicecolor(halo_color)
   pos = pos.replace("exact", "X").replace("any","S, E, X, N, W, NE, SE, NW, SW").split(",")
@@ -134,15 +134,16 @@ def xml_textsymbolizer(
   pos = ",".join(pos)
   size = size.split(",")[0]
   
+  
   placement = {"center": "point"}.get(placement.lower(), placement)
   align = {"center": "middle"}.get(align.lower(), align)
   
   return """
-  <TextSymbolizer name="%s" fontset_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" vertical_alignment="middle" horizontal_alignment="%s" opacity="%s" placement-type="simple" placements="%s" />
-  """%(text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity,pos)
+  <TextSymbolizer name="%s" fontset_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" vertical_alignment="middle" horizontal_alignment="%s" opacity="%s" placement-type="simple" placements="%s" text-transform="%s" />
+  """%(text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity,pos, transform)
 
 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"):
+                        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", transform="none"):
   color = nicecolor(color)
   halo_color = nicecolor(halo_color)
   placement = {"center": "point"}.get(placement.lower(), placement)
@@ -153,9 +154,9 @@ def xml_shieldsymbolizer(path="", width="", height="",
   if height:
     height =' height="%s" '%height
   return """
-    <ShieldSymbolizer file="%s%s" %s %s name="%s" fontset_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" />
+    <ShieldSymbolizer file="%s%s" %s %s name="%s" fontset_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" text-transform="%s" />
   """%(icons_path, \
-    path, width, height,text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity)
+    path, width, height,text,face,int(float(size)),color,halo_color,halo_radius,placement,offset,overlap,wrap_width,distance,align,opacity, transform)
 
 def xml_filter(string):
   return """