Merge remote-tracking branch 'openstreetmap/pull/1004'

diff --cc config/key.yml
index b6c9b50cf42b1933bb72b44c103e0b1abef5f049,996eb273e2093970cc6d8f9fa2a57d04026f6538..4446fbe6ec84d87af801d8ccbff931010b70b85f
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -42,5 -47,32 +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 }

diff --cc config/locales/en.yml
index 1cfbf8ab13f86b2edf0a160f050a98bfcdc73622,f2aa1c7dbb87517c7302c1939205b7555f87e836..807ad16493fb06458576c197252f4590ecf54283
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1430,9 -1429,14 +1430,12 @@@ en
            primary: "Primary road"
            secondary: "Secondary road"
            unclassified: "Unclassified road"
 -          unsurfaced: "Unsurfaced road"
            track: "Track"
 -          byway: "Byway"
            bridleway: "Bridleway"
            cycleway: "Cycleway"
+           cycleway_national: "National cycleway"
+           cycleway_regional: "Regional cycleway"
+           cycleway_local: "Local cycleway"
            footway: "Footway"
            rail: "Railway"
            subway: "Subway"
@@@ -1483,8 -1488,11 +1486,10 @@@
            tunnel: "Dashed casing = tunnel"
            bridge: "Black casing = bridge"
            private: "Private access"
 -          permissive: "Permissive access"
            destination: "Destination access"
            construction: "Roads under construction"
+           bicycle_shop: "Bicycle shop"
+           bicycle_parking: "Bicycle parking"
      richtext_area:
        edit: Edit
        preview: Preview