From 31e0d83ca192a442a4d416953d8f65f696a1495e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3hannes=20Birgir=20Jensson?= <joi@betra.is>
Date: Tue, 13 Aug 2013 13:17:29 -0700
Subject: [PATCH] Add emergency=fire_hydrant preset (fixes #1674)

---
 data/presets.yaml                                |  5 +++++
 data/presets/fields.json                         | 11 +++++++++++
 data/presets/fields/fire_hydrant/type.json       | 11 +++++++++++
 data/presets/presets.json                        | 13 +++++++++++++
 data/presets/presets/emergency/fire_hydrant.json | 13 +++++++++++++
 dist/locales/en.json                             |  7 +++++++
 6 files changed, 60 insertions(+)
 create mode 100644 data/presets/fields/fire_hydrant/type.json
 create mode 100644 data/presets/presets/emergency/fire_hydrant.json

diff --git a/data/presets.yaml b/data/presets.yaml
index fff8dbe5e..97af88f3a 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -111,6 +111,8 @@ en:
         placeholder: +31 42 123 4567
       fee: 
         label: Fee
+      fire_hydrant/type: 
+        label: Type
       fixme: 
         label: Fix Me
       generator/method: 
@@ -514,6 +516,9 @@ en:
       emergency/ambulance_station: 
         name: Ambulance Station
         terms: "<translate with synonyms or related terms for 'Ambulance Station', separated by commas>"
+      emergency/fire_hydrant: 
+        name: Fire Hydrant
+        terms: "<translate with synonyms or related terms for 'Fire Hydrant', separated by commas>"
       emergency/phone: 
         name: Emergency Phone
         terms: "<translate with synonyms or related terms for 'Emergency Phone', separated by commas>"
diff --git a/data/presets/fields.json b/data/presets/fields.json
index c5c1916e4..6960433fb 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -243,6 +243,17 @@
         "type": "check",
         "label": "Fee"
     },
+    "fire_hydrant/type": {
+        "key": "fire_hydrant:type",
+        "type": "combo",
+        "options": [
+            "pillar",
+            "pond",
+            "underground",
+            "wall"
+        ],
+        "label": "Type"
+    },
     "fixme": {
         "key": "fixme",
         "type": "textarea",
diff --git a/data/presets/fields/fire_hydrant/type.json b/data/presets/fields/fire_hydrant/type.json
new file mode 100644
index 000000000..27325048c
--- /dev/null
+++ b/data/presets/fields/fire_hydrant/type.json
@@ -0,0 +1,11 @@
+{
+    "key": "fire_hydrant:type",
+    "type": "combo",
+    "options": [
+        "pillar",
+        "pond",
+        "underground",
+        "wall"
+    ],
+    "label": "Type"
+}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index aaf252e38..c8f54750c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1508,6 +1508,19 @@
         },
         "name": "Ambulance Station"
     },
+    "emergency/fire_hydrant": {
+        "fields": [
+            "fire_hydrant/type"
+        ],
+        "geometry": [
+            "point",
+            "vertex"
+        ],
+        "tags": {
+            "emergency": "fire_hydrant"
+        },
+        "name": "Fire Hydrant"
+    },
     "emergency/phone": {
         "icon": "emergency-telephone",
         "fields": [
diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json
new file mode 100644
index 000000000..98cff3625
--- /dev/null
+++ b/data/presets/presets/emergency/fire_hydrant.json
@@ -0,0 +1,13 @@
+{
+    "fields": [
+        "fire_hydrant/type"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "emergency": "fire_hydrant"
+    },
+    "name": "Fire Hydrant"
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 44bbb5a4c..a247da936 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -514,6 +514,9 @@
             "fee": {
                 "label": "Fee"
             },
+            "fire_hydrant/type": {
+                "label": "Type"
+            },
             "fixme": {
                 "label": "Fix Me"
             },
@@ -1066,6 +1069,10 @@
                 "name": "Ambulance Station",
                 "terms": ""
             },
+            "emergency/fire_hydrant": {
+                "name": "Fire Hydrant",
+                "terms": ""
+            },
             "emergency/phone": {
                 "name": "Emergency Phone",
                 "terms": ""