From 799204c56e874fce769bc7f5e57f806ba92fafb3 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 23 Jan 2018 15:09:27 -0500
Subject: [PATCH] `barrier=kerb` can also be mapped as a line

---
 data/presets.yaml                      |  4 ++++
 data/presets/categories.json           |  1 +
 data/presets/presets.json              | 15 +++++++++++++++
 data/presets/presets/barrier/kerb.json |  7 ++++---
 data/taginfo.json                      |  4 ++++
 dist/locales/en.json                   |  4 ++++
 6 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 1643f2f82f..14b331440b 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2458,6 +2458,10 @@ en:
         # barrier=hedge
         name: Hedge
         terms: '<translate with synonyms or related terms for ''Hedge'', separated by commas>'
+      barrier/kerb:
+        # barrier=kerb
+        name: Kerb
+        terms: '<translate with synonyms or related terms for ''Kerb'', separated by commas>'
       barrier/kissing_gate:
         # barrier=kissing_gate
         name: Kissing Gate
diff --git a/data/presets/categories.json b/data/presets/categories.json
index 074b44b0c4..2e063c7396 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -10,6 +10,7 @@
                 "barrier/ditch",
                 "barrier/gate",
                 "barrier/hedge",
+                "barrier/kerb",
                 "barrier"
             ]
         },
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 346df254bf..a93bb77950 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4079,6 +4079,21 @@
             "name": "Hedge",
             "matchScore": 0.25
         },
+        "barrier/kerb": {
+            "icon": "wheelchair",
+            "fields": [
+                "kerb",
+                "tactile_paving"
+            ],
+            "geometry": [
+                "vertex",
+                "line"
+            ],
+            "tags": {
+                "barrier": "kerb"
+            },
+            "name": "Kerb"
+        },
         "barrier/kissing_gate": {
             "icon": "barrier",
             "fields": [
diff --git a/data/presets/presets/barrier/kerb.json b/data/presets/presets/barrier/kerb.json
index 37caeb1299..958739e5d2 100644
--- a/data/presets/presets/barrier/kerb.json
+++ b/data/presets/presets/barrier/kerb.json
@@ -1,11 +1,12 @@
 {
     "icon": "wheelchair",
     "fields": [
-        "tactile_paving",
-        "kerb"
+        "kerb",
+        "tactile_paving"
     ],
     "geometry": [
-        "vertex"
+        "vertex",
+        "line"
     ],
     "tags": {
         "barrier": "kerb"
diff --git a/data/taginfo.json b/data/taginfo.json
index 7991163e48..bcaa8359be 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -741,6 +741,10 @@
             "key": "barrier",
             "value": "hedge"
         },
+        {
+            "key": "barrier",
+            "value": "kerb"
+        },
         {
             "key": "barrier",
             "value": "kissing_gate"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2682143a3f..6fdd5b16be 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3380,6 +3380,10 @@
                     "name": "Hedge",
                     "terms": ""
                 },
+                "barrier/kerb": {
+                    "name": "Kerb",
+                    "terms": ""
+                },
                 "barrier/kissing_gate": {
                     "name": "Kissing Gate",
                     "terms": ""