From 37faccd64a2af15ed1577a277ed17f823c34204e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kom=D1=8Fpa?= <me@komzpa.net>
Date: Sun, 3 Apr 2011 00:45:45 +0300
Subject: [PATCH] Try to group line layers

---
 src/komap.py       | 69 +++++++++++++++++++++++++++-------------------
 src/libkomapnik.py |  5 +++-
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/src/komap.py b/src/komap.py
index 0a31de4..3f72228 100644
--- a/src/komap.py
+++ b/src/komap.py
@@ -229,10 +229,14 @@ for zoom, zsheet in mapniksheet.iteritems():
         else:
           xml_nolayer()
 
+
+      ## lines pass
+      sql_g = set()
+      there_are_dashed_lines = False
+      itags_g = set()
+      xml_g = ""
       for zindex in ta:
-        ## lines pass
         sql = set()
-        there_are_dashed_lines = False
         itags = set()
         xml = xml_style_start()
         for entry in zsheet[zindex]:
@@ -270,34 +274,41 @@ for zoom, zsheet in mapniksheet.iteritems():
         xml += xml_style_end()
         sql.discard("()")
         if sql:
-          mfile.write(xml)
-          sql = "(" + " OR ".join(sql) + ") and way &amp;&amp; !bbox!" 
-          if zlayer == 0 and full_layering:
-            sql = "("+ sql +') and ("layer" not in ('+ ", ".join(['\'%s\''%i for i in range(-5,6) if i != 0])+") or \"layer\" is NULL)"
-          elif zlayer <=5 and zlayer >= -5 and full_layering:
-            sql = "("+ sql +') and "layer" = \'%s\''%zlayer
-          oitags = itags
-          itags = add_numerics_to_itags(itags)
-          
-          #### FIXME: Performance degrades painfully on large lines ST_Union. Gotta find workaround :(
-          #if layer_type == "polygon" and there_are_dashed_lines:
-            #itags = ", ".join(itags)
-            #oitags = '"'+ "\", \"".join(oitags) +'"'
-            #sqlz = """select %s, ST_LineMerge(ST_Union(way)) as way from
-                        #(SELECT %s, ST_Boundary(ST_Buffer(way,0)) as way from
-                            #(SELECT %s,  way from planet_osm_polygon where (%s)) tex
-                        #) p
-              #group by %s
-              #"""%(itags,oitags,sql,oitags)
-            ##elif layer_type == "line" and there_are_dashed_lines:
-            ##  sqlz = """select %s, ST_Union(way) as way from (SELECT * from planet_osm_line where way &amp;&amp; !bbox! #and (%s)) as tex
-            ##  group by %s
-            ##  """%(itags,sql,oitags)
-            #mfile.write(xml_layer("postgis-process", layer_type, itags, sqlz ))
-          #else:
-          mfile.write(xml_layer("postgis", layer_type, itags, sql ))
+          sql_g.update(sql)
+          xml_g += xml
+          itags_g.update(itags)
         else:
-          xml_nolayer()
+          xml_nosubstyle()
+      sql = sql_g
+      if sql:
+        mfile.write(xml_g)
+        sql = "(" + " OR ".join(sql) + ") and way &amp;&amp; !bbox!"
+        if zlayer == 0 and full_layering:
+          sql = "("+ sql +') and ("layer" not in ('+ ", ".join(['\'%s\''%i for i in range(-5,6) if i != 0])+") or \"layer\" is NULL)"
+        elif zlayer <=5 and zlayer >= -5 and full_layering:
+          sql = "("+ sql +') and "layer" = \'%s\''%zlayer
+        oitags = itags
+        itags = add_numerics_to_itags(itags)
+
+        #### FIXME: Performance degrades painfully on large lines ST_Union. Gotta find workaround :(
+        #if layer_type == "polygon" and there_are_dashed_lines:
+          #itags = ", ".join(itags)
+          #oitags = '"'+ "\", \"".join(oitags) +'"'
+          #sqlz = """select %s, ST_LineMerge(ST_Union(way)) as way from
+                      #(SELECT %s, ST_Boundary(ST_Buffer(way,0)) as way from
+                          #(SELECT %s,  way from planet_osm_polygon where (%s)) tex
+                      #) p
+            #group by %s
+            #"""%(itags,oitags,sql,oitags)
+          ##elif layer_type == "line" and there_are_dashed_lines:
+          ##  sqlz = """select %s, ST_Union(way) as way from (SELECT * from planet_osm_line where way &amp;&amp; !bbox! #and (%s)) as tex
+          ##  group by %s
+          ##  """%(itags,sql,oitags)
+          #mfile.write(xml_layer("postgis-process", layer_type, itags, sqlz ))
+        #else:
+        mfile.write(xml_layer("postgis", layer_type, itags, sql ))
+      else:
+        xml_nolayer()
   for layer_type, entry_types in [("point", ("node", "point")),("line",("way", "line")), ("polygon",("way","area"))]:
     for zindex in ta:
       ## icons pass
diff --git a/src/libkomapnik.py b/src/libkomapnik.py
index 706dc0d..5e878ea 100644
--- a/src/libkomapnik.py
+++ b/src/libkomapnik.py
@@ -294,4 +294,7 @@ def xml_layer(type="postgis", geom="point", interesting_tags = "*", sql = "true"
       </Layer>"""%(layer_id, db_proj, subs, world_bnd_path)
 def xml_nolayer():
   global substyles
-  substyles = []
\ No newline at end of file
+  substyles = []
+def xml_nosubstyle():
+  global substyles
+  substyles = substyles[:-1]
\ No newline at end of file