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

[rails.git] / config / key.yml

diff --git a/config/key.yml b/config/key.yml
index f3dfc58edf627b90cffc329490473517ce7ed060..4446fbe6ec84d87af801d8ccbff931010b70b85f 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -1,91 +1,72 @@
 mapnik:
 mapnik:

-  - { min_zoom: 0, max_zoom: 18, name: motorway, image: motorway.png }
+  - { min_zoom: 0, max_zoom: 19, name: motorway, image: motorway.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: 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: 12, name: rail, image: rail.png }
+  - { min_zoom: 13, max_zoom: 19, name: rail, image: rail13.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: 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: 0, max_zoom: 19, name: admin, image: admin.png }
+  - { min_zoom: 9, max_zoom: 19, name: forest, image: forest.png }
+  - { min_zoom: 10, max_zoom: 19, name: wood, image: wood.png }
+  - { 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: 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 }
+  - { min_zoom: 10, max_zoom: 19, name: commercial, image: commercial.png }
+  - { min_zoom: 10, max_zoom: 19, name: heathland, image: heathland.png }
+  - { min_zoom: 7, max_zoom: 19, name: lake, image: lake.png }
+  - { min_zoom: 10, max_zoom: 19, name: farm, image: farm.png }
+  - { min_zoom: 10, max_zoom: 19, name: brownfield, image: brownfield.png }
+  - { min_zoom: 11, max_zoom: 19, name: cemetery, image: cemetery.png }
+  - { min_zoom: 11, max_zoom: 19, name: allotments, image: allotments.png }
+  - { min_zoom: 11, max_zoom: 19, name: pitch, image: pitch.png }
+  - { min_zoom: 11, max_zoom: 19, name: centre, image: centre.png }
+  - { min_zoom: 11, max_zoom: 19, name: reserve, image: reserve.png }
+  - { min_zoom: 11, max_zoom: 19, name: military, image: military.png }
+  - { 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: 12, 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: 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 }
+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: 0, max_zoom: 11, name: trunk, image: trunk.png }

-  - { min_zoom: 12, max_zoom: 18, name: trunk, image: trunk12.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: 7, max_zoom: 11, name: primary, image: primary.png }

-  - { min_zoom: 12, max_zoom: 18, name: primary, image: primary12.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: 9, max_zoom: 11, name: secondary, image: secondary.png }

