From 66628c286f62e4b100cbecb3aafa8f9610b6bf09 Mon Sep 17 00:00:00 2001
From: wmisener <58491489+wmisener@users.noreply.github.com>
Date: Tue, 2 Jul 2024 22:35:03 -0700
Subject: [PATCH 1/3] Fire station draft icons

---
 icons/poi_fire_station.svg        |  4 ++++
 icons/poi_fire_station_cross.svg  |  4 ++++
 icons/poi_fire_station_shield.svg |  4 ++++
 icons/poi_fire_station_truck.svg  |  6 ++++++
 scripts/taginfo_template.json     |  8 ++++++++
 src/layer/poi.js                  | 10 ++++++++++
 6 files changed, 36 insertions(+)
 create mode 100644 icons/poi_fire_station.svg
 create mode 100644 icons/poi_fire_station_cross.svg
 create mode 100644 icons/poi_fire_station_shield.svg
 create mode 100644 icons/poi_fire_station_truck.svg

diff --git a/icons/poi_fire_station.svg b/icons/poi_fire_station.svg
new file mode 100644
index 000000000..831ac56f4
--- /dev/null
+++ b/icons/poi_fire_station.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;stop-color:#000" d="M 10,1 C 8.57507,1 7.1186554,1.678328 5,3 L 7.0117188,4.9003906 C 6.1391903,5.4123188 5.4123188,6.1391903 4.9003906,7.0117188 L 3,5 c -1.2660122,2.0351654 -2,3.5750693 -2,5 0,1.42493 0.6504981,2.909174 2,5 l 1.9003906,-2.011719 c 0.5119282,0.872528 1.2387998,1.5994 2.1113282,2.111328 L 5,17 c 2.0629957,1.432992 3.5750699,2 5,2 1.424931,0 2.881345,-0.650498 5,-2 l -2.011719,-1.900391 c 0.872528,-0.511928 1.5994,-1.2388 2.111328,-2.111328 L 17,15 c 1.310122,-2.102375 2,-3.575069 2,-5 C 19,8.5750693 18.314472,7.030756 17,5 L 15.107422,7.0019531 C 14.595773,6.130382 13.869618,5.4042269 12.998047,4.8925781 L 15,3 C 12.881345,1.7061579 11.424931,1 10,1 Z"/>
+ <path d="M 10,5.0000019 C 7.1393287,5.8867364 6,8.5714309 6,10.714287 6,12.857146 7.3959464,14.471261 9.2,15.000002 7.6,12.672441 7.6,10.714287 10,9.2857159 c -0.4039378,0.9662991 0,2.8571421 0.8,3.5714301 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600643 14,13.57143 14,11.428574 14,9.2857159 12.4,8.5714309 12.4,6.4285734 11.293188,6.8566042 10.8,7.8571448 10.8,8.5714309 10.038351,8.1738879 9.2,6.6045916 10,5.0000019 Z" style="fill:#f9f5f0;fill-opacity:1;stroke-width:.755929"/>
+</svg>
diff --git a/icons/poi_fire_station_cross.svg b/icons/poi_fire_station_cross.svg
new file mode 100644
index 000000000..831ac56f4
--- /dev/null
+++ b/icons/poi_fire_station_cross.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;stop-color:#000" d="M 10,1 C 8.57507,1 7.1186554,1.678328 5,3 L 7.0117188,4.9003906 C 6.1391903,5.4123188 5.4123188,6.1391903 4.9003906,7.0117188 L 3,5 c -1.2660122,2.0351654 -2,3.5750693 -2,5 0,1.42493 0.6504981,2.909174 2,5 l 1.9003906,-2.011719 c 0.5119282,0.872528 1.2387998,1.5994 2.1113282,2.111328 L 5,17 c 2.0629957,1.432992 3.5750699,2 5,2 1.424931,0 2.881345,-0.650498 5,-2 l -2.011719,-1.900391 c 0.872528,-0.511928 1.5994,-1.2388 2.111328,-2.111328 L 17,15 c 1.310122,-2.102375 2,-3.575069 2,-5 C 19,8.5750693 18.314472,7.030756 17,5 L 15.107422,7.0019531 C 14.595773,6.130382 13.869618,5.4042269 12.998047,4.8925781 L 15,3 C 12.881345,1.7061579 11.424931,1 10,1 Z"/>
+ <path d="M 10,5.0000019 C 7.1393287,5.8867364 6,8.5714309 6,10.714287 6,12.857146 7.3959464,14.471261 9.2,15.000002 7.6,12.672441 7.6,10.714287 10,9.2857159 c -0.4039378,0.9662991 0,2.8571421 0.8,3.5714301 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600643 14,13.57143 14,11.428574 14,9.2857159 12.4,8.5714309 12.4,6.4285734 11.293188,6.8566042 10.8,7.8571448 10.8,8.5714309 10.038351,8.1738879 9.2,6.6045916 10,5.0000019 Z" style="fill:#f9f5f0;fill-opacity:1;stroke-width:.755929"/>
+</svg>
diff --git a/icons/poi_fire_station_shield.svg b/icons/poi_fire_station_shield.svg
new file mode 100644
index 000000000..e31d63c78
--- /dev/null
+++ b/icons/poi_fire_station_shield.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 9.9999869,2.0000005 C 10.364897,2.4211076 11.236686,3.372 12,3.372 c 0.763318,0 1.595677,-0.9106143 2,-1.3719995 l 3,2.9433862 c -0.483907,0.8309332 -1.576,2.0557035 -1.576,3.1488485 0,0.7862863 0.281425,1.5310155 0.544,2.1964208 0.226874,0.575267 0.663081,1.230786 0.663081,1.910493 0,2.440975 -1.879079,3.20704 -3.658462,4.171335 L 12.333334,16.71693 C 11.480596,17.179051 10.716372,17.200295 9.9999942,18 9.2836807,17.200312 8.5191362,17.179547 7.6666668,16.716932 L 7.0273686,16.37 C 5.248485,15.404642 3.3689075,14.640038 3.3689075,12.199149 c 0,-0.679673 0.4358009,-1.335235 0.6626959,-1.910493 0.2625556,-0.6654138 0.5447228,-1.4101429 0.5447228,-2.1964208 0,-1.093145 -1.0258979,-2.3889899 -1.5763258,-3.1488485 L 6,2.0000005 c 0.3676222,0.4194715 1.2366843,1.3724729 2,1.3724729 0.7633155,0 1.6192039,-0.9384755 2.000038,-1.3724729 z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="3.864" stroke-width="1.178" style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-miterlimit:3.864;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"/>
+ <path d="M 10,5 C 7.1393287,5.8867345 6,8.5714286 6,10.714285 6,12.857144 7.3959464,14.471259 9.2,15 7.6,12.672439 7.6,10.714285 10,9.2857145 c -0.4039378,0.9662985 0,2.8571415 0.8,3.5714295 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600641 14,13.571428 14,11.428572 14,9.2857145 12.4,8.5714286 12.4,6.4285715 11.293188,6.8566023 10.8,7.8571429 10.8,8.5714286 10.038351,8.1738861 9.2,6.6045897 10,5 Z" style="fill:#f9f5f0;fill-opacity:1;stroke-width:.755929"/>
+</svg>
diff --git a/icons/poi_fire_station_truck.svg b/icons/poi_fire_station_truck.svg
new file mode 100644
index 000000000..a353239e6
--- /dev/null
+++ b/icons/poi_fire_station_truck.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path style="display:inline;fill:#000;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:markers stroke fill;stop-color:#000" d="M 3,13 H 1 V 12 H 2 V 9 L 3,6 H 4 V 5 H 5 V 6 H 8 V 9 H 9 V 8 h 9 v 4 h 1 v 1 z"/>
+ <path style="fill:#000;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:markers stroke fill;stop-color:#000" d="m 9,4 v 1 h 1 V 6 H 9 v 1 h 9 V 6 H 17 V 5 h 1 V 4 Z m 2,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"/>
+ <path style="fill:#000;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke fill markers;stop-color:#000" d="M6 14a1 1 0 0 1-.9977961.999998 1 1 0 0 1-1.0021942-.99559 1 1 0 0 1 .9933787-1.004386 1 1 0 0 1 1.0065727.991163L5 14ZM14 14a1 1 0 0 1-.997796.999998 1 1 0 0 1-1.002194-.99559 1 1 0 0 1 .993378-1.004386 1 1 0 0 1 1.006573.991163L13 14ZM17 14a1 1 0 0 1-.997796.999998 1 1 0 0 1-1.002194-.99559 1 1 0 0 1 .993378-1.004386 1 1 0 0 1 1.006573.991163L16 14Z"/>
+ <path style="fill:#f9f5f0;stroke:#f9f5f0;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke fill markers;stop-color:#000;stroke-dasharray:none;fill-opacity:1" d="M 3,9 3.667,7 H 7 v 2 z"/>
+</svg>
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index 672adcccb..72e1f2256 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -479,6 +479,14 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_police_shield.svg"
     },
