From: Tom Hughes <tom@compton.nu>
Date: Fri, 15 Dec 2023 17:34:07 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4408'
X-Git-Tag: live~1354
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d2c103b9c54d0fc90e8dddd70861a4689ac4c83a?ds=inline;hp=-c

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

d2c103b9c54d0fc90e8dddd70861a4689ac4c83a
diff --combined config/key.yml
index 80160ab6e,114a623df..c524a9098
--- a/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 }