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

diff --combined config/key.yml
index 80160ab6ef983cceb07f32cabf64165cce58441e,114a623df9d0cf7ceb8ddc0e74d9994b984812b0..c524a9098d042e73c4e66dc48e563e57f7307233
--- 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
@@@ -148,3 -148,12 +148,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 }