From 1683e3e8eb369cb7c48e4024765af98f104fc81d Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 12 May 2016 17:07:41 -0400
Subject: [PATCH] Rename `barrier=ditch` preset name to "Trench" We have
 `waterway=ditch` already and don't want two things labelled "Ditch" to appear
 in search. Ditches are more for carrying water, Trenches are more for
 preventing movement

---
 data/presets.yaml                       | 4 ++--
 data/presets/presets.json               | 3 ++-
 data/presets/presets/barrier/ditch.json | 3 ++-
 dist/locales/en.json                    | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index b1e1cf338..4c0534523 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1619,8 +1619,8 @@ en:
         terms: "<translate with synonyms or related terms for 'Cycle Barrier', separated by commas>"
       barrier/ditch:
         # barrier=ditch
-        name: Ditch
-        terms: "<translate with synonyms or related terms for 'Ditch', separated by commas>"
+        name: Trench
+        terms: "<translate with synonyms or related terms for 'Trench', separated by commas>"
       barrier/entrance:
         # barrier=entrance
         name: Entrance
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3ae60dd66..13d9d00d0 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2367,6 +2367,7 @@
         "name": "Cycle Barrier"
     },
     "barrier/ditch": {
+        "icon": "roadblock",
         "geometry": [
             "line",
             "area"
@@ -2374,7 +2375,7 @@
         "tags": {
             "barrier": "ditch"
         },
-        "name": "Ditch"
+        "name": "Trench"
     },
     "barrier/entrance": {
         "icon": "entrance",
diff --git a/data/presets/presets/barrier/ditch.json b/data/presets/presets/barrier/ditch.json
index 347387837..54443b5c5 100644
--- a/data/presets/presets/barrier/ditch.json
+++ b/data/presets/presets/barrier/ditch.json
@@ -1,4 +1,5 @@
 {
+    "icon": "roadblock",
     "geometry": [
         "line",
         "area"
@@ -6,5 +7,5 @@
     "tags": {
         "barrier": "ditch"
     },
-    "name": "Ditch"
+    "name": "Trench"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 6c68e8c29..d263ffd20 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2002,7 +2002,7 @@
                 "terms": ""
             },
             "barrier/ditch": {
-                "name": "Ditch",
+                "name": "Trench",
                 "terms": ""
             },
             "barrier/entrance": {