From e1b4599c1a1490d7f599f7d89a58499dc116e1d7 Mon Sep 17 00:00:00 2001
From: Komzpa <me@komzpa.net>
Date: Sun, 9 Oct 2011 19:50:39 +0200
Subject: [PATCH] fixed polygon-over-line-on-same-z-index

---
 src/komap.py | 83 ++++++++++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 42 deletions(-)

diff --git a/src/komap.py b/src/komap.py
index 965cd09..3bbd615 100644
--- a/src/komap.py
+++ b/src/komap.py
@@ -381,14 +381,15 @@ if options.renderer == "mapnik":
         else:
           xml_nolayer()
 
-      for layer_type, entry_types in [("line",("way", "line")),("polygon",("way","area"))]:
-        ## lines and polygons pass
-        sql_g = set()
-        there_are_dashed_lines = False
-        there_are_line_patterns = False
-        itags_g = set()
-        xml_g = ""
-        for zindex in ta:
+      for zindex in ta:
+        for layer_type, entry_types in [("line",("way", "line")),("polygon",("way","area"))]:
+          ## lines and polygons pass
+          sql_g = set()
+          there_are_dashed_lines = False
+          there_are_line_patterns = False
+          itags_g = set()
+          xml_g = ""
+        
           sql = set()
           itags = set()
           xml = xml_style_start()
@@ -401,8 +402,6 @@ if options.renderer == "mapnik":
                   continue
               elif zlayer not in range(-5,6):
                 continue
-
-
               if "width" in entry["style"] or "pattern-image" in entry["style"] or (("fill-color" in entry["style"] or "fill-image" in entry["style"]) and layer_type == "polygon"):
                 xml += xml_rule_start()
                 xml += x_scale
@@ -472,41 +471,41 @@ if options.renderer == "mapnik":
             itags_g.update(itags)
           else:
             xml_nosubstyle()
-        sql = sql_g
-        itags = itags_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)
-          if layer_type == "polygon" and there_are_line_patterns:
-            itags = ", ".join(itags)
-            oitags = '"'+ "\", \"".join(oitags) +'"'
-            sqlz = """SELECT %s, ST_ForceRHR(way) as way from planet_osm_polygon where (%s) and way &amp;&amp; !bbox! and ST_IsValid(way)"""%(itags,sql)
-            mfile.write(xml_layer("postgis-process", layer_type, itags, sqlz, zoom=zoom ))
+          sql = sql_g
+          itags = itags_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)
+            if layer_type == "polygon" and there_are_line_patterns:
+              itags = ", ".join(itags)
+              oitags = '"'+ "\", \"".join(oitags) +'"'
+              sqlz = """SELECT %s, ST_ForceRHR(way) as way from planet_osm_polygon where (%s) and way &amp;&amp; !bbox! and ST_IsValid(way)"""%(itags,sql)
+              mfile.write(xml_layer("postgis-process", layer_type, itags, sqlz, zoom=zoom ))
 
 
-          #### 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(way) as way from planet_osm_polygon where (%s) and way &amp;&amp; !bbox! and ST_IsValid(way)  ) tex
-              #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, zoom=zoom ))
+            #### 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(way) as way from planet_osm_polygon where (%s) and way &amp;&amp; !bbox! and ST_IsValid(way)  ) tex
+                #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, zoom=zoom ))
+            else:
+              mfile.write(xml_layer("postgis", layer_type, itags, sql, zoom=zoom ))
           else:
-            mfile.write(xml_layer("postgis", layer_type, itags, sql, zoom=zoom ))
-        else:
-          xml_nolayer()
+            xml_nolayer()