Add subway, tram, bus stops to mapnik map key

diff --git a/config/key.yml b/config/key.yml
index a78dbb282b482a28db3f4fd81fea6ec9430c3612..032a2470465df5ad9d3b271b9e748da2aaf41c77 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -88,10 +88,15 @@ mapnik:
   - { min_zoom: 14, name: building, width: 10, height: 10, fill: "#ab9793" }
   - { min_zoom: 15, name: building, width: 10, height: 10, fill: "#b9a99c", border: "#a99a8d" }
   - { min_zoom: 16, name: building, width: 10, height: 10, fill: "#c4b6ab", border: "#a99a8d" }
   - { min_zoom: 14, name: building, width: 10, height: 10, fill: "#ab9793" }
   - { min_zoom: 15, name: building, width: 10, height: 10, fill: "#b9a99c", border: "#a99a8d" }
   - { min_zoom: 16, name: building, width: 10, height: 10, fill: "#c4b6ab", border: "#a99a8d" }

-  # stations: stations.mss
-  - { min_zoom: 12, name: station, width: 4, height: 4, fill: "#7981b0" }
-  - { min_zoom: 13, name: station, width: 6, height: 6, fill: "#7981b0" }
+  # stations: stations.mss, amenity-points.mss
+  - { min_zoom: 12, max_zoom: 12, name: station, width: 4, height: 4, fill: "#7981b0" }
+  - { min_zoom: 13, max_zoom: 13, name: station, width: 6, height: 6, fill: "#7981b0" }
+  - { min_zoom: 13, max_zoom: 13, name: railway_halt, width: 4, height: 4, fill: "#7981b0" }
+  - { min_zoom: 14, max_zoom: 14, name: [station, subway_station], width: 6, height: 6, fill: "#7981b0" }
+  - { min_zoom: 14, max_zoom: 14, name: [railway_halt, tram_stop], width: 4, height: 4, fill: "#7981b0" }

   - { min_zoom: 15, name: station, width: 9, height: 9, fill: "#7981b0" }
   - { min_zoom: 15, name: station, width: 9, height: 9, fill: "#7981b0" }

+  - { min_zoom: 15, name: [railway_halt, subway_station, tram_stop], width: 6, height: 6, fill: "#7981b0" }
+  - { min_zoom: 16, name: bus_stop, width: 6, height: 6, fill: "#0092da" }

   # other
   - { min_zoom: 11, name: [summit, peak], image: summit.svg } # amenity-points.mss
   - { min_zoom: 13, name: tunnel, width: 50, height: 5, casing: grey, casing-dasharray: "4 2", casing-dashoffset: 1 } # roads.mss
   # other
   - { min_zoom: 11, name: [summit, peak], image: summit.svg } # amenity-points.mss
   - { min_zoom: 13, name: tunnel, width: 50, height: 5, casing: grey, casing-dasharray: "4 2", casing-dashoffset: 1 } # roads.mss

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16015d92c33ac5c40feee67686c7d3a18ec5d3c2..e784df5ddf6685576b83f2157f4dd647a90e2081 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2375,6 +2375,9 @@ en:
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"
           hospital: "Hospital"
           building: "Significant building"
           station: "Railway station"

+          railway_halt: "Railway halt"
+          subway_station: "Subway station"
+          tram_stop: "Tram stop"

           summit: "Summit"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"
           summit: "Summit"
           peak: "Peak"
           tunnel: "Dashed casing = tunnel"