+    {
+      "key": "amenity",
+      "value": "fire_station",
+      "object_types": ["node", "area"],
+      "description": "Fire stations are marked by an icon representing a firefighter's badge.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_fire_station.svg"
+    },
     {
       "key": "amenity",
       "value": "townhall",
diff --git a/src/layer/poi.js b/src/layer/poi.js
index d9a5ddbcc..8fc48fc6b 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -83,6 +83,14 @@ var iconDefs = {
     color: Color.poi.consumer,
     description: "Gas station",
   },
+  fire_station: {
+    classes: {
+      fire_station: ["fire_station"],
+    },
+    sprite: "poi_fire_station",
+    color: Color.poi.infrastructure,
+    description: "Fire station",
+  },
   hospital: {
     classes: {
       hospital: ["hospital"],
@@ -342,6 +350,7 @@ export const poi = {
       Color.poi.attraction,
       [
         "hospital",
+        "fire_station",
         "parking",
         "police",
         "school",
@@ -376,6 +385,7 @@ export const poi = {
       14,
       [
         "bus_stop",
+        "fire_station",
         "hospital",
         "library",
         "museum",

From 3b58c9b24c6fa0da140cefa14d0ac581138e7b40 Mon Sep 17 00:00:00 2001
From: wmisener <58491489+wmisener@users.noreply.github.com>
Date: Sat, 6 Jul 2024 14:25:50 -0700
Subject: [PATCH 2/3] More fire icons

---
 icons/poi_fire_station.svg                            | 5 +++--
 icons/poi_fire_station_cross_no_flame.svg             | 3 +++
 icons/poi_fire_station_cross_no_flame_smallcircle.svg | 3 +++
 icons/poi_fire_station_ring.svg                       | 5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 icons/poi_fire_station_cross_no_flame.svg
 create mode 100644 icons/poi_fire_station_cross_no_flame_smallcircle.svg
 create mode 100644 icons/poi_fire_station_ring.svg

diff --git a/icons/poi_fire_station.svg b/icons/poi_fire_station.svg
index 831ac56f4..7bc7323b0 100644
--- a/icons/poi_fire_station.svg
+++ b/icons/poi_fire_station.svg
@@ -1,4 +1,5 @@
 <svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
- <path style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;stop-color:#000" d="M 10,1 C 8.57507,1 7.1186554,1.678328 5,3 L 7.0117188,4.9003906 C 6.1391903,5.4123188 5.4123188,6.1391903 4.9003906,7.0117188 L 3,5 c -1.2660122,2.0351654 -2,3.5750693 -2,5 0,1.42493 0.6504981,2.909174 2,5 l 1.9003906,-2.011719 c 0.5119282,0.872528 1.2387998,1.5994 2.1113282,2.111328 L 5,17 c 2.0629957,1.432992 3.5750699,2 5,2 1.424931,0 2.881345,-0.650498 5,-2 l -2.011719,-1.900391 c 0.872528,-0.511928 1.5994,-1.2388 2.111328,-2.111328 L 17,15 c 1.310122,-2.102375 2,-3.575069 2,-5 C 19,8.5750693 18.314472,7.030756 17,5 L 15.107422,7.0019531 C 14.595773,6.130382 13.869618,5.4042269 12.998047,4.8925781 L 15,3 C 12.881345,1.7061579 11.424931,1 10,1 Z"/>
- <path d="M 10,5.0000019 C 7.1393287,5.8867364 6,8.5714309 6,10.714287 6,12.857146 7.3959464,14.471261 9.2,15.000002 7.6,12.672441 7.6,10.714287 10,9.2857159 c -0.4039378,0.9662991 0,2.8571421 0.8,3.5714301 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600643 14,13.57143 14,11.428574 14,9.2857159 12.4,8.5714309 12.4,6.4285734 11.293188,6.8566042 10.8,7.8571448 10.8,8.5714309 10.038351,8.1738879 9.2,6.6045916 10,5.0000019 Z" style="fill:#f9f5f0;fill-opacity:1;stroke-width:.755929"/>
+ <path d="M 10,5 C 7.1393287,5.8867345 6,8.5714286 6,10.714285 6,12.857144 7.3959464,14.471259 9.2,15 7.6,12.672439 7.6,10.714285 10,9.2857145 c -0.4039378,0.9662985 0,2.8571415 0.8,3.5714295 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600641 14,13.571428 14,11.428572 14,9.2857145 12.4,8.5714286 12.4,6.4285715 11.293188,6.8566023 10.8,7.8571429 10.8,8.5714286 10.038351,8.1738861 9.2,6.6045897 10,5 Z" style="fill:#000;fill-opacity:1;stroke-width:2;stroke-dasharray:none;stroke:#fff;stroke-opacity:1;paint-order:markers stroke fill"/>
+ <path style="color:#000;fill:#000;fill-opacity:1;stroke:#fff;stroke-width:2;stroke-linejoin:round;stroke-dasharray:none;paint-order:markers stroke fill;stroke-opacity:1" d="M17.027344 15.613281C18.260455 14.072873 19 12.121084 19 10 19 7.8789158 18.260453 5.9271247 17.027344 4.3867188L15.869141 5.5449219C16.807451 6.7806832 17.363281 8.3233374 17.363281 10 17.363281 11.676663 16.807413 13.219354 15.869141 14.455078L17.027344 15.613281zM14.455078 15.869141C13.219354 16.807413 11.676663 17.363281 10 17.363281 8.3233374 17.363281 6.7806832 16.807451 5.5449219 15.869141L4.3867188 17.027344C5.9271247 18.260453 7.8789158 19 10 19 12.121084 19 14.072873 18.260455 15.613281 17.027344L14.455078 15.869141zM5.5449219 4.1308594C6.7806459 3.1925869 8.3233374 2.6367188 10 2.6367188 11.676662 2.6367188 13.219316 3.1925494 14.455078 4.1308594L15.613281 2.9726562C14.072876 1.739547 12.121084 1 10 1 7.8789158 1 5.9271266 1.739545 4.3867188 2.9726562L5.5449219 4.1308594zM2.9726562 4.3867188C1.739545 5.9271266 1 7.8789158 1 10 1 12.121084 1.739547 14.072876 2.9726562 15.613281L4.1308594 14.455078C3.1925494 13.219316 2.6367188 11.676662 2.6367188 10 2.6367188 8.3233374 3.1925869 6.7806459 4.1308594 5.5449219L2.9726562 4.3867188z"/>
+ <path style="fill:#000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000" d="M -30.804754,15 -19.218488,4.137952"/>
 </svg>
diff --git a/icons/poi_fire_station_cross_no_flame.svg b/icons/poi_fire_station_cross_no_flame.svg
new file mode 100644
index 000000000..cc8a0cdd5
--- /dev/null
+++ b/icons/poi_fire_station_cross_no_flame.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;stop-color:#000" d="M 10,1 C 8.57507,1 7.1186554,1.678328 5,3 L 7.0117188,4.9003906 C 6.1391903,5.4123188 5.4123188,6.1391903 4.9003906,7.0117188 L 3,5 c -1.2660122,2.0351654 -2,3.5750693 -2,5 0,1.42493 0.6504981,2.909174 2,5 l 1.9003906,-2.011719 c 0.5119282,0.872528 1.2387998,1.5994 2.1113282,2.111328 L 5,17 c 2.0629957,1.432992 3.5750699,2 5,2 1.424931,0 2.881345,-0.650498 5,-2 l -2.011719,-1.900391 c 0.872528,-0.511928 1.5994,-1.2388 2.111328,-2.111328 L 17,15 c 1.310122,-2.102375 2,-3.575069 2,-5 C 19,8.5750693 18.314472,7.030756 17,5 L 15.107422,7.0019531 C 14.595773,6.130382 13.869618,5.4042269 12.998047,4.8925781 L 15,3 C 12.881345,1.7061579 11.424931,1 10,1 Z"/>
+</svg>
diff --git a/icons/poi_fire_station_cross_no_flame_smallcircle.svg b/icons/poi_fire_station_cross_no_flame_smallcircle.svg
new file mode 100644
index 000000000..3140af922
--- /dev/null
+++ b/icons/poi_fire_station_cross_no_flame_smallcircle.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;stop-color:#000" d="M 10,1 C 8.57507,1 7.1186554,1.678328 5,3 L 8.0462697,6.31707 C 7.7540041,6.4876592 6.7548516,7.3827405 6.4605029,7.7970483 L 3,5 c -1.2660122,2.0351654 -2,3.5750693 -2,5 0,1.42493 0.6504981,2.909174 2,5 l 3.5216387,-2.701732 c 0.3257876,0.429793 1.0219036,1.070241 1.4648795,1.352338 L 5,17 c 2.0629957,1.432992 3.5750699,2 5,2 1.424931,0 2.881345,-0.650498 5,-2 l -3.178531,-3.249895 c 0.37106,-0.204142 1.210055,-0.888131 1.620205,-1.397252 L 17,15 c 1.310122,-2.102375 2,-3.575069 2,-5 C 19,8.5750693 18.314472,7.030756 17,5 L 13.625035,7.9408363 C 13.281844,7.4289035 12.388568,6.5830164 11.926192,6.3025928 L 15,3 C 12.881345,1.7061579 11.424931,1 10,1 Z"/>
+</svg>
diff --git a/icons/poi_fire_station_ring.svg b/icons/poi_fire_station_ring.svg
new file mode 100644
index 000000000..7bc7323b0
--- /dev/null
+++ b/icons/poi_fire_station_ring.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <path d="M 10,5 C 7.1393287,5.8867345 6,8.5714286 6,10.714285 6,12.857144 7.3959464,14.471259 9.2,15 7.6,12.672439 7.6,10.714285 10,9.2857145 c -0.4039378,0.9662985 0,2.8571415 0.8,3.5714295 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600641 14,13.571428 14,11.428572 14,9.2857145 12.4,8.5714286 12.4,6.4285715 11.293188,6.8566023 10.8,7.8571429 10.8,8.5714286 10.038351,8.1738861 9.2,6.6045897 10,5 Z" style="fill:#000;fill-opacity:1;stroke-width:2;stroke-dasharray:none;stroke:#fff;stroke-opacity:1;paint-order:markers stroke fill"/>
+ <path style="color:#000;fill:#000;fill-opacity:1;stroke:#fff;stroke-width:2;stroke-linejoin:round;stroke-dasharray:none;paint-order:markers stroke fill;stroke-opacity:1" d="M17.027344 15.613281C18.260455 14.072873 19 12.121084 19 10 19 7.8789158 18.260453 5.9271247 17.027344 4.3867188L15.869141 5.5449219C16.807451 6.7806832 17.363281 8.3233374 17.363281 10 17.363281 11.676663 16.807413 13.219354 15.869141 14.455078L17.027344 15.613281zM14.455078 15.869141C13.219354 16.807413 11.676663 17.363281 10 17.363281 8.3233374 17.363281 6.7806832 16.807451 5.5449219 15.869141L4.3867188 17.027344C5.9271247 18.260453 7.8789158 19 10 19 12.121084 19 14.072873 18.260455 15.613281 17.027344L14.455078 15.869141zM5.5449219 4.1308594C6.7806459 3.1925869 8.3233374 2.6367188 10 2.6367188 11.676662 2.6367188 13.219316 3.1925494 14.455078 4.1308594L15.613281 2.9726562C14.072876 1.739547 12.121084 1 10 1 7.8789158 1 5.9271266 1.739545 4.3867188 2.9726562L5.5449219 4.1308594zM2.9726562 4.3867188C1.739545 5.9271266 1 7.8789158 1 10 1 12.121084 1.739547 14.072876 2.9726562 15.613281L4.1308594 14.455078C3.1925494 13.219316 2.6367188 11.676662 2.6367188 10 2.6367188 8.3233374 3.1925869 6.7806459 4.1308594 5.5449219L2.9726562 4.3867188z"/>
+ <path style="fill:#000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000" d="M -30.804754,15 -19.218488,4.137952"/>
+</svg>

From 0e98f40d7f3dce0ac4b139bbc0055b8ab9c26ce7 Mon Sep 17 00:00:00 2001
From: wmisener <58491489+wmisener@users.noreply.github.com>
Date: Tue, 9 Jul 2024 21:53:48 -0700
Subject: [PATCH 3/3] Update icon to shield

---
 icons/poi_fire_station.svg                            | 5 ++---
 icons/poi_fire_station_cross.svg                      | 4 ----
 icons/poi_fire_station_cross_no_flame.svg             | 3 ---
 icons/poi_fire_station_cross_no_flame_smallcircle.svg | 3 ---
 icons/poi_fire_station_ring.svg                       | 5 -----
 icons/poi_fire_station_shield.svg                     | 4 ----
 icons/poi_fire_station_truck.svg                      | 6 ------
 7 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 icons/poi_fire_station_cross.svg
 delete mode 100644 icons/poi_fire_station_cross_no_flame.svg
 delete mode 100644 icons/poi_fire_station_cross_no_flame_smallcircle.svg
 delete mode 100644 icons/poi_fire_station_ring.svg
 delete mode 100644 icons/poi_fire_station_shield.svg
 delete mode 100644 icons/poi_fire_station_truck.svg

diff --git a/icons/poi_fire_station.svg b/icons/poi_fire_station.svg
index 7bc7323b0..e31d63c78 100644
--- a/icons/poi_fire_station.svg
+++ b/icons/poi_fire_station.svg
@@ -1,5 +1,4 @@
 <svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
- <path d="M 10,5 C 7.1393287,5.8867345 6,8.5714286 6,10.714285 6,12.857144 7.3959464,14.471259 9.2,15 7.6,12.672439 7.6,10.714285 10,9.2857145 c -0.4039378,0.9662985 0,2.8571415 0.8,3.5714295 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600641 14,13.571428 14,11.428572 14,9.2857145 12.4,8.5714286 12.4,6.4285715 11.293188,6.8566023 10.8,7.8571429 10.8,8.5714286 10.038351,8.1738861 9.2,6.6045897 10,5 Z" style="fill:#000;fill-opacity:1;stroke-width:2;stroke-dasharray:none;stroke:#fff;stroke-opacity:1;paint-order:markers stroke fill"/>
- <path style="color:#000;fill:#000;fill-opacity:1;stroke:#fff;stroke-width:2;stroke-linejoin:round;stroke-dasharray:none;paint-order:markers stroke fill;stroke-opacity:1" d="M17.027344 15.613281C18.260455 14.072873 19 12.121084 19 10 19 7.8789158 18.260453 5.9271247 17.027344 4.3867188L15.869141 5.5449219C16.807451 6.7806832 17.363281 8.3233374 17.363281 10 17.363281 11.676663 16.807413 13.219354 15.869141 14.455078L17.027344 15.613281zM14.455078 15.869141C13.219354 16.807413 11.676663 17.363281 10 17.363281 8.3233374 17.363281 6.7806832 16.807451 5.5449219 15.869141L4.3867188 17.027344C5.9271247 18.260453 7.8789158 19 10 19 12.121084 19 14.072873 18.260455 15.613281 17.027344L14.455078 15.869141zM5.5449219 4.1308594C6.7806459 3.1925869 8.3233374 2.6367188 10 2.6367188 11.676662 2.6367188 13.219316 3.1925494 14.455078 4.1308594L15.613281 2.9726562C14.072876 1.739547 12.121084 1 10 1 7.8789158 1 5.9271266 1.739545 4.3867188 2.9726562L5.5449219 4.1308594zM2.9726562 4.3867188C1.739545 5.9271266 1 7.8789158 1 10 1 12.121084 1.739547 14.072876 2.9726562 15.613281L4.1308594 14.455078C3.1925494 13.219316 2.6367188 11.676662 2.6367188 10 2.6367188 8.3233374 3.1925869 6.7806459 4.1308594 5.5449219L2.9726562 4.3867188z"/>
- <path style="fill:#000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000" d="M -30.804754,15 -19.218488,4.137952"/>
+ <path d="M 9.9999869,2.0000005 C 10.364897,2.4211076 11.236686,3.372 12,3.372 c 0.763318,0 1.595677,-0.9106143 2,-1.3719995 l 3,2.9433862 c -0.483907,0.8309332 -1.576,2.0557035 -1.576,3.1488485 0,0.7862863 0.281425,1.5310155 0.544,2.1964208 0.226874,0.575267 0.663081,1.230786 0.663081,1.910493 0,2.440975 -1.879079,3.20704 -3.658462,4.171335 L 12.333334,16.71693 C 11.480596,17.179051 10.716372,17.200295 9.9999942,18 9.2836807,17.200312 8.5191362,17.179547 7.6666668,16.716932 L 7.0273686,16.37 C 5.248485,15.404642 3.3689075,14.640038 3.3689075,12.199149 c 0,-0.679673 0.4358009,-1.335235 0.6626959,-1.910493 0.2625556,-0.6654138 0.5447228,-1.4101429 0.5447228,-2.1964208 0,-1.093145 -1.0258979,-2.3889899 -1.5763258,-3.1488485 L 6,2.0000005 c 0.3676222,0.4194715 1.2366843,1.3724729 2,1.3724729 0.7633155,0 1.6192039,-0.9384755 2.000038,-1.3724729 z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="3.864" stroke-width="1.178" style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-miterlimit:3.864;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"/>
+ <path d="M 10,5 C 7.1393287,5.8867345 6,8.5714286 6,10.714285 6,12.857144 7.3959464,14.471259 9.2,15 7.6,12.672439 7.6,10.714285 10,9.2857145 c -0.4039378,0.9662985 0,2.8571415 0.8,3.5714295 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600641 14,13.571428 14,11.428572 14,9.2857145 12.4,8.5714286 12.4,6.4285715 11.293188,6.8566023 10.8,7.8571429 10.8,8.5714286 10.038351,8.1738861 9.2,6.6045897 10,5 Z" style="fill:#f9f5f0;fill-opacity:1;stroke-width:.755929"/>
 </svg>
diff --git a/icons/poi_fire_station_cross.svg b/icons/poi_fire_station_cross.svg
deleted file mode 100644
index 831ac56f4..000000000
--- a/icons/poi_fire_station_cross.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
- <path style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;stop-color:#000" d="M 10,1 C 8.57507,1 7.1186554,1.678328 5,3 L 7.0117188,4.9003906 C 6.1391903,5.4123188 5.4123188,6.1391903 4.9003906,7.0117188 L 3,5 c -1.2660122,2.0351654 -2,3.5750693 -2,5 0,1.42493 0.6504981,2.909174 2,5 l 1.9003906,-2.011719 c 0.5119282,0.872528 1.2387998,1.5994 2.1113282,2.111328 L 5,17 c 2.0629957,1.432992 3.5750699,2 5,2 1.424931,0 2.881345,-0.650498 5,-2 l -2.011719,-1.900391 c 0.872528,-0.511928 1.5994,-1.2388 2.111328,-2.111328 L 17,15 c 1.310122,-2.102375 2,-3.575069 2,-5 C 19,8.5750693 18.314472,7.030756 17,5 L 15.107422,7.0019531 C 14.595773,6.130382 13.869618,5.4042269 12.998047,4.8925781 L 15,3 C 12.881345,1.7061579 11.424931,1 10,1 Z"/>
- <path d="M 10,5.0000019 C 7.1393287,5.8867364 6,8.5714309 6,10.714287 6,12.857146 7.3959464,14.471261 9.2,15.000002 7.6,12.672441 7.6,10.714287 10,9.2857159 c -0.4039378,0.9662991 0,2.8571421 0.8,3.5714301 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600643 14,13.57143 14,11.428574 14,9.2857159 12.4,8.5714309 12.4,6.4285734 11.293188,6.8566042 10.8,7.8571448 10.8,8.5714309 10.038351,8.1738879 9.2,6.6045916 10,5.0000019 Z" style="fill:#f9f5f0;fill-opacity:1;stroke-width:.755929"/>
-</svg>
diff --git a/icons/poi_fire_station_cross_no_flame.svg b/icons/poi_fire_station_cross_no_flame.svg
deleted file mode 100644
index cc8a0cdd5..000000000
--- a/icons/poi_fire_station_cross_no_flame.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
- <path style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;stop-color:#000" d="M 10,1 C 8.57507,1 7.1186554,1.678328 5,3 L 7.0117188,4.9003906 C 6.1391903,5.4123188 5.4123188,6.1391903 4.9003906,7.0117188 L 3,5 c -1.2660122,2.0351654 -2,3.5750693 -2,5 0,1.42493 0.6504981,2.909174 2,5 l 1.9003906,-2.011719 c 0.5119282,0.872528 1.2387998,1.5994 2.1113282,2.111328 L 5,17 c 2.0629957,1.432992 3.5750699,2 5,2 1.424931,0 2.881345,-0.650498 5,-2 l -2.011719,-1.900391 c 0.872528,-0.511928 1.5994,-1.2388 2.111328,-2.111328 L 17,15 c 1.310122,-2.102375 2,-3.575069 2,-5 C 19,8.5750693 18.314472,7.030756 17,5 L 15.107422,7.0019531 C 14.595773,6.130382 13.869618,5.4042269 12.998047,4.8925781 L 15,3 C 12.881345,1.7061579 11.424931,1 10,1 Z"/>
-</svg>
diff --git a/icons/poi_fire_station_cross_no_flame_smallcircle.svg b/icons/poi_fire_station_cross_no_flame_smallcircle.svg
deleted file mode 100644
index 3140af922..000000000
--- a/icons/poi_fire_station_cross_no_flame_smallcircle.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
- <path style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill;stop-color:#000" d="M 10,1 C 8.57507,1 7.1186554,1.678328 5,3 L 8.0462697,6.31707 C 7.7540041,6.4876592 6.7548516,7.3827405 6.4605029,7.7970483 L 3,5 c -1.2660122,2.0351654 -2,3.5750693 -2,5 0,1.42493 0.6504981,2.909174 2,5 l 3.5216387,-2.701732 c 0.3257876,0.429793 1.0219036,1.070241 1.4648795,1.352338 L 5,17 c 2.0629957,1.432992 3.5750699,2 5,2 1.424931,0 2.881345,-0.650498 5,-2 l -3.178531,-3.249895 c 0.37106,-0.204142 1.210055,-0.888131 1.620205,-1.397252 L 17,15 c 1.310122,-2.102375 2,-3.575069 2,-5 C 19,8.5750693 18.314472,7.030756 17,5 L 13.625035,7.9408363 C 13.281844,7.4289035 12.388568,6.5830164 11.926192,6.3025928 L 15,3 C 12.881345,1.7061579 11.424931,1 10,1 Z"/>
-</svg>
diff --git a/icons/poi_fire_station_ring.svg b/icons/poi_fire_station_ring.svg
deleted file mode 100644
index 7bc7323b0..000000000
--- a/icons/poi_fire_station_ring.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
- <path d="M 10,5 C 7.1393287,5.8867345 6,8.5714286 6,10.714285 6,12.857144 7.3959464,14.471259 9.2,15 7.6,12.672439 7.6,10.714285 10,9.2857145 c -0.4039378,0.9662985 0,2.8571415 0.8,3.5714295 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600641 14,13.571428 14,11.428572 14,9.2857145 12.4,8.5714286 12.4,6.4285715 11.293188,6.8566023 10.8,7.8571429 10.8,8.5714286 10.038351,8.1738861 9.2,6.6045897 10,5 Z" style="fill:#000;fill-opacity:1;stroke-width:2;stroke-dasharray:none;stroke:#fff;stroke-opacity:1;paint-order:markers stroke fill"/>
- <path style="color:#000;fill:#000;fill-opacity:1;stroke:#fff;stroke-width:2;stroke-linejoin:round;stroke-dasharray:none;paint-order:markers stroke fill;stroke-opacity:1" d="M17.027344 15.613281C18.260455 14.072873 19 12.121084 19 10 19 7.8789158 18.260453 5.9271247 17.027344 4.3867188L15.869141 5.5449219C16.807451 6.7806832 17.363281 8.3233374 17.363281 10 17.363281 11.676663 16.807413 13.219354 15.869141 14.455078L17.027344 15.613281zM14.455078 15.869141C13.219354 16.807413 11.676663 17.363281 10 17.363281 8.3233374 17.363281 6.7806832 16.807451 5.5449219 15.869141L4.3867188 17.027344C5.9271247 18.260453 7.8789158 19 10 19 12.121084 19 14.072873 18.260455 15.613281 17.027344L14.455078 15.869141zM5.5449219 4.1308594C6.7806459 3.1925869 8.3233374 2.6367188 10 2.6367188 11.676662 2.6367188 13.219316 3.1925494 14.455078 4.1308594L15.613281 2.9726562C14.072876 1.739547 12.121084 1 10 1 7.8789158 1 5.9271266 1.739545 4.3867188 2.9726562L5.5449219 4.1308594zM2.9726562 4.3867188C1.739545 5.9271266 1 7.8789158 1 10 1 12.121084 1.739547 14.072876 2.9726562 15.613281L4.1308594 14.455078C3.1925494 13.219316 2.6367188 11.676662 2.6367188 10 2.6367188 8.3233374 3.1925869 6.7806459 4.1308594 5.5449219L2.9726562 4.3867188z"/>
- <path style="fill:#000;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers;stop-color:#000" d="M -30.804754,15 -19.218488,4.137952"/>
-</svg>
diff --git a/icons/poi_fire_station_shield.svg b/icons/poi_fire_station_shield.svg
deleted file mode 100644
index e31d63c78..000000000
--- a/icons/poi_fire_station_shield.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
- <path d="M 9.9999869,2.0000005 C 10.364897,2.4211076 11.236686,3.372 12,3.372 c 0.763318,0 1.595677,-0.9106143 2,-1.3719995 l 3,2.9433862 c -0.483907,0.8309332 -1.576,2.0557035 -1.576,3.1488485 0,0.7862863 0.281425,1.5310155 0.544,2.1964208 0.226874,0.575267 0.663081,1.230786 0.663081,1.910493 0,2.440975 -1.879079,3.20704 -3.658462,4.171335 L 12.333334,16.71693 C 11.480596,17.179051 10.716372,17.200295 9.9999942,18 9.2836807,17.200312 8.5191362,17.179547 7.6666668,16.716932 L 7.0273686,16.37 C 5.248485,15.404642 3.3689075,14.640038 3.3689075,12.199149 c 0,-0.679673 0.4358009,-1.335235 0.6626959,-1.910493 0.2625556,-0.6654138 0.5447228,-1.4101429 0.5447228,-2.1964208 0,-1.093145 -1.0258979,-2.3889899 -1.5763258,-3.1488485 L 6,2.0000005 c 0.3676222,0.4194715 1.2366843,1.3724729 2,1.3724729 0.7633155,0 1.6192039,-0.9384755 2.000038,-1.3724729 z" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="3.864" stroke-width="1.178" style="fill:#000;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-miterlimit:3.864;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"/>
- <path d="M 10,5 C 7.1393287,5.8867345 6,8.5714286 6,10.714285 6,12.857144 7.3959464,14.471259 9.2,15 7.6,12.672439 7.6,10.714285 10,9.2857145 c -0.4039378,0.9662985 0,2.8571415 0.8,3.5714295 0.345164,-0.286257 0.8,-1.017663 0.8,-1.428572 1.6,1.428572 0.450317,2.595185 0,3.571428 C 12.470544,14.600641 14,13.571428 14,11.428572 14,9.2857145 12.4,8.5714286 12.4,6.4285715 11.293188,6.8566023 10.8,7.8571429 10.8,8.5714286 10.038351,8.1738861 9.2,6.6045897 10,5 Z" style="fill:#f9f5f0;fill-opacity:1;stroke-width:.755929"/>
-</svg>
diff --git a/icons/poi_fire_station_truck.svg b/icons/poi_fire_station_truck.svg
deleted file mode 100644
index a353239e6..000000000
--- a/icons/poi_fire_station_truck.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
- <path style="display:inline;fill:#000;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:markers stroke fill;stop-color:#000" d="M 3,13 H 1 V 12 H 2 V 9 L 3,6 H 4 V 5 H 5 V 6 H 8 V 9 H 9 V 8 h 9 v 4 h 1 v 1 z"/>
- <path style="fill:#000;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:markers stroke fill;stop-color:#000" d="m 9,4 v 1 h 1 V 6 H 9 v 1 h 9 V 6 H 17 V 5 h 1 V 4 Z m 2,1 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z m 2,0 h 1 v 1 h -1 z"/>
- <path style="fill:#000;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke fill markers;stop-color:#000" d="M6 14a1 1 0 0 1-.9977961.999998 1 1 0 0 1-1.0021942-.99559 1 1 0 0 1 .9933787-1.004386 1 1 0 0 1 1.0065727.991163L5 14ZM14 14a1 1 0 0 1-.997796.999998 1 1 0 0 1-1.002194-.99559 1 1 0 0 1 .993378-1.004386 1 1 0 0 1 1.006573.991163L13 14ZM17 14a1 1 0 0 1-.997796.999998 1 1 0 0 1-1.002194-.99559 1 1 0 0 1 .993378-1.004386 1 1 0 0 1 1.006573.991163L16 14Z"/>
- <path style="fill:#f9f5f0;stroke:#f9f5f0;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;paint-order:stroke fill markers;stop-color:#000;stroke-dasharray:none;fill-opacity:1" d="M 3,9 3.667,7 H 7 v 2 z"/>
-</svg>