From cf59cf8d9cb1432a48c8a0293315d675a267249d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kom=D1=8Fpa?= <me@komzpa.net>
Date: Thu, 8 Jul 2010 00:34:26 +0300
Subject: [PATCH] PostGIS style generation fixes

---
 src/backend/postgis/__init__.py |  1 +
 src/make_postgis_style.py       | 13 ++++++++++---
 src/mapcss/__init__.py          |  4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/backend/postgis/__init__.py b/src/backend/postgis/__init__.py
index fcaba6a..3a475a5 100644
--- a/src/backend/postgis/__init__.py
+++ b/src/backend/postgis/__init__.py
@@ -81,6 +81,7 @@ class PostGisBackend:
             try:
               geom = geom.boundary
               geom = list(geom.coords)
+              row_dict[":area"] = "yes"
             except NotImplementedError:
               "multipolygon"
               continue
diff --git a/src/make_postgis_style.py b/src/make_postgis_style.py
index 8b6e3d2..261a404 100644
--- a/src/make_postgis_style.py
+++ b/src/make_postgis_style.py
@@ -20,7 +20,7 @@ from debug import debug, Timer
 from mapcss import MapCSS
 
 style = MapCSS(1, 19)     #zoom levels
-style.parse(open("styles/openstreetinfo.mapcss","r").read())
+style.parse(open("styles/mapink.mapcss","r").read())
 
 t = ("way", "node")
 dct = {}
@@ -32,13 +32,20 @@ for a in t:
     dct[tag].add(a)
 
 
-print dct
+
 print """
 # OsmType  Tag                DataType      Flags"""
+for t in ("z_order","way_area",":area"):
+  if t in dct:
+    del dct[t]
+
 for k,v in dct.iteritems():
   s = ""
   for i in v:
     s += i
     s += ","
   s = s[:-1]
-  print "%-10s %-18s %-13s %s"%(s, k, "text", "linear")
\ No newline at end of file
+  print "%-10s %-18s %-13s %s"%(s, k, "text", "polygon")
+print """
+node,way   z_order            int4          linear # This is calculated during import
+way        way_area           real                 # This is calculated during import"""
diff --git a/src/mapcss/__init__.py b/src/mapcss/__init__.py
index aadc64e..099f150 100644
--- a/src/mapcss/__init__.py
+++ b/src/mapcss/__init__.py
@@ -252,11 +252,11 @@ class MapCSS():
                 log.warning("choked on: %s"%(css))
                 return 
 
-      print sc
+      #print sc
       if (previous==oDECLARATION):
         self.choosers.append(sc)
         sc= StyleChooser()
-      print self.choosers
+      #print self.choosers
       return 
 #}