From f69714f83cc6c27a72924ab8a84f55c58b6f8d6d Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 14 Mar 2016 23:15:47 -0400
Subject: [PATCH] Rename "Dock" -> "Wet Dock / Dry Dock" for en_US

---
 data/presets.yaml                       |  6 ++++--
 data/presets/presets.json               | 11 ++++++++++-
 data/presets/presets/man_made/pier.json |  5 ++++-
 data/presets/presets/waterway/dock.json |  8 +++++++-
 dist/locales/en.json                    |  6 +++---
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 47ddca6dc..a5bfe6f1d 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2657,6 +2657,7 @@ en:
       man_made/pier:
         # man_made=pier
         name: Pier
+        # 'terms: dock'
         terms: "<translate with synonyms or related terms for 'Pier', separated by commas>"
       man_made/pipeline:
         # man_made=pipeline
@@ -3810,8 +3811,9 @@ en:
         terms: "<translate with synonyms or related terms for 'Ditch', separated by commas>"
       waterway/dock:
         # waterway=dock
-        name: Dock
-        terms: "<translate with synonyms or related terms for 'Dock', separated by commas>"
+        name: Wet Dock / Dry Dock
+        # 'terms: boat,ship,vessel,marine'
+        terms: "<translate with synonyms or related terms for 'Wet Dock / Dry Dock', separated by commas>"
       waterway/drain:
         # waterway=drain
         name: Drain
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7a5e75445..beba54f2e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -6137,6 +6137,9 @@
             "line",
             "area"
         ],
+        "terms": [
+            "dock"
+        ],
         "tags": {
             "man_made": "pier"
         },
@@ -10675,10 +10678,16 @@
             "vertex",
             "point"
         ],
+        "terms": [
+            "boat",
+            "ship",
+            "vessel",
+            "marine"
+        ],
         "tags": {
             "waterway": "dock"
         },
-        "name": "Dock"
+        "name": "Wet Dock / Dry Dock"
     },
     "waterway/drain": {
         "icon": "waterway-stream",
diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json
index ae436dcd4..dccc224bf 100644
--- a/data/presets/presets/man_made/pier.json
+++ b/data/presets/presets/man_made/pier.json
@@ -3,8 +3,11 @@
         "line",
         "area"
     ],
+    "terms": [
+        "dock"
+    ],
     "tags": {
         "man_made": "pier"
     },
     "name": "Pier"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/waterway/dock.json b/data/presets/presets/waterway/dock.json
index ce19ea41f..1bf7aa7cc 100644
--- a/data/presets/presets/waterway/dock.json
+++ b/data/presets/presets/waterway/dock.json
@@ -9,8 +9,14 @@
         "vertex",
         "point"
     ],
+    "terms": [
+        "boat",
+        "ship",
+        "vessel",
+        "marine"
+    ],
     "tags": {
         "waterway": "dock"
     },
-    "name": "Dock"
+    "name": "Wet Dock / Dry Dock"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 38a732b47..394af054c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2960,7 +2960,7 @@
             },
             "man_made/pier": {
                 "name": "Pier",
-                "terms": ""
+                "terms": "dock"
             },
             "man_made/pipeline": {
                 "name": "Pipeline",
@@ -4039,8 +4039,8 @@
                 "terms": ""
             },
             "waterway/dock": {
-                "name": "Dock",
-                "terms": ""
+                "name": "Wet Dock / Dry Dock",
+                "terms": "boat,ship,vessel,marine"
             },
             "waterway/drain": {
                 "name": "Drain",