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

[rails.git] / config / key.yml

diff --git a/config/key.yml b/config/key.yml
index 8314533377663004d616869945c04dcbe61fe16c..5ee24e9137428bdf3efc7c181a9a8d253f388e44 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -95,25 +95,40 @@ cyclemap:
   - { min_zoom: 14, max_zoom: 19, name: bicycle_parking, image: bicycle_parking.png }
   - { min_zoom: 16, max_zoom: 19, name: toilets, image: toilets.png }
 opnvkarte:
-  - { min_zoom: 6, max_zoom: 7, name: rail, width: 52, height: 1, fill: "#868686" }
-  - { min_zoom: 8, max_zoom: 10, name: rail, width: 52, height: 2, fill: "#868686" }
-  - { min_zoom: 11, max_zoom: 14, name: rail, image: rail11.svg }
-  - { min_zoom: 15, max_zoom: 16, name: rail, image: rail15.svg }
+  - { 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, image: rail11.svg }
+  - { min_zoom: 15, name: rail, image: rail15.svg }
   - { min_zoom: 17, name: rail, image: rail17.svg }
-  - { min_zoom: 6, max_zoom: 9, name: train, width: 52, height: 2, fill: "#ffc366" }
-  - { min_zoom: 10, max_zoom: 11, name: train, width: 52, height: 3, fill: "#ffc366" }
-  - { min_zoom: 12, name: train, width: 52, height: 4, fill: "#ffc366" }
-  - { min_zoom: 10, name: light_rail, width: 52, height: 4, fill: "#66ff66" }
-  - { min_zoom: 10, name: tram_only, width: 52, height: 4, fill: "#3333fe" }
-  - { min_zoom: 10, name: subway, width: 52, height: 4, fill: "#33339f" }
-  - { min_zoom: 9, max_zoom: 13, name: ferry, width: 52, height: 2, fill: "#9f339f" }
+  - { 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_only, width: 52, height:  3, fill: "#3333fe" }
+  - { min_zoom: 12, name: tram_only, width: 52, height:  4, fill: "#3333fe" }
+  - { min_zoom: 14, name: tram_only, width: 52, height:  8, fill: "#3333fe" }
+  - { min_zoom: 16, name: tram_only, 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: 4, fill: "#9f3333" }
-  - { min_zoom: 11, max_zoom: 11, name: bus, width: 52, height: 1, fill: "#fe3333" }
-  - { min_zoom: 12, max_zoom: 12, name: bus, width: 52, height: 2, fill: "#fe3333" }
-  - { min_zoom: 13, max_zoom: 13, name: bus, width: 52, height: 3, fill: "#fe3333" }
-  - { min_zoom: 14, name: bus, width: 52, height: 4, fill: "#fe3333" }
-  - { min_zoom: 13, max_zoom: 14, name: bus_stop, image: bus_stop13.svg }
+  - { 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, max_zoom: 14, name: stop, image: stop13.svg }
+  - { min_zoom: 13, name: stop, image: stop13.svg }
   - { min_zoom: 15, name: stop, image: stop15.svg }