From 8bf9c260a7eb332a094fa4b259f36977a68abce0 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 30 Jun 2016 21:45:18 -0400
Subject: [PATCH] Switch from `sloped_curb=*` to `kerb=*` (closes #3210)

---
 data/presets.yaml                           |  6 +++---
 data/presets/fields.json                    | 10 +++++-----
 data/presets/fields/kerb.json               |  5 +++++
 data/presets/fields/sloped_curb.json        |  5 -----
 data/presets/presets.json                   |  8 ++++----
 data/presets/presets/footway/crossing.json  |  2 +-
 data/presets/presets/footway/crosswalk.json |  2 +-
 data/presets/presets/highway/crossing.json  |  2 +-
 data/presets/presets/highway/crosswalk.json |  2 +-
 dist/locales/en.json                        |  6 +++---
 10 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 data/presets/fields/kerb.json
 delete mode 100644 data/presets/fields/sloped_curb.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 679a263b7..39d6c0f1b 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -466,6 +466,9 @@ en:
       internet_access/fee:
         # 'internet_access:fee=*'
         label: Internet Access Fee
+      kerb:
+        # kerb=*
+        label: Curb Ramp
       lamp_type:
         # lamp_type=*
         label: Type
@@ -868,9 +871,6 @@ en:
       site:
         # site=*
         label: Type
-      sloped_curb:
-        # sloped_curb=*
-        label: Sloped Curb
       smoking:
         # smoking=*
         label: Smoking
diff --git a/data/presets/fields.json b/data/presets/fields.json
index bc25238b9..1c41e98aa 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -640,6 +640,11 @@
         "type": "check",
         "label": "Internet Access Fee"
     },
+    "kerb": {
+        "key": "kerb",
+        "type": "combo",
+        "label": "Curb Ramp"
+    },
     "lamp_type": {
         "key": "lamp_type",
         "type": "combo",
@@ -1155,11 +1160,6 @@
         "type": "combo",
         "label": "Type"
     },
-    "sloped_curb": {
-        "key": "sloped_curb",
-        "type": "combo",
-        "label": "Sloped Curb"
-    },
     "smoking": {
         "key": "smoking",
         "type": "combo",
diff --git a/data/presets/fields/kerb.json b/data/presets/fields/kerb.json
new file mode 100644
index 000000000..62ec55ee0
--- /dev/null
+++ b/data/presets/fields/kerb.json
@@ -0,0 +1,5 @@
+{
+    "key": "kerb",
+    "type": "combo",
+    "label": "Curb Ramp"
+}
diff --git a/data/presets/fields/sloped_curb.json b/data/presets/fields/sloped_curb.json
deleted file mode 100644
index a293a4751..000000000
--- a/data/presets/fields/sloped_curb.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "sloped_curb",
-    "type": "combo",
-    "label": "Sloped Curb"
-}
\ No newline at end of file
diff --git a/data/presets/presets.json b/data/presets/presets.json
index b992531f2..4a24d32b2 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4041,7 +4041,7 @@
             "crossing",
             "access",
             "surface",
-            "sloped_curb",
+            "kerb",
             "tactile_paving"
         ],
         "geometry": [
@@ -4060,7 +4060,7 @@
             "crossing",
             "access",
             "surface",
-            "sloped_curb",
+            "kerb",
             "tactile_paving"
         ],
         "geometry": [
@@ -4289,7 +4289,7 @@
     "highway/crossing": {
         "fields": [
             "crossing",
-            "sloped_curb",
+            "kerb",
             "tactile_paving"
         ],
         "geometry": [
@@ -4304,7 +4304,7 @@
     "highway/crosswalk": {
         "fields": [
             "crossing",
-            "sloped_curb",
+            "kerb",
             "tactile_paving"
         ],
         "geometry": [
diff --git a/data/presets/presets/footway/crossing.json b/data/presets/presets/footway/crossing.json
index 6c5175e8b..a2154ce1f 100644
--- a/data/presets/presets/footway/crossing.json
+++ b/data/presets/presets/footway/crossing.json
@@ -3,7 +3,7 @@
         "crossing",
         "access",
         "surface",
-        "sloped_curb",
+        "kerb",
         "tactile_paving"
     ],
     "geometry": [
diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json
index 5f0a348b3..8c27f214f 100644
--- a/data/presets/presets/footway/crosswalk.json
+++ b/data/presets/presets/footway/crosswalk.json
@@ -4,7 +4,7 @@
         "crossing",
         "access",
         "surface",
-        "sloped_curb",
+        "kerb",
         "tactile_paving"
     ],
     "geometry": [
diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json
index cd72f6eba..cf8458d2d 100644
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -1,7 +1,7 @@
 {
     "fields": [
         "crossing",
-        "sloped_curb",
+        "kerb",
         "tactile_paving"
     ],
     "geometry": [
diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json
index 1ab1960e5..ab8696e0c 100644
--- a/data/presets/presets/highway/crosswalk.json
+++ b/data/presets/presets/highway/crosswalk.json
@@ -1,7 +1,7 @@
 {
     "fields": [
         "crossing",
-        "sloped_curb",
+        "kerb",
         "tactile_paving"
     ],
     "geometry": [
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e0a345bfa..b17170191 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1042,6 +1042,9 @@
             "internet_access/fee": {
                 "label": "Internet Access Fee"
             },
+            "kerb": {
+                "label": "Curb Ramp"
+            },
             "lamp_type": {
                 "label": "Type"
             },
@@ -1365,9 +1368,6 @@
             "site": {
                 "label": "Type"
             },
-            "sloped_curb": {
-                "label": "Sloped Curb"
-            },
             "smoking": {
                 "label": "Smoking",
                 "placeholder": "No, Separated, Yes...",