From 9318769d5fd32a17e7d1b8805a4cae4a54614d3d Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 11 Jun 2018 01:09:35 -0400
Subject: [PATCH] Add `emergency=fire_extinguisher` preset

---
 data/presets.yaml                             |  4 +++
 data/presets/presets.json                     | 26 ++++++++++++++-----
 .../presets/emergency/defibrillator.json      |  6 ++---
 .../presets/emergency/fire_extinguisher.json  | 16 ++++++++++++
 .../presets/presets/emergency/water_tank.json |  4 +--
 data/taginfo.json                             |  9 +++++++
 dist/locales/en.json                          |  4 +++
 svg/fontawesome/fas-fire-extinguisher.svg     |  1 +
 8 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 data/presets/presets/emergency/fire_extinguisher.json
 create mode 100644 svg/fontawesome/fas-fire-extinguisher.svg

diff --git a/data/presets.yaml b/data/presets.yaml
index e7a7e1c01..6c6cc4fa7 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3065,6 +3065,10 @@ en:
       emergency/destination:
         # emergency=destination
         name: Emergency Access Destination
+      emergency/fire_extinguisher:
+        # emergency=fire_extinguisher
+        name: Fire Extinguisher
+        terms: '<translate with synonyms or related terms for ''Fire Extinguisher'', separated by commas>'
       emergency/fire_hydrant:
         # emergency=fire_hydrant
         name: Fire Hydrant
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9ef5348d1..946bc349e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6510,11 +6510,9 @@
         "emergency/defibrillator": {
             "icon": "maki-defibrillator",
             "fields": [
-                "ref",
-                "access",
-                "opening_hours",
                 "indoor",
-                "phone"
+                "ref",
+                "operator"
             ],
             "geometry": [
                 "point",
@@ -6528,6 +6526,22 @@
             },
             "name": "Defibrillator"
         },
+        "emergency/fire_extinguisher": {
+            "icon": "fas-fire-extinguisher",
+            "fields": [
+                "indoor",
+                "ref",
+                "operator"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "emergency": "fire_extinguisher"
+            },
+            "name": "Fire Extinguisher"
+        },
         "emergency/fire_hydrant": {
             "icon": "temaki-fire_hydrant",
             "fields": [
@@ -6587,8 +6601,8 @@
             "icon": "maki-water",
             "fields": [
                 "name",
-                "operator",
-                "ref"
+                "ref",
+                "operator"
             ],
             "geometry": [
                 "point",
diff --git a/data/presets/presets/emergency/defibrillator.json b/data/presets/presets/emergency/defibrillator.json
index 63a9bba6d..5e8005d87 100644
--- a/data/presets/presets/emergency/defibrillator.json
+++ b/data/presets/presets/emergency/defibrillator.json
@@ -1,11 +1,9 @@
 {
     "icon": "maki-defibrillator",
     "fields": [
-        "ref",
-        "access",
-        "opening_hours",
         "indoor",
-        "phone"
+        "ref",
+        "operator"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/emergency/fire_extinguisher.json b/data/presets/presets/emergency/fire_extinguisher.json
new file mode 100644
index 000000000..b71b686a8
--- /dev/null
+++ b/data/presets/presets/emergency/fire_extinguisher.json
@@ -0,0 +1,16 @@
+{
+    "icon": "fas-fire-extinguisher",
+    "fields": [
+        "indoor",
+        "ref",
+        "operator"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "emergency": "fire_extinguisher"
+    },
+    "name": "Fire Extinguisher"
+}
diff --git a/data/presets/presets/emergency/water_tank.json b/data/presets/presets/emergency/water_tank.json
index 347df5b83..775a5ff7f 100644
--- a/data/presets/presets/emergency/water_tank.json
+++ b/data/presets/presets/emergency/water_tank.json
@@ -2,8 +2,8 @@
     "icon": "maki-water",
     "fields": [
         "name",
-        "operator",
-        "ref"
+        "ref",
+        "operator"
     ],
     "geometry": [
         "point",
diff --git a/data/taginfo.json b/data/taginfo.json
index 9751c55e6..9f4b1cece 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2958,6 +2958,15 @@
             ],
             "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/defibrillator-15.svg?sanitize=true"
         },
+        {
+            "key": "emergency",
+            "value": "fire_extinguisher",
+            "description": "Fire Extinguisher",
+            "object_types": [
+                "node"
+            ],
+            "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/fas-fire-extinguisher.svg?sanitize=true"
+        },
         {
             "key": "emergency",
             "value": "fire_hydrant",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 98d87e9b9..41098f1e9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4059,6 +4059,10 @@
                     "name": "Defibrillator",
                     "terms": "AED"
                 },
+                "emergency/fire_extinguisher": {
+                    "name": "Fire Extinguisher",
+                    "terms": ""
+                },
                 "emergency/fire_hydrant": {
                     "name": "Fire Hydrant",
                     "terms": "fire plug"
diff --git a/svg/fontawesome/fas-fire-extinguisher.svg b/svg/fontawesome/fas-fire-extinguisher.svg
new file mode 100644
index 000000000..29f1d9615
--- /dev/null
+++ b/svg/fontawesome/fas-fire-extinguisher.svg
@@ -0,0 +1 @@
+<svg aria-hidden="true" data-prefix="fas" data-icon="fire-extinguisher" class="svg-inline--fa fa-fire-extinguisher fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M434.027 26.329l-168 28C254.693 56.218 256 67.8 256 72h-58.332C208.353 36.108 181.446 0 144 0c-39.435 0-66.368 39.676-52.228 76.203-52.039 13.051-75.381 54.213-90.049 90.884-4.923 12.307 1.063 26.274 13.37 31.197 12.317 4.926 26.279-1.075 31.196-13.37C75.058 112.99 106.964 120 168 120v27.076c-41.543 10.862-72 49.235-72 94.129V488c0 13.255 10.745 24 24 24h144c13.255 0 24-10.745 24-24V240c0-44.731-30.596-82.312-72-92.97V120h40c0 2.974-1.703 15.716 10.027 17.671l168 28C441.342 166.89 448 161.25 448 153.834V38.166c0-7.416-6.658-13.056-13.973-11.837zM144 72c-8.822 0-16-7.178-16-16s7.178-16 16-16 16 7.178 16 16-7.178 16-16 16z"></path></svg>
\ No newline at end of file