From 5171a176e7683f7f173e8ef7e155cc37264a3465 Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Tue, 29 Aug 2017 21:34:09 +0100
Subject: [PATCH 1/2] Waterway first attempt

---
 data/presets.yaml                       |  4 ++++
 data/presets/presets.json               | 15 +++++++++++++++
 data/presets/presets/type/waterway.json | 15 +++++++++++++++
 data/taginfo.json                       |  4 ++++
 dist/locales/en.json                    |  4 ++++
 5 files changed, 42 insertions(+)
 create mode 100644 data/presets/presets/type/waterway.json

diff --git a/data/presets.yaml b/data/presets.yaml
index ca0f5e3ac3..ec6d06ea9a 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4781,6 +4781,10 @@ en:
         # type=site
         name: Site
         terms: '<translate with synonyms or related terms for ''Site'', separated by commas>'
+      type/waterway:
+        # type=waterway
+        name: Waterway
+        terms: '<translate with synonyms or related terms for ''Waterway'', separated by commas>'
       vertex:
         name: Other
         terms: '<translate with synonyms or related terms for ''Other'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 0246520f34..f7904185ba 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -15065,6 +15065,21 @@
                 "site"
             ]
         },
+        "type/waterway": {
+            "geometry": [
+                "relation"
+            ],
+            "tags": {
+                "type": "waterway"
+            },
+            "name": "Waterway",
+            "icon": "waterway-river",
+            "fields": [
+                "name",
+                "waterway",
+                "ref"
+            ]
+        },
         "vertex": {
             "name": "Other",
             "tags": {},
diff --git a/data/presets/presets/type/waterway.json b/data/presets/presets/type/waterway.json
new file mode 100644
index 0000000000..f3963cb2f8
--- /dev/null
+++ b/data/presets/presets/type/waterway.json
@@ -0,0 +1,15 @@
+{
+    "geometry": [
+        "relation"
+    ],
+    "tags": {
+        "type": "waterway"
+    },
+    "name": "Waterway",
+    "icon": "waterway-river",
+    "fields": [
+        "name",
+        "waterway",
+        "ref"
+    ]
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 8a28a452c5..8dd4037d3e 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -2994,6 +2994,10 @@
             "key": "type",
             "value": "site"
         },
+        {
+            "key": "type",
+            "value": "waterway"
+        },
         {
             "key": "waterway",
             "value": "boatyard"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ff3d862c13..81b1857440 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5309,6 +5309,10 @@
                     "name": "Site",
                     "terms": ""
                 },
+                "type/waterway": {
+                    "name": "Waterway",
+                    "terms": ""
+                },
                 "vertex": {
                     "name": "Other",
                     "terms": ""

From 9af42520890247b312b1ea69504821ef56501272 Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Thu, 7 Sep 2017 19:48:49 +0100
Subject: [PATCH 2/2] Add CSS to make waterway blue

---
 css/45_waterways.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/css/45_waterways.css b/css/45_waterways.css
index 44996a97ec..ee18b7d775 100644
--- a/css/45_waterways.css
+++ b/css/45_waterways.css
@@ -6,6 +6,7 @@
 }
 .preset-icon .icon.category-water,
 .preset-icon .icon.tag-route-ferry,
+.preset-icon .icon.tag-type-waterway,
 .preset-icon .icon.tag-waterway {
     color: #77d3de;
     fill: #fff;