From 7c8322c65eb5f958131a2b6286d8086b228759d4 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Wed, 18 Dec 2013 01:23:46 -0500
Subject: [PATCH] add "Tunnel" field for waterways.

---
 data/presets.yaml                         |  2 ++
 data/presets/categories.json              |  3 ++-
 data/presets/categories/water-line.json   |  5 +++--
 data/presets/fields.json                  |  5 +++++
 data/presets/fields/tunnel.json           |  5 +++++
 data/presets/presets.json                 | 12 +++++++++++-
 data/presets/presets/waterway/ditch.json  |  3 +++
 data/presets/presets/waterway/drain.json  |  5 ++++-
 data/presets/presets/waterway/river.json  |  5 ++++-
 data/presets/presets/waterway/stream.json |  3 ++-
 dist/locales/en.json                      |  3 +++
 11 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 data/presets/fields/tunnel.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 356113197..8fd648f69 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -306,6 +306,8 @@ en:
         label: Trail Visibility
       tree_type: 
         label: Type
+      tunnel: 
+        label: Tunnel
       vending: 
         label: Type of Goods
       water: 
diff --git a/data/presets/categories.json b/data/presets/categories.json
index b3cd6a8dd..cfe5a2ed8 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -128,7 +128,8 @@
             "waterway/river",
             "waterway/stream",
             "waterway/canal",
-            "waterway/ditch"
+            "waterway/ditch",
+            "waterway/drain"
         ]
     }
 }
\ No newline at end of file
diff --git a/data/presets/categories/water-line.json b/data/presets/categories/water-line.json
index f1968b5fd..04dad07e8 100644
--- a/data/presets/categories/water-line.json
+++ b/data/presets/categories/water-line.json
@@ -6,6 +6,7 @@
         "waterway/river",
         "waterway/stream",
         "waterway/canal",
-        "waterway/ditch"
+        "waterway/ditch",
+        "waterway/drain"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 2327c3151..3d56bf622 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -761,6 +761,11 @@
         ],
         "label": "Type"
     },
+    "tunnel": {
+        "key": "tunnel",
+        "type": "combo",
+        "label": "Tunnel"
+    },
     "vending": {
         "key": "vending",
         "type": "combo",
diff --git a/data/presets/fields/tunnel.json b/data/presets/fields/tunnel.json
new file mode 100644
index 000000000..2c4f7751f
--- /dev/null
+++ b/data/presets/fields/tunnel.json
@@ -0,0 +1,5 @@
+{
+    "key": "tunnel",
+    "type": "combo",
+    "label": "Tunnel"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index cc173739b..2a621daa5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7235,6 +7235,9 @@
     },
     "waterway/ditch": {
         "icon": "waterway-ditch",
+        "fields": [
+            "tunnel"
+        ],
         "geometry": [
             "line"
         ],
@@ -7245,6 +7248,9 @@
     },
     "waterway/drain": {
         "icon": "waterway-stream",
+        "fields": [
+            "tunnel"
+        ],
         "geometry": [
             "line"
         ],
@@ -7255,6 +7261,9 @@
     },
     "waterway/river": {
         "icon": "waterway-river",
+        "fields": [
+            "tunnel"
+        ],
         "geometry": [
             "line"
         ],
@@ -7291,7 +7300,8 @@
     "waterway/stream": {
         "icon": "waterway-stream",
         "fields": [
-            "layer"
+            "layer",
+            "tunnel"
         ],
         "geometry": [
             "line"
diff --git a/data/presets/presets/waterway/ditch.json b/data/presets/presets/waterway/ditch.json
index 20bacfffd..0f61421df 100644
--- a/data/presets/presets/waterway/ditch.json
+++ b/data/presets/presets/waterway/ditch.json
@@ -1,5 +1,8 @@
 {
     "icon": "waterway-ditch",
+    "fields": [
+        "tunnel"
+    ],
     "geometry": [
         "line"
     ],
diff --git a/data/presets/presets/waterway/drain.json b/data/presets/presets/waterway/drain.json
index ffae65543..c0b72fdac 100644
--- a/data/presets/presets/waterway/drain.json
+++ b/data/presets/presets/waterway/drain.json
@@ -1,5 +1,8 @@
 {
     "icon": "waterway-stream",
+    "fields": [
+        "tunnel"
+    ],
     "geometry": [
         "line"
     ],
@@ -7,4 +10,4 @@
         "waterway": "drain"
     },
     "name": "Drain"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/waterway/river.json b/data/presets/presets/waterway/river.json
index 5193af05b..26899cc23 100644
--- a/data/presets/presets/waterway/river.json
+++ b/data/presets/presets/waterway/river.json
@@ -1,5 +1,8 @@
 {
     "icon": "waterway-river",
+    "fields": [
+        "tunnel"
+    ],
     "geometry": [
         "line"
     ],
@@ -22,4 +25,4 @@
         "waterway": "river"
     },
     "name": "River"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/waterway/stream.json b/data/presets/presets/waterway/stream.json
index 8a54ad4f8..35830150f 100644
--- a/data/presets/presets/waterway/stream.json
+++ b/data/presets/presets/waterway/stream.json
@@ -1,7 +1,8 @@
 {
     "icon": "waterway-stream",
     "fields": [
-        "layer"
+        "layer",
+        "tunnel"
     ],
     "geometry": [
         "line"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 4441812f7..1c9c4f4d3 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -834,6 +834,9 @@
             "tree_type": {
                 "label": "Type"
             },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "vending": {
                 "label": "Type of Goods"
             },