-  - { min_zoom: 12, max_zoom: 18, name: secondary, image: secondary12.png }
-  - { min_zoom: 13, max_zoom: 18, name: unsurfaced, image: unsurfaced.png }
-  - { min_zoom: 13, max_zoom: 18, name: track, image: track.png }
-  - { min_zoom: 13, max_zoom: 18, name: byway, image: byway.png }
-  - { min_zoom: 13, max_zoom: 18, name: bridleway, image: bridleway.png }
-  - { min_zoom: 13, max_zoom: 18, name: cycleway, image: cycleway.png }
-  - { min_zoom: 13, max_zoom: 18, name: footway, image: footway.png }
-  - { min_zoom: 8, max_zoom: 12, name: rail, image: rail.png }
-  - { min_zoom: 13, max_zoom: 18, name: rail, image: rail13.png }
-  - { min_zoom: 13, max_zoom: 18, name: subway, image: subway.png }
-  - { min_zoom: 13, max_zoom: 18, name: tram, image: tram.png }
-  - { min_zoom: 12, max_zoom: 18, name: cable, image: cable.png }
-  - { min_zoom: 11, max_zoom: 18, name: runway, image: runway.png }
-  - { min_zoom: 12, max_zoom: 18, name: apron, image: apron.png }
-  - { min_zoom: 0, max_zoom: 18, name: admin, image: admin.png }
-  - { min_zoom: 9, max_zoom: 18, name: forest, image: forest.png }
-  - { min_zoom: 10, max_zoom: 18, name: wood, image: wood.png }
-  - { min_zoom: 10, max_zoom: 18, name: golf, image: golf.png }
-  - { min_zoom: 10, max_zoom: 18, name: park, image: park.png }
-  - { min_zoom: 8, max_zoom: 18, name: resident, image: resident.png }
-  - { min_zoom: 10, max_zoom: 18, name: tourist, image: tourist.png }
-  - { min_zoom: 10, max_zoom: 18, name: common, image: common.png }
-  - { min_zoom: 10, max_zoom: 18, name: retail, image: retail.png }
-  - { min_zoom: 10, max_zoom: 18, name: industrial, image: industrial.png }
-  - { min_zoom: 10, max_zoom: 18, name: commercial, image: commercial.png }
-  - { min_zoom: 10, max_zoom: 18, name: heathland, image: heathland.png }
-  - { min_zoom: 7, max_zoom: 18, name: lake, image: lake.png }
-  - { min_zoom: 10, max_zoom: 18, name: farm, image: farm.png }
-  - { min_zoom: 10, max_zoom: 18, name: brownfield, image: brownfield.png }
-  - { min_zoom: 11, max_zoom: 18, name: cemetery, image: cemetery.png }
-  - { min_zoom: 11, max_zoom: 18, name: allotments, image: allotments.png }
-  - { min_zoom: 11, max_zoom: 18, name: pitch, image: pitch.png }
-  - { min_zoom: 11, max_zoom: 18, name: centre, image: centre.png }
-  - { min_zoom: 11, max_zoom: 18, name: reserve, image: reserve.png }
-  - { min_zoom: 11, max_zoom: 18, name: military, image: military.png }
-  - { min_zoom: 12, max_zoom: 18, name: school, image: school.png }
-  - { min_zoom: 12, max_zoom: 18, name: building, image: building.png }
-  - { min_zoom: 12, max_zoom: 18, name: station, image: station.png }
-  - { min_zoom: 12, max_zoom: 18, name: summit, image: summit.png }
-  - { min_zoom: 12, max_zoom: 18, name: tunnel, image: tunnel.png }
-  - { min_zoom: 13, max_zoom: 18, name: bridge, image: bridge.png }
-  - { min_zoom: 15, max_zoom: 18, name: private, image: private.png }
-  - { min_zoom: 15, max_zoom: 18, name: permissive, image: permissive.png }
-  - { min_zoom: 15, max_zoom: 18, name: destination, image: destination.png }
-  - { min_zoom: 12, max_zoom: 18, name: construction, image: construction.png }
-
-osmarender:
-  - { min_zoom: 0, max_zoom: 18, name: motorway, image: motorway.png }
-  - { min_zoom: 0, max_zoom: 18, name: trunk, image: trunk.png }
-  - { min_zoom: 7, max_zoom: 18, name: primary, image: primary.png }
-  - { min_zoom: 9, max_zoom: 18, name: secondary, image: secondary.png }
-  - { min_zoom: 13, max_zoom: 18, name: unsurfaced, image: unsurfaced.png }
-  - { min_zoom: 13, max_zoom: 18, name: track, image: track.png }
-  - { min_zoom: 13, max_zoom: 18, name: byway, image: byway.png }
-  - { min_zoom: 13, max_zoom: 18, name: bridleway, image: bridleway.png }
-  - { min_zoom: 13, max_zoom: 18, name: cycleway, image: cycleway.png }
-  - { min_zoom: 13, max_zoom: 18, name: footway, image: footway.png }
-  - { min_zoom: 8, max_zoom: 18, name: rail, image: rail.png }
-  - { min_zoom: 13, max_zoom: 18, name: subway, image: subway.png }
-  - { min_zoom: 13, max_zoom: 18, name: tram, image: tram.png }
-  - { min_zoom: 0, max_zoom: 18, name: admin, image: admin.png }
-  - { min_zoom: 9, max_zoom: 18, name: forest, image: forest.png }
-  - { min_zoom: 10, max_zoom: 18, name: wood, image: wood.png }
-  - { min_zoom: 10, max_zoom: 18, name: park, image: park.png }
-  - { min_zoom: 8, max_zoom: 18, name: resident, image: resident.png }
-  - { min_zoom: 10, max_zoom: 18, name: tourist, image: tourist.png }
-  - { min_zoom: 10, max_zoom: 18, name: common, image: common.png }
-  - { min_zoom: 10, max_zoom: 18, name: retail, image: retail.png }
-  - { min_zoom: 10, max_zoom: 18, name: industrial, image: industrial.png }
-  - { min_zoom: 10, max_zoom: 18, name: commercial, image: commercial.png }
-  - { min_zoom: 10, max_zoom: 18, name: heathland, image: heathland.png }
-  - { min_zoom: 7, max_zoom: 18, name: lake, image: lake.png }
-  - { min_zoom: 10, max_zoom: 18, name: farm, image: farm.png }
-  - { min_zoom: 10, max_zoom: 18, name: brownfield, image: brownfield.png }
-  - { min_zoom: 11, max_zoom: 18, name: cemetery, image: cemetery.png }
-  - { min_zoom: 11, max_zoom: 18, name: allotments, image: allotments.png }
-  - { min_zoom: 11, max_zoom: 18, name: pitch, image: pitch.png }
-  - { min_zoom: 11, max_zoom: 18, name: centre, image: centre.png }
-  - { min_zoom: 11, max_zoom: 18, name: reserve, image: reserve.png }
-  - { min_zoom: 11, max_zoom: 18, name: military, image: military.png }
-  - { min_zoom: 12, max_zoom: 18, name: school, image: school.png }
-  - { min_zoom: 12, max_zoom: 18, name: building, image: building.png }
-  - { min_zoom: 12, max_zoom: 18, name: station, image: station.png }
-  - { min_zoom: 12, max_zoom: 18, name: summit, image: summit.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 }