X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/036ef0add012aa3f329ee63e4894d59396670dc8..cd4c4967fb5b1c2f80e81fa9778edac3a6b40193:/config/key.yml

diff --git a/config/key.yml b/config/key.yml
index a70ca1924..798d9ca54 100644
--- 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" }
-  # 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: [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
@@ -138,63 +143,18 @@ cyclemap:
   - { min_zoom: 10, name: meadow, width: 26, height: 10, fill: "#c0de9c" }
   - { min_zoom: 10, name: park, width: 26, height: 10, fill: "#cbe4c4" }
   - { min_zoom: 10, name: common, width: 26, height: 10, fill: "#d4f0d1" }
+  - { min_zoom: 10, name: heathland, width: 26, height: 10, fill: "#eaf0d6" }
+  - { min_zoom: 11, max_zoom: 13, name: resident, width: 26, height: 10, fill: "#e2e2e2" }
+  - { min_zoom: 11, name: industrial, width: 26, height: 10, fill: "#f1dede" }
+  - { min_zoom: 11, name: allotments, width: 26, height: 10, fill: "#d7d7b1" }
+  - { min_zoom: 12, name: cemetery, width: 26, height: 10, fill: "#abcfb1" }
+  - { min_zoom: 12, name: pitch, width: 26, height: 10, fill: "#ade0c5" }
+  - { min_zoom: 13, name: centre, width: 26, height: 10, fill: "#b4e9cd" }
+  - { min_zoom: 13, name: beach, image: beach.png }
+  - { min_zoom: 13, name: [school, university], width: 26, height: 10, fill: "#f0f0d8" }
   - { min_zoom: 14, name: bicycle_shop, image: bicycle_shop.png }
   - { min_zoom: 15, name: bicycle_rental, image: bicycle_rental_small.svg }
   - { min_zoom: 17, name: bicycle_rental, image: bicycle_rental.png }
   - { min_zoom: 15, name: bicycle_parking, image: bicycle_parking.png }
   - { min_zoom: 16, name: bicycle_parking_small, image: bicycle_parking_small.svg }
   - { min_zoom: 16, name: toilets, image: toilets.png }
-opnvkarte:
-  - { min_zoom:  6, name: rail, width: 52, height: 1, fill: "#868686" }
-  - { min_zoom:  8, name: rail, width: 52, height: 2, fill: "#868686" }
-  - { min_zoom: 11, name: rail, width: 52, height: 3, fill: "#868686", line: "#eeeeee", line-dasharray: 10, line-dashoffset: 9 }
-  - { min_zoom: 15, name: rail, width: 52, height: 4, fill: "#868686", line: "#eeeeee", line-dasharray: 10, line-dashoffset: 9, line-width: 2 }
-  - { min_zoom: 17, name: rail, image: rail17.svg }
-  - { min_zoom:  6, name: train, width: 52, height:  2, fill: "#ffc366" }
-  - { min_zoom: 10, name: train, width: 52, height:  3, fill: "#ffc366" }
-  - { min_zoom: 12, name: train, width: 52, height:  4, fill: "#ffc366" }
-  - { min_zoom: 14, name: train, width: 52, height:  8, fill: "#ffc366" }
-  - { min_zoom: 16, name: train, width: 52, height: 10, fill: "#ffc366" }
-  - { min_zoom: 10, name: light_rail, width: 52, height:  3, fill: "#66ff66" }
-  - { min_zoom: 12, name: light_rail, width: 52, height:  4, fill: "#66ff66" }
-  - { min_zoom: 14, name: light_rail, width: 52, height:  8, fill: "#66ff66" }
-  - { min_zoom: 16, name: light_rail, width: 52, height: 10, fill: "#66ff66" }
-  - { min_zoom: 10, name: tram, width: 52, height:  3, fill: "#3333fe" }
-  - { min_zoom: 12, name: tram, width: 52, height:  4, fill: "#3333fe" }
-  - { min_zoom: 14, name: tram, width: 52, height:  8, fill: "#3333fe" }
-  - { min_zoom: 16, name: tram, width: 52, height: 10, fill: "#3333fe" }
-  - { min_zoom: 10, name: subway, width: 52, height:  3, fill: "#33339f" }
-  - { min_zoom: 12, name: subway, width: 52, height:  4, fill: "#33339f" }
-  - { min_zoom: 14, name: subway, width: 52, height:  8, fill: "#33339f" }
-  - { min_zoom: 16, name: subway, width: 52, height: 10, fill: "#33339f" }
-  - { min_zoom:  9, name: ferry, width: 52, height: 2, fill: "#9f339f" }
-  - { min_zoom: 14, name: ferry, width: 52, height: 3, fill: "#9f339f" }
-  - { min_zoom: 10, name: trolleybus, width: 52, height:  3, fill: "#9f3333" }
-  - { min_zoom: 12, name: trolleybus, width: 52, height:  4, fill: "#9f3333" }
-  - { min_zoom: 14, name: trolleybus, width: 52, height:  8, fill: "#9f3333" }
-  - { min_zoom: 16, name: trolleybus, width: 52, height: 10, fill: "#9f3333" }
-  - { min_zoom: 11, name: bus, width: 52, height:  1, fill: "#fe3333" }
-  - { min_zoom: 12, name: bus, width: 52, height:  2, fill: "#fe3333" }
-  - { min_zoom: 13, name: bus, width: 52, height:  3, fill: "#fe3333" }
-  - { min_zoom: 14, name: bus, width: 52, height:  4, fill: "#fe3333" }
-  - { min_zoom: 16, name: bus, width: 52, height: 10, fill: "#fe3333" }
-  - { min_zoom: 13, name: bus_stop, image: bus_stop13.svg }
-  - { 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, width: 52, height:  4, fill: "#dddddd", casing: "#6d6d6d" }
-  - { min_zoom: 13, name: motorway, width: 52, height:  8, fill: "#dddddd", casing: "#6d6d6d" }
-  - { min_zoom: 15, name: motorway, width: 52, height: 13, fill: "#dddddd", casing: "#6d6d6d", line: "#ffffff", line-dasharray: 12, line-dashoffset: 4 }
-  - { min_zoom: 17, name: motorway, width: 52, height: 17, fill: "#dddddd", casing: "#6d6d6d", line: "#ffffff", line-dasharray: 12, line-dashoffset: 4, casing-width: 2 }
-  - { min_zoom:  8, name: main_road, width: 52, height:  1, fill: "#5c6d6d88" }
-  - { min_zoom: 11, name: main_road, width: 52, height:  4, fill: "#dddddd", casing: "#a1968b" }
-  - { min_zoom: 13, name: main_road, width: 52, height:  8, fill: "#dddddd", casing: "#a1968b" }
-  - { min_zoom: 15, name: main_road, width: 52, height: 13, fill: "#dddddd", casing: "#a1968b" }
-  - { min_zoom: 17, name: main_road, width: 52, height: 17, fill: "#dddddd", casing: "#a1968b" }
-  # landcover
-  - { min_zoom:  0, name: [lake, reservoir], width: 26, height: 10, fill: "#a1cbea" }
-  - { min_zoom:  8, name: [lake, reservoir], width: 26, height: 10, fill: "#bfd3ef" }
-  - { min_zoom:  4, name: [forest, wood], width: 26, height: 10, fill: "#b9c5a3" }
-  - { min_zoom:  4, name: built_up, width: 26, height: 10, fill: "#d8d8d8" }
-  - { min_zoom:  9, name: farmland, width: 26, height: 10, fill: "#eae8d6" }
-  - { min_zoom: 12, name: [park, allotments], width: 26, height: 10, fill: "#c2d89a" }