From dae2e46a8d50f9710c5c55037c0a354002bafaa6 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 15 May 2019 10:27:47 -0400
Subject: [PATCH] Show the kerb field for all kerb presets (close #6360)

---
 data/presets/presets.json                      | 8 ++++----
 data/presets/presets/barrier/kerb/flush.json   | 4 ++++
 data/presets/presets/barrier/kerb/lowered.json | 1 +
 data/presets/presets/barrier/kerb/raised.json  | 1 +
 data/presets/presets/barrier/kerb/rolled.json  | 1 +
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5abfa8ebe..89646ebed 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -272,10 +272,10 @@
     "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
     "barrier/height_restrictor": {"icon": "temaki-car_wash", "fields": ["maxheight"], "geometry": ["vertex"], "tags": {"barrier": "height_restrictor"}, "name": "Height Restrictor"},
     "barrier/kerb": {"fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"},
-    "barrier/kerb/flush": {"icon": "maki-wheelchair", "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "name": "Flush Curb"},
-    "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"},
-    "barrier/kerb/raised": {"fields": ["{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "name": "Raised Curb"},
-    "barrier/kerb/rolled": {"fields": ["{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "name": "Rolled Curb"},
+    "barrier/kerb/flush": {"icon": "maki-wheelchair", "fields": ["kerb", "{barrier/kerb}"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "name": "Flush Curb"},
+    "barrier/kerb/lowered": {"icon": "maki-wheelchair", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"},
+    "barrier/kerb/raised": {"fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "name": "Raised Curb"},
+    "barrier/kerb/rolled": {"fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "name": "Rolled Curb"},
     "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
     "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
     "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
diff --git a/data/presets/presets/barrier/kerb/flush.json b/data/presets/presets/barrier/kerb/flush.json
index 29ae2cf8c..ae83e6148 100644
--- a/data/presets/presets/barrier/kerb/flush.json
+++ b/data/presets/presets/barrier/kerb/flush.json
@@ -1,5 +1,9 @@
 {
     "icon": "maki-wheelchair",
+    "fields": [
+        "kerb",
+        "{barrier/kerb}"
+    ],
     "geometry": [
         "vertex",
         "line"
diff --git a/data/presets/presets/barrier/kerb/lowered.json b/data/presets/presets/barrier/kerb/lowered.json
index 20b02961e..d266a998b 100644
--- a/data/presets/presets/barrier/kerb/lowered.json
+++ b/data/presets/presets/barrier/kerb/lowered.json
@@ -1,6 +1,7 @@
 {
     "icon": "maki-wheelchair",
     "fields": [
+        "kerb",
         "{barrier/kerb}",
         "kerb/height"
     ],
diff --git a/data/presets/presets/barrier/kerb/raised.json b/data/presets/presets/barrier/kerb/raised.json
index 64d372a8c..bbec5a5f7 100644
--- a/data/presets/presets/barrier/kerb/raised.json
+++ b/data/presets/presets/barrier/kerb/raised.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "kerb",
         "{barrier/kerb}",
         "kerb/height"
     ],
diff --git a/data/presets/presets/barrier/kerb/rolled.json b/data/presets/presets/barrier/kerb/rolled.json
index 10ee679e4..d7b29f2e4 100644
--- a/data/presets/presets/barrier/kerb/rolled.json
+++ b/data/presets/presets/barrier/kerb/rolled.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "kerb",
         "{barrier/kerb}",
         "kerb/height"
     ],