Merge pull request #93 from bitctrl/main

Also render pier as landusage

Author: yjacolin

generate_style.py

@@ -181,12 +181,12 @@
       where type in (\'forest\',\'wood\',\'pedestrian\',\'cemetery\',\'industrial\',\'commercial\',\
       \'brownfield\',\'residential\',\'school\',\'college\',\'university\',\
       \'military\',\'park\',\'golf_course\',\'hospital\',\'parking\',\'stadium\',\'sports_center\',\
-      \'pitch\') order by area desc) as foo using unique osm_id using srid=OSM_SRID"',
+      \'pitch\',\'pier\') order by area desc) as foo using unique osm_id using srid=OSM_SRID"',
       12:'"geometry from (select geometry ,osm_id, type, OSM_NAME_COLUMN as name from OSM_SCHEMA.OSM_PREFIX_landusages \
       where type in (\'forest\',\'wood\',\'pedestrian\',\'cemetery\',\'industrial\',\'commercial\',\
       \'brownfield\',\'residential\',\'school\',\'college\',\'university\',\
       \'military\',\'park\',\'golf_course\',\'hospital\',\'parking\',\'stadium\',\'sports_center\',\
-      \'pitch\') order by area desc) as foo using unique osm_id using srid=OSM_SRID"'
+      \'pitch\',\'pier\') order by area desc) as foo using unique osm_id using srid=OSM_SRID"'
    },
 
    'display_industrial': 1,

landusage.map

@@ -442,4 +442,33 @@ LAYER
     END
 END
 #endif
-#endif
+
+LAYER
+    TYPE POLYGON
+    STATUS ON
+    PROJECTION
+        "init=epsg:OSM_SRID"
+    END
+    NAME layername(landuse_on_water,_layer_suffix)
+    GROUP "default"
+    CONNECTIONTYPE POSTGIS
+    CONNECTION "OSM_DB_CONNECTION"
+  #if OSM_FORCE_POSTGIS_EXTENT == 1
+    EXTENT OSM_EXTENT
+  #endif
+    DATA _landusage_data
+    PROCESSING "LABEL_NO_CLIP=ON"
+    PROCESSING "CLOSE_CONNECTION=DEFER"
+    MAXSCALEDENOM _maxscale
+    MINSCALEDENOM _minscale
+    CLASSITEM "type"
+    LABELITEM "name"
+    CLASS
+      EXPRESSION 'pier'
+      STYLE
+         COLOR _pier_clr
+      END
+    END
+  END
+  
+  #endif