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

diff --combined config/key.yml
index c524a9098d042e73c4e66dc48e563e57f7307233,42cd40c20deb464565d71394e2395c5e2c51497b..f099a5f47465a91c0bae409ab22be7ca5756c1d1
--- 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
@@@ -93,6 -93,7 +93,7 @@@ cyclemap
    - { 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: 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 }
@@@ -148,12 -149,3 +149,12 @@@ opnvkarte
    - { 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 }

diff --combined config/locales/en.yml
index c06ff3cebdfe40c6151e102c99779d6e7e734d77,c074ad8f287de1c2f8710d4c4b15e1d9b971fb64..18beafa1355a0062daaf5cf53f6d3008f409e82a
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2282,6 -2282,7 +2282,7 @@@ en
            primary: "Primary road"
            secondary: "Secondary road"
            unclassified: "Unclassified road"
+           pedestrian: "Pedestrian way"
            track: "Track"
            bridleway: "Bridleway"
            cycleway: "Cycleway"
@@@ -2303,7 -2304,9 +2304,7 @@@
            runway:
              - Airport Runway
              - taxiway
 -          apron:
 -            - Airport apron
 -            - terminal
 +          apron_only: "Airport apron"
            admin: "Administrative boundary"
            orchard:
              - Orchard