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

[rails.git] / config / key.yml

diff --git a/config/key.yml b/config/key.yml
index f1bfde91ffeea8fbfd8babf928a7a05b2c405d46..4446fbe6ec84d87af801d8ccbff931010b70b85f 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -1,14 +1,10 @@
 mapnik:
   - { min_zoom: 0, max_zoom: 19, name: motorway, image: motorway.png }
-  - { min_zoom: 0, max_zoom: 11, name: trunk, image: trunk.png }
-  - { min_zoom: 12, max_zoom: 19, name: trunk, image: trunk12.png }
-  - { min_zoom: 7, max_zoom: 11, name: primary, image: primary.png }
-  - { 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: 13, max_zoom: 19, name: unsurfaced, image: unsurfaced.png }
+  - { min_zoom: 0, max_zoom: 6, name: main_road, image: mainroad.png }
+  - { min_zoom: 7, max_zoom: 8, name: main_road, image: mainroad7.png }
+  - { min_zoom: 9, max_zoom: 11, name: main_road, image: mainroad9.png }
+  - { min_zoom: 12, max_zoom: 19, name: main_road, image: mainroad12.png }
   - { min_zoom: 13, max_zoom: 19, name: track, image: track.png }
-  - { min_zoom: 13, max_zoom: 19, name: byway, image: byway.png }
   - { 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 }
@@ -25,7 +21,6 @@ mapnik:
   - { min_zoom: 10, max_zoom: 19, name: golf, image: golf.png }
   - { min_zoom: 10, max_zoom: 19, name: park, image: park.png }
   - { min_zoom: 8, max_zoom: 19, name: resident, image: resident.png }
-  - { min_zoom: 10, max_zoom: 19, name: tourist, image: tourist.png }
   - { min_zoom: 10, max_zoom: 19, name: common, image: common.png }
   - { min_zoom: 10, max_zoom: 19, name: retail, image: retail.png }
   - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png }
@@ -47,6 +42,31 @@ mapnik:
   - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png }
   - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png }
   - { min_zoom: 15, max_zoom: 19, name: private, image: private.png }
-  - { min_zoom: 15, max_zoom: 19, name: permissive, image: permissive.png }
   - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png }
   - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png }
+cyclemap:
+  - { min_zoom: 0, max_zoom: 11, name: motorway, image: motorway.png }
+  - { min_zoom: 12, max_zoom: 19, name: motorway, image: motorway12.png }
+  - { min_zoom: 0, max_zoom: 11, name: trunk, image: trunk.png }
+  - { min_zoom: 12, max_zoom: 19, name: trunk, image: trunk12.png }
+  - { min_zoom: 7, max_zoom: 11, name: primary, image: primary.png }
+  - { 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: 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 }
+  - { min_zoom: 13, max_zoom: 19, name: cycleway_national, image: cycleway_national13.png }
+  - { min_zoom: 5, max_zoom: 12, name: cycleway_regional, image: cycleway_regional.png }
+  - { min_zoom: 13, max_zoom: 19, name: cycleway_regional, image: cycleway_regional13.png }
+  - { min_zoom: 8, max_zoom: 12, name: cycleway_local, image: cycleway_local.png }
+  - { min_zoom: 13, max_zoom: 19, name: cycleway_local, image: cycleway_local13.png }
+  - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png }
+  - { min_zoom: 7, max_zoom: 13, name: rail, image: rail.png }
+  - { min_zoom: 14, max_zoom: 19, name: rail, image: rail14.png }
+  - { min_zoom: 9, max_zoom: 19, name: forest, image: forest.png }
+  - { min_zoom: 10, max_zoom: 19, name: common, image: common.png }
+  - { min_zoom: 7, max_zoom: 19, name: lake, image: lake.png }
+  - { min_zoom: 14, max_zoom: 19, name: bicycle_shop, image: bicycle_shop.png }
+  - { min_zoom: 14, max_zoom: 19, name: bicycle_parking, image: bicycle_parking.png }
+  - { min_zoom: 16, max_zoom: 19, name: toilets, image: toilets.png }