Merge pull request #62 from ian29/master

train stations
mapbox · Jul 25, 2016 · f1c8780 · f1c8780
2 parents 2d00d7a + f02dfe1
commit f1c8780
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 0 deletions.
diff --git a/osm-bright/img/icon/rail-12.png b/osm-bright/img/icon/rail-12.png
diff --git a/osm-bright/img/icon/rail-18.png b/osm-bright/img/icon/rail-18.png
diff --git a/osm-bright/img/icon/rail-24.png b/osm-bright/img/icon/rail-24.png
diff --git a/osm-bright/labels.mss b/osm-bright/labels.mss
@@ -459,4 +459,13 @@
 }
 
 
+/* ================================================================== */
+/* TRAIN STATIONS
+/* ================================================================== */
+
+#train_stations[zoom>15]{
+  point-file:url('img/icon/rail-12.png');
+  [zoom>=17] { point-file:url('img/icon/rail-18.png'); }
+}
+
 /* ****************************************************************** */
diff --git a/osm-bright/osm-bright.imposm.mml b/osm-bright/osm-bright.imposm.mml
@@ -542,6 +542,22 @@
       "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", 
       "status": "on"
+    },
+    {
+      "geometry": "point",
+      "Datasource": {
+        "type": "postgis",
+        "table": "( SELECT geometry, type, name \n  FROM osm_transport_points \n  WHERE type='station'\n) AS DATA ",
+        "key_field": "",
+        "geometry_field": "geometry",
+        "extent": "-20037508.34 -20037508.34 20037508.34 20037508.34",
+      },
+      "id": "train_stations",
+      "class": "",
+      "srs-name": "900913",
+      "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",
+      "advanced": {},
+      "name": "train_stations"
     }
   ], 
   "Stylesheet": [

diff --git a/osm-bright/osm-bright.osm2pgsql.mml b/osm-bright/osm-bright.osm2pgsql.mml
@@ -534,6 +534,29 @@
       "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", 
       "status": "on"
+    },
+    {
+      "geometry": "point",
+      "extent": [
+        -122.85990918289764,
+        47.38001179491598,
+        -121.86970418303555,
+        47.842970094896586
+      ],
+      "Datasource": {
+        "type": "postgis",
+        "table": "( SELECT way, railway AS type, name, z_order \n  FROM planet_osm_point \n  WHERE railway = 'station'\n  ORDER BY z_order NULLS LAST\n) AS DATA \n",
+        "key_field": "",
+        "geometry_field": "way",
+        "extent": "-20037508.34 -20037508.34 20037508.34 20037508.34",
+        "dbname": "osm"
+      },
+      "id": "train_stations",
+      "class": "",
+      "srs-name": "900913",
+      "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",
+      "advanced": {},
+      "name": "train_stations"
     }
   ], 
   "Stylesheet": [