From: Tom Hughes <tom@compton.nu>
Date: Thu, 30 Nov 2023 17:56:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4381'
X-Git-Tag: live~1095
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/763c37bde49e9ef9302fce0f59d68fdf3f569d89?hp=9046f9d61a221f9e13e9fc82b74d6b90402114e9

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

diff --git a/app/assets/images/key/mapnik/mainroad7.png b/app/assets/images/key/mapnik/mainroad8.png
similarity index 100%
rename from app/assets/images/key/mapnik/mainroad7.png
rename to app/assets/images/key/mapnik/mainroad8.png
diff --git a/app/assets/images/key/mapnik/mainroad9.png b/app/assets/images/key/mapnik/mainroad9.png
deleted file mode 100644
index 334f8fc0d..000000000
Binary files a/app/assets/images/key/mapnik/mainroad9.png and /dev/null differ
diff --git a/config/key.yml b/config/key.yml
index 0737c9b9d..9576fb044 100644
--- a/config/key.yml
+++ b/config/key.yml
@@ -1,8 +1,7 @@
 mapnik:
-  - { min_zoom: 0, max_zoom: 19, name: motorway, image: motorway.png }
-  - { min_zoom: 0, max_zoom: 6, name: main_road, image: mainroad.png }
-  - { min_zoom: 7, max_zoom: 8, name: main_road, image: mainroad7.png }
-  - { min_zoom: 9, max_zoom: 11, name: main_road, image: mainroad9.png }
+  - { min_zoom: 6, max_zoom: 19, name: motorway, image: motorway.png }
+  - { min_zoom: 6, max_zoom: 7, name: main_road, image: mainroad.png }
+  - { min_zoom: 8, max_zoom: 11, name: main_road, image: mainroad8.png }
   - { min_zoom: 12, max_zoom: 19, name: main_road, image: mainroad12.png }
   - { min_zoom: 13, max_zoom: 19, name: track, image: track.png }
   - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png }