Merge remote-tracking branch 'upstream/pull/4410'

[rails.git] / config / key.yml

diff --git a/config/key.yml b/config/key.yml
index 5ee24e9137428bdf3efc7c181a9a8d253f388e44..f099a5f47465a91c0bae409ab22be7ca5756c1d1 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -1,5 +1,5 @@
 mapnik:
-  # transportation
+  # transportation: roads.mss
   - { min_zoom: 6, max_zoom: 19, name: motorway, image: motorway.png }
   - { min_zoom: 6, max_zoom: 7, name: main_road, image: mainroad.png }
   - { min_zoom: 8, max_zoom: 11, name: main_road, image: mainroad8.png }
@@ -8,19 +8,29 @@ mapnik:
   - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png }
   - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png }
   - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png }
-  - { min_zoom: 8, max_zoom: 11, name: rail, image: rail.png }
-  - { min_zoom: 12, max_zoom: 19, name: rail, image: rail12.png }
-  - { min_zoom: 13, max_zoom: 19, name: subway, image: subway.png }
-  - { min_zoom: 13, max_zoom: 19, name: tram, image: tram.png }
+  - { min_zoom:  8, name: rail, width: 52, height: 1, fill: "#787878" }
+  - { min_zoom: 12, name: rail, image: rail12.svg }
+  - { min_zoom: 18, name: rail, image: rail18.svg }
+  - { min_zoom: 12, name: subway, width: 52, height: 2, fill: "#999" }
+  - { min_zoom:  8, name: light_rail, width: 52, height: 1, fill: "#ccc" }
+  - { min_zoom: 10, name: light_rail, width: 52, height: 1, fill: "#aaa" }
+  - { min_zoom: 13, name: light_rail, width: 52, height: 2, fill: "#666" }
+  - { min_zoom: 12, name: tram_only, width: 52, height: 1, fill: "#6e6e6eaa" }
+  - { min_zoom: 14, name: tram_only, width: 52, height: 1, fill: "#6e6e6e" }
+  - { min_zoom: 15, name: tram_only, image: tram15.svg }
+  - { min_zoom: 17, name: tram_only, width: 52, height: 2, fill: "#6e6e6e" }
   - { min_zoom: 12, max_zoom: 19, name: cable, image: cable.png }
   - { min_zoom: 11, max_zoom: 19, name: runway, image: runway.png }
-  - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png }
+  - { min_zoom: 11, name: apron_only, width: 26, height: 10, fill: "#dadae0" } # landcover.mss
   # administrative boundaries: admin.mss
   - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
   # landcover z5: landcover.mss, water.mss
   - { name: lake, width: 26, height: 10, fill: "#aad3df" }
+  - { name: intermittent_water, image: intermittent_water.svg }
   - { min_zoom: 5, max_zoom: 9, name: glacier, image: glacier5.svg }
   - { min_zoom: 10, name: glacier, image: glacier10.svg }
+  - { min_zoom: 10, name: reef, image: reef.png }
+  - { min_zoom: 10, name: wetland, image: wetland.png }
   - { min_zoom: 5, max_zoom: 11, name: forest, width: 26, height: 10, fill: "#bddab1" }
   - { min_zoom: 12, name: forest, width: 26, height: 10, fill: "#add19e" }
   - { min_zoom: 5, max_zoom: 11, name: orchard, width: 26, height: 10, fill: "#bee5b5" }
@@ -58,13 +68,19 @@ mapnik:
   - { min_zoom: 11, name: centre, width: 26, height: 10, fill: "#dffce2" }
   - { min_zoom: 10, name: reserve, image: reserve.svg } # admin.mss
   - { min_zoom: 8, name: military, image: military.svg }
+  - { min_zoom: 13, name: school, image: school.svg }
+  # buildings: buildings.mss
+  - { min_zoom: 14, name: building, width: 10, height: 10, fill: "#ab9793" }
+  - { min_zoom: 15, name: building, image: building15.svg }
+  - { min_zoom: 16, name: building, image: building16.svg }
+  # 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" }
+  - { min_zoom: 15, name: station, width: 9, height: 9, fill: "#7981b0" }
   # other
-  - { min_zoom: 12, max_zoom: 19, name: school, image: school.png }
-  - { min_zoom: 12, max_zoom: 19, name: building, image: building.png }
-  - { min_zoom: 12, max_zoom: 19, name: station, image: station.png }
-  - { min_zoom: 11, max_zoom: 19, name: summit, image: summit.png }
-  - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png }
-  - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png }
+  - { min_zoom: 11, name: summit, image: summit.svg } # amenity-points.mss
+  - { min_zoom: 13, name: tunnel, image: tunnel.svg } # roads.mss
+  - { min_zoom: 13, name: bridge, image: bridge.svg } # roads.mss
   - { min_zoom: 15, max_zoom: 19, name: private, image: private.png }
   - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png }
   - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png }
@@ -77,6 +93,7 @@ cyclemap:
   - { min_zoom: 12, max_zoom: 19, name: primary, image: primary12.png }
   - { min_zoom: 9, max_zoom: 11, name: secondary, image: secondary.png }
   - { min_zoom: 12, max_zoom: 19, name: secondary, image: secondary12.png }
+  - { min_zoom: 15, name: pedestrian, image: pedestrian.svg }
   - { min_zoom: 13, max_zoom: 19, name: track, image: track.png }
   - { min_zoom: 8, max_zoom: 19, name: cycleway, image: cycleway.png }
   - { min_zoom: 5, max_zoom: 12, name: cycleway_national, image: cycleway_national.png }
@@ -132,3 +149,12 @@ opnvkarte:
   - { min_zoom: 15, name: bus_stop, image: bus_stop15.svg }
   - { min_zoom: 13, name: stop, image: stop13.svg }
   - { min_zoom: 15, name: stop, image: stop15.svg }
+  - { min_zoom:  8, name: motorway, image: motorway8.svg }
+  - { min_zoom: 13, name: motorway, image: motorway13.svg }
+  - { min_zoom: 15, name: motorway, image: motorway15.svg }
+  - { min_zoom: 17, name: motorway, image: motorway17.svg }
+  - { min_zoom:  8, name: main_road, width: 52, height: 1, fill: "#5c6d6d88" }
+  - { min_zoom: 11, name: main_road, image: main_road11.svg }
+  - { min_zoom: 13, name: main_road, image: main_road13.svg }
+  - { min_zoom: 15, name: main_road, image: main_road15.svg }
+  - { min_zoom: 17, name: main_road, image: main_road17.svg }