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

diff --combined config/key.yml
index 455f221307c3873c4fcc73c63b5eaa2c390f2285,9c99b6f2b3244e4a1813efa1f4e67419f4009fc7..f741a795351b1a7521171ca3288ef4732929d5d4
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -100,33 -100,31 +100,36 @@@ mapnik
    - { min_zoom: 15, name: destination, image: destination.png }
    - { min_zoom: 12, name: construction, image: construction.png }
  cyclemap:
 -  - { min_zoom:  5, name: motorway, width: 50, height: 3, fill: "#9a9ab1" }
 +  - { min_zoom:  5, name: motorway, width: 50, height: 2, fill: "#9a9ab1" }
 +  - { min_zoom:  9, name: motorway, width: 50, height: 3, fill: "#9a9ab1" }
    - { min_zoom: 12, name: motorway, width: 50, height: 5, fill: "#bdbece", casing: "#8d95a7" }
 +  - { min_zoom: 13, name: motorway, width: 50, height: 9, fill: "#bdbece", casing: "#8d95a7" }
    - { min_zoom:  6, name: trunk, width: 50, height: 2, fill: "#c8d8c8" }
 -  - { min_zoom: 12, name: trunk, width: 50, height: 5, fill: "#c8d8c8", casing: "#abb5a4" }
 +  - { min_zoom: 12, name: trunk, width: 50, height: 4, fill: "#c8d8c8", casing: "#abb5a4" }
 +  - { min_zoom: 13, name: trunk, width: 50, height: 8, fill: "#c8d8c8", casing: "#abb5a4" }
    - { min_zoom:  8, name: primary, width: 50, height: 2, fill: "#d8c8c8" }
    - { min_zoom: 12, name: primary, width: 50, height: 4, fill: "#f0e3e3", casing: "#d4b6b7" }
 +  - { min_zoom: 13, name: primary, width: 50, height: 8, fill: "#f0e3e3", casing: "#d4b6b7" }
    - { min_zoom: 10, name: secondary, width: 50, height: 1, fill: "#dadacc" }
    - { min_zoom: 12, name: secondary, width: 50, height: 4, fill: "#ededc8", casing: "#c8b48a" }
 -  - { min_zoom: 15, name: pedestrian, width: 50, height: 4, fill: "#e2e3e2", casing: "#9a9a9a" }
 +  - { min_zoom: 13, name: secondary, width: 50, height: 7, fill: "#ededc8", casing: "#c8b48a" }
 +  - { min_zoom: 15, name: pedestrian, width: 50, height: 6, fill: "#e2e3e2", casing: "#9a9a9a" }
    - { min_zoom: 13, name: track, width: 50, height: 3, fill: white, casing: "#999", casing-dasharray: "5 3", casing-dashoffset: 1 }
    - { min_zoom: 15, name: track, width: 50, height: 4, fill: white, casing: "#999", casing-dasharray: "5 3", casing-dashoffset: 1 }
    - { min_zoom: 17, name: track, width: 50, height: 5, fill: white, casing: "#999", casing-dasharray: "5 3", casing-dashoffset: 1 }
    - { min_zoom: 13, name: bridleway, width: 52, height: 3, line: green, line-width: 1.5, line-dasharray: "4 2" }
    - { min_zoom:  8, name: cycleway, width: 50, height: 3, line: "#0100fe", line-width: 1.5, line-dasharray: "6 2" }
-   - { min_zoom:  5, name: cycleway_national, width: 50, height: 2, fill: "#fe0000" }
-   - { min_zoom: 13, name: cycleway_national, width: 50, height: 4, fill: "#ffb3b3" }
-   - { min_zoom:  7, name: cycleway_regional, width: 50, height: 2, fill: "#b638fb" }
-   - { min_zoom: 13, name: cycleway_regional, width: 50, height: 4, fill: "#ddb5d9" }
+   - { min_zoom:  5, name: cycleway_national, width: 50, height:  2, fill: "#fe0000" }
+   - { min_zoom: 12, name: cycleway_national, width: 50, height:  3, fill: "#fe0000" }
+   - { min_zoom: 13, name: cycleway_national, width: 50, height: 12, fill: "#ffb3b3" }
+   - { min_zoom:  7, name: cycleway_regional, width: 50, height:  2, fill: "#b638fb" }
+   - { min_zoom: 12, name: cycleway_regional, width: 50, height:  3, fill: "#b638fb" }
+   - { min_zoom: 13, name: cycleway_regional, width: 50, height: 10, fill: "#ddb5d9" }
    - { min_zoom:  8, name: cycleway_local, width: 50, height: 2, fill: "#0100fe" }
-   - { min_zoom: 13, name: cycleway_local, width: 50, height: 4, fill: "#b2b2ff" }
+   - { min_zoom: 12, name: cycleway_local, width: 50, height: 3, fill: "#0100fe" }
+   - { min_zoom: 13, name: cycleway_local, width: 50, height: 8, fill: "#b2b2ff" }
    - { min_zoom: 10, name: cycleway_mtb, width: 50, height: 2, fill: "#ff7b1c" }
-   - { min_zoom: 13, name: cycleway_mtb, width: 50, height: 4, fill: "#fbcaa3" }
+   - { min_zoom: 13, name: cycleway_mtb, width: 50, height: 6, fill: "#fbcaa3" }
    - { min_zoom: 13, name: footway, width: 50, height: 3, line: "#bd6d6e", line-width: 1.5, line-dasharray: "6 2" }
    - { min_zoom:  7, name: rail, width: 50, height: 3, line: "#999999", line-width: 1.5 }
    - { min_zoom: 14, name: rail, width: 50, height: 4, fill: "#999999", line: white, line-dasharray: 4, line-width: 2 }