From: Tom Hughes <tom@compton.nu>
Date: Mon, 1 Jan 2024 19:10:01 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4450'
X-Git-Tag: live~406
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/aa737ef1de267b1bae7cd5b681591927f1d8b5cf?hp=6ba1dc3957602f361b65af13621604d041bbc2c5

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

diff --git a/app/assets/images/key/mapnik/capital4.svg b/app/assets/images/key/mapnik/capital4.svg
new file mode 100644
index 000000000..712c904d0
--- /dev/null
+++ b/app/assets/images/key/mapnik/capital4.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="6" height="6" viewBox="-3 -3 6 6">
+<circle r="2.5" fill="#fdfdfc" stroke="#222" />
+<circle r="1" fill="#222" />
+</svg>
diff --git a/app/assets/images/key/mapnik/capital7.svg b/app/assets/images/key/mapnik/capital7.svg
new file mode 100644
index 000000000..69011cfa9
--- /dev/null
+++ b/app/assets/images/key/mapnik/capital7.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="-4 -4 8 8">
+<circle r="3.5" fill="#fdfdfc" stroke="#222" />
+<circle r="1.5" fill="#222" />
+</svg>
diff --git a/app/assets/images/key/mapnik/city4.svg b/app/assets/images/key/mapnik/city4.svg
new file mode 100644
index 000000000..542236cad
--- /dev/null
+++ b/app/assets/images/key/mapnik/city4.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="4" height="4" viewBox="-2 -2 4 4">
+<circle r="1.75" fill="#fdfdfc" stroke="#575749" stroke-width="0.5" />
+</svg>
diff --git a/app/assets/images/key/mapnik/city6.svg b/app/assets/images/key/mapnik/city6.svg
new file mode 100644
index 000000000..40fc3aebc
--- /dev/null
+++ b/app/assets/images/key/mapnik/city6.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="17" height="6" viewBox="0 -3 17 6">
+<circle cx="3" r="2.6" fill="#f9f9f7" stroke="#6f6f5b" stroke-width="0.8" />
+<circle cx="14" r="1.75" fill="#fdfdfc" stroke="#424236" stroke-width="0.5" />
+</svg>
diff --git a/config/key.yml b/config/key.yml
index 1432c2956..072fc576b 100644
--- a/config/key.yml
+++ b/config/key.yml
@@ -34,6 +34,11 @@ mapnik:
   - { 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" }
+  # places: placenames.mss
+  - { min_zoom: 4, max_zoom: 6, name: capital, image: capital4.svg }
+  - { min_zoom: 7, max_zoom: 7, name: capital, image: capital7.svg }
+  - { min_zoom: 4, max_zoom: 5, name: city, image: city4.svg }
+  - { min_zoom: 6, max_zoom: 7, name: city, image: city6.svg }
   # landcover z5: landcover.mss, water.mss
   - { name: [lake_only, reservoir], width: 26, height: 10, fill: "#aad3df" }
   - { name: intermittent_water, image: intermittent_water.svg }
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4eb201753..f81c2d6bd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2322,6 +2322,8 @@ en:
           taxiway: "Taxiway"
           apron_only: "Airport apron"
           admin: "Administrative boundary"
+          capital: "Capital"
+          city: "City"
           orchard_only: "Orchard"
           vineyard: "Vineyard"
           forest_only: "Forest"