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~1403
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d2c103b9c54d0fc90e8dddd70861a4689ac4c83a?hp=b493dc8b469e877564b67c7080d15757164c97f0

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

diff --git a/app/assets/images/key/opnvkarte/main_road11.svg b/app/assets/images/key/opnvkarte/main_road11.svg
new file mode 100644
index 000000000..b03c74414
--- /dev/null
+++ b/app/assets/images/key/opnvkarte/main_road11.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='4'>
+<rect x='-.5' y='.5' width='53' height='3' fill='#dddddd' stroke='#a1968b' />
+</svg>
diff --git a/app/assets/images/key/opnvkarte/main_road13.svg b/app/assets/images/key/opnvkarte/main_road13.svg
new file mode 100644
index 000000000..2d5902236
--- /dev/null
+++ b/app/assets/images/key/opnvkarte/main_road13.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='8'>
+<rect x='-.5' y='.5' width='53' height='7' fill='#dddddd' stroke='#a1968b' />
+</svg>
diff --git a/app/assets/images/key/opnvkarte/main_road15.svg b/app/assets/images/key/opnvkarte/main_road15.svg
new file mode 100644
index 000000000..cb5391648
--- /dev/null
+++ b/app/assets/images/key/opnvkarte/main_road15.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='13'>
+<rect x='-.5' y='.5' width='53' height='12' fill='#dddddd' stroke='#a1968b' />
+</svg>
diff --git a/app/assets/images/key/opnvkarte/main_road17.svg b/app/assets/images/key/opnvkarte/main_road17.svg
new file mode 100644
index 000000000..de7db0f17
--- /dev/null
+++ b/app/assets/images/key/opnvkarte/main_road17.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='17'>
+<rect x='-.5' y='.5' width='53' height='16' fill='#dddddd' stroke='#a1968b' />
+</svg>
diff --git a/app/assets/images/key/opnvkarte/motorway13.svg b/app/assets/images/key/opnvkarte/motorway13.svg
new file mode 100644
index 000000000..c44e777a2
--- /dev/null
+++ b/app/assets/images/key/opnvkarte/motorway13.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='8'>
+<rect x='-.5' y='.5' width='53' height='7' fill='#dddddd' stroke='#6d6d6d' />
+</svg>
diff --git a/app/assets/images/key/opnvkarte/motorway15.svg b/app/assets/images/key/opnvkarte/motorway15.svg
new file mode 100644
index 000000000..c217bb2a7
--- /dev/null
+++ b/app/assets/images/key/opnvkarte/motorway15.svg
@@ -0,0 +1,4 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='13'>
+<rect x='-.5' y='.5' width='53' height='12' fill='#dddddd' stroke='#6d6d6d' />
+<line x1='-4' x2='60' y1='6.5' y2='6.5' stroke='#ffffff' stroke-dasharray='12' />
+</svg>
diff --git a/app/assets/images/key/opnvkarte/motorway17.svg b/app/assets/images/key/opnvkarte/motorway17.svg
new file mode 100644
index 000000000..36b37db59
--- /dev/null
+++ b/app/assets/images/key/opnvkarte/motorway17.svg
@@ -0,0 +1,4 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='17'>
+<rect x='-1' y='1' width='54' height='15' fill='#dddddd' stroke='#6d6d6d' stroke-width='2' />
+<line x1='-4' x2='60' y1='8.5' y2='8.5' stroke='#ffffff' stroke-dasharray='12' />
+</svg>
diff --git a/app/assets/images/key/opnvkarte/motorway8.svg b/app/assets/images/key/opnvkarte/motorway8.svg
new file mode 100644
index 000000000..21f006cef
--- /dev/null
+++ b/app/assets/images/key/opnvkarte/motorway8.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='52' height='4'>
+<rect x='-.5' y='.5' width='53' height='3' fill='#dddddd' stroke='#6d6d6d' />
+</svg>
diff --git a/config/key.yml b/config/key.yml
index 80160ab6e..c524a9098 100644
--- a/config/key.yml
+++ b/config/key.yml
@@ -148,3 +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 }