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

diff --combined config/key.yml
index f099a5f47465a91c0bae409ab22be7ca5756c1d1,4da0611b9d3f933458b5b25180f4b8f27104d9a0..ff19321ac32effffbbda09ca6edbe7408ab9d784
--- 1/config/key.yml
--- 2/config/key.yml
+++ b/config/key.yml
@@@ -21,7 -21,7 +21,7 @@@ mapnik
    - { min_zoom: 17, name: tram_only, width: 52, height: 2, fill: "#6e6e6e" }
    - { 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: 11, name: apron_only, width: 26, height: 10, fill: "#dadae0" } # landcover.mss
    # administrative boundaries: admin.mss
    - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
    # landcover z5: landcover.mss, water.mss
@@@ -85,32 -85,31 +85,32 @@@
    - { 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:  0, name: motorway, image: motorway.png }
+   - { min_zoom: 12, name: motorway, image: motorway12.png }
+   - { min_zoom:  0, name: trunk, image: trunk.png }
+   - { min_zoom: 12, name: trunk, image: trunk12.png }
+   - { min_zoom:  7, name: primary, image: primary.png }
+   - { min_zoom: 12, name: primary, image: primary12.png }
+   - { min_zoom:  9, name: secondary, image: secondary.png }
+   - { min_zoom: 12, name: secondary, image: secondary12.png }
 +  - { min_zoom: 15, name: pedestrian, image: pedestrian.svg }
-   - { 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 }
+   - { 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: 13, name: cycleway_national, image: cycleway_national13.png }
+   - { min_zoom:  5, name: cycleway_regional, image: cycleway_regional.png }
+   - { min_zoom: 13, name: cycleway_regional, image: cycleway_regional13.png }
+   - { min_zoom:  8, name: cycleway_local, image: cycleway_local.png }
+   - { min_zoom: 13, name: cycleway_local, image: cycleway_local13.png }
+   - { min_zoom: 13, name: footway, image: footway.png }
+   - { 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: 10, name: common, image: common.png }
+   - { min_zoom:  7, name: lake, image: lake.png }
+   - { 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 }
  opnvkarte:
    - { min_zoom:  6, name: rail, width: 52, height: 1, fill: "#868686" }
    - { min_zoom:  8, name: rail, width: 52, height: 2, fill: "#868686" }
@@@ -149,12 -148,3 +149,12 @@@
    - { min_zoom: 15, name: bus_stop, image: bus_stop15.svg }
    - { min_zoom: 13, name: stop, image: stop13.svg }
    - { min_zoom: 15, name: stop, image: stop15.svg }
 +  - { min_zoom:  8, name: motorway, image: motorway8.svg }
 +  - { min_zoom: 13, name: motorway, image: motorway13.svg }
 +  - { min_zoom: 15, name: motorway, image: motorway15.svg }
 +  - { min_zoom: 17, name: motorway, image: motorway17.svg }
 +  - { min_zoom:  8, name: main_road, width: 52, height: 1, fill: "#5c6d6d88" }
 +  - { min_zoom: 11, name: main_road, image: main_road11.svg }
 +  - { min_zoom: 13, name: main_road, image: main_road13.svg }
 +  - { min_zoom: 15, name: main_road, image: main_road15.svg }
 +  - { min_zoom: 17, name: main_road, image: main_road17.svg }