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

config/key.yml

@@ -85,29 +85,29 @@ mapnik:
   - { min_zoom: 15, name: destination, image: destination.png }
   - { min_zoom: 12, name: construction, image: construction.png }
 cyclemap:
-  - { min_zoom:  0, name: motorway, image: motorway.png }
+  - { min_zoom:  0, name: motorway, width: 50, height: 3, fill: "#9a9ab1" }
   - { min_zoom: 12, name: motorway, image: motorway12.png }
-  - { min_zoom:  0, name: trunk, image: trunk.png }
+  - { min_zoom:  0, name: trunk, width: 50, height: 2, fill: "#c8d8c8" }
   - { min_zoom: 12, name: trunk, image: trunk12.png }
-  - { min_zoom:  7, name: primary, image: primary.png }
+  - { min_zoom:  7, name: primary, width: 50, height: 2, fill: "#d8c8c8" }
   - { min_zoom: 12, name: primary, image: primary12.png }
-  - { min_zoom:  9, name: secondary, image: secondary.png }
+  - { min_zoom:  9, name: secondary, width: 50, height: 1, fill: "#dadacc" }
   - { min_zoom: 12, name: secondary, image: secondary12.png }
   - { min_zoom: 15, name: pedestrian, image: pedestrian.svg }
   - { min_zoom: 13, name: track, image: track.png }
   - { min_zoom:  8, name: cycleway, image: cycleway.png }
-  - { min_zoom:  5, name: cycleway_national, image: cycleway_national.png }
+  - { min_zoom:  5, name: cycleway_national, width: 50, height: 2, fill: "#fe0000" }
-  - { min_zoom: 13, name: cycleway_national, image: cycleway_national13.png }
+  - { min_zoom: 13, name: cycleway_national, width: 50, height: 4, fill: "#ffb3b3" }
-  - { min_zoom:  5, name: cycleway_regional, image: cycleway_regional.png }
+  - { min_zoom:  5, name: cycleway_regional, width: 50, height: 2, fill: "#b638fb" }
-  - { min_zoom: 13, name: cycleway_regional, image: cycleway_regional13.png }
+  - { min_zoom: 13, name: cycleway_regional, width: 50, height: 4, fill: "#ddb5d9" }
-  - { min_zoom:  8, name: cycleway_local, image: cycleway_local.png }
+  - { min_zoom:  8, name: cycleway_local, width: 50, height: 2, fill: "#0100fe" }
-  - { min_zoom: 13, name: cycleway_local, image: cycleway_local13.png }
+  - { min_zoom: 13, name: cycleway_local, width: 50, height: 4, fill: "#b2b2ff" }
   - { min_zoom: 13, name: footway, image: footway.svg }
   - { min_zoom:  7, name: rail, image: rail.png }
   - { min_zoom: 14, name: rail, image: rail14.png }
-  - { min_zoom:  9, name: forest, image: forest.png }
+  - { min_zoom:  9, name: forest, width: 26, height: 10, fill: "#cde1c4" }
-  - { min_zoom: 10, name: common, image: common.png }
+  - { min_zoom: 10, name: common, width: 26, height: 10, fill: "#bcdd92" }
-  - { min_zoom:  7, name: lake, image: lake.png }
+  - { min_zoom:  7, name: lake, width: 26, height: 10, fill: "#b5d0d0" }
   - { min_zoom: 14, name: bicycle_shop, image: bicycle_shop.png }
   - { min_zoom: 14, name: bicycle_parking, image: bicycle_parking.png }
   - { min_zoom: 16, name: toilets, image: toilets.png }