add barrier styles, more cleanup

mapbox · Feb 3, 2012 · ac96318 · ac96318
1 parent bead944
commit ac96318
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/imposm-mapping.py b/imposm-mapping.py
@@ -226,7 +226,7 @@ class Highway(LineStrings):
         'barrier': (
             'ditch',
         ),
-	    'waterway': (
+	'waterway': (
             'stream',
             'river',
             'canal',
@@ -269,15 +269,14 @@ class Highway(LineStrings):
             'yes',
             'wire_fence',
             'toll_booth',
-            'stile	',
+            'stile',
     )}
 )
 barrierways = LineStrings(
     name = 'barrierways',
     mapping = {
         'barrier': (
             'city_wall',
-            'ditch',
             'fence',
             'hedge',
             'retaining_wall',

diff --git a/osm-bright/osm-bright.imposm.mml b/osm-bright/osm-bright.imposm.mml
@@ -355,6 +355,41 @@
       "srs-name": "900913", 
       "status": "on"
     }, 
+    {
+      "Datasource": {
+        "dbname": "osm", 
+        "extent": "-20037508.34 -20037508.34 20037508.34 20037508.34", 
+        "geometry_field": "geometry", 
+        "key_field": "", 
+        "table": "(select geometry, type,\n\tCASE\n\t\tWHEN type IN ('toll_booth', 'stile', 'gate', 'horse_stile','lift_gate', 'kissing_gate','cattle_grid','entrance') THEN 'gate'\n\t\tWHEN type IN ('block', 'bollard', 'chain', 'cycle_barrier', 'spikes', 'fence', 'wire_fence','yes') THEN 'divider'\n\tEND AS stylegroup\nFROM osm_barrierpoints\n) AS data", 
+        "type": "postgis"
+      }, 
+      "class": "", 
+      "geometry": "point", 
+      "id": "barrier_points", 
+      "name": "barrier_points", 
+      "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
+      "srs-name": "900913"
+    }, 
+    {
+      "Datasource": {
+        "dbname": "osm", 
+        "extent": "-20037508.34 -20037508.34 20037508.34 20037508.34", 
+        "geometry_field": "geometry", 
+        "id": "barrier_lines", 
+        "key_field": "", 
+        "project": "osm-bright", 
+        "srs": null, 
+        "table": "(SELECT geometry, type,\n\tCASE \n\t\tWHEN type IN ('city_wall', 'fence', 'retaining_wall', 'wall', 'wire_fence', 'yes') THEN 'fence'\n\t\tWHEN type IN ('gate', 'spikes', 'bollard', 'lift_gate', 'kissing_gate') THEN 'gate'\n\t\tWHEN type IN ('hedge') THEN 'hedge'\n\tEND AS stylegroup\nFROM osm_barrierways\n) AS data", 
+        "type": "postgis"
+      }, 
+      "class": "", 
+      "geometry": "linestring", 
+      "id": "barrier_lines", 
+      "name": "barrier_lines", 
+      "srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over", 
+      "srs-name": "900913"
+    }, 
     {
       "Datasource": {
         "dbname": "osm",