From 43266a0c1f23f4520152d3fa20bcff1a8d1d847b Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Wed, 27 May 2015 16:30:57 -0400
Subject: [PATCH] Add waterway=fuel marine fuel station preset (closes #2589)

---
 data/presets.yaml                       |  3 +++
 data/presets/presets.json               | 23 +++++++++++++++++++++++
 data/presets/presets/waterway/fuel.json | 23 +++++++++++++++++++++++
 data/taginfo.json                       |  4 ++++
 dist/locales/en.json                    |  4 ++++
 5 files changed, 57 insertions(+)
 create mode 100644 data/presets/presets/waterway/fuel.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 45d050ff2..76cea7e83 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2341,6 +2341,9 @@ en:
       waterway/drain:
         name: Drain
         terms: "<translate with synonyms or related terms for 'Drain', separated by commas>"
+      waterway/fuel:
+        name: Marine Fuel Station
+        terms: "<translate with synonyms or related terms for 'Marine Fuel Station', separated by commas>"
       waterway/river:
         name: River
         terms: "<translate with synonyms or related terms for 'River', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4d5e74b9c..c5e37f68f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -9718,6 +9718,29 @@
         },
         "name": "Drain"
     },
+    "waterway/fuel": {
+        "icon": "fuel",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "petrol",
+            "gas",
+            "diesel",
+            "boat"
+        ],
+        "tags": {
+            "waterway": "fuel"
+        },
+        "name": "Marine Fuel Station"
+    },
     "waterway/river": {
         "icon": "waterway-river",
         "fields": [
diff --git a/data/presets/presets/waterway/fuel.json b/data/presets/presets/waterway/fuel.json
new file mode 100644
index 000000000..0c66924bd
--- /dev/null
+++ b/data/presets/presets/waterway/fuel.json
@@ -0,0 +1,23 @@
+{
+    "icon": "fuel",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "petrol",
+        "gas",
+        "diesel",
+        "boat"
+    ],
+    "tags": {
+        "waterway": "fuel"
+    },
+    "name": "Marine Fuel Station"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 5df970fc8..51d11096d 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2286,6 +2286,10 @@
             "key": "waterway",
             "value": "drain"
         },
+        {
+            "key": "waterway",
+            "value": "fuel"
+        },
         {
             "key": "waterway",
             "value": "river"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 6295db270..267e67d7a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3687,6 +3687,10 @@
                 "name": "Drain",
                 "terms": ""
             },
+            "waterway/fuel": {
+                "name": "Marine Fuel Station",
+                "terms": "petrol,gas,diesel,boat"
+            },
             "waterway/river": {
                 "name": "River",
                 "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"