From 1f2420e5994c22c6c1fa0a5c006dbf0f819ecccc Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Sat, 24 May 2014 12:20:52 -0400
Subject: [PATCH] Prefer more specific 'Crosswalk' preset over generic
 'Crossing' Many new users in my area are getting this wrong or skipping
 crossings entirely because: 1. Most crossings people want to map really are
 `crossing=zebra`. 2. 'zebra' is not a common term in the US so users don't
 know to pick it. 3. Popup help for 'Crossing' shows a zebra, so users think
 that's what they picked.

---
 data/presets.yaml                             | 10 ++++-
 data/presets/defaults.json                    |  2 +-
 data/presets/presets.json                     | 45 +++++++++++++++++--
 data/presets/presets/footway/crossing.json    | 11 +++--
 data/presets/presets/footway/crosswalk.json   | 22 +++++++++
 data/presets/presets/highway/crossing.json    |  7 +--
 data/presets/presets/highway/crosswalk.json   | 19 ++++++++
 .../presets/highway/motorway_junction.json    |  4 +-
 dist/locales/en.json                          | 10 ++++-
 9 files changed, 109 insertions(+), 21 deletions(-)
 create mode 100644 data/presets/presets/footway/crosswalk.json
 create mode 100644 data/presets/presets/highway/crosswalk.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 78ed66fb2..eadcd62ba 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -966,6 +966,9 @@ en:
       footway/crossing: 
         name: Crossing
         terms: "<translate with synonyms or related terms for 'Crossing', separated by commas>"
+      footway/crosswalk: 
+        name: Crosswalk
+        terms: "<translate with synonyms or related terms for 'Crosswalk', separated by commas>"
       footway/sidewalk: 
         name: Sidewalk
         terms: "<translate with synonyms or related terms for 'Sidewalk', separated by commas>"
@@ -1008,6 +1011,9 @@ en:
       highway/crossing: 
         name: Crossing
         terms: "<translate with synonyms or related terms for 'Crossing', separated by commas>"
+      highway/crosswalk: 
+        name: Crosswalk
+        terms: "<translate with synonyms or related terms for 'Crosswalk', separated by commas>"
       highway/cycleway: 
         name: Cycle Path
         terms: "<translate with synonyms or related terms for 'Cycle Path', separated by commas>"
@@ -1024,8 +1030,8 @@ en:
         name: Motorway
         terms: "<translate with synonyms or related terms for 'Motorway', separated by commas>"
       highway/motorway_junction: 
-        name: Motorway Junction
-        terms: "<translate with synonyms or related terms for 'Motorway Junction', separated by commas>"
+        name: Motorway Junction / Exit
+        terms: "<translate with synonyms or related terms for 'Motorway Junction / Exit', separated by commas>"
       highway/motorway_link: 
         name: Motorway Link
         terms: "<translate with synonyms or related terms for 'Motorway Link', separated by commas>"
diff --git a/data/presets/defaults.json b/data/presets/defaults.json
index 00a385aca..9ee114295 100644
--- a/data/presets/defaults.json
+++ b/data/presets/defaults.json
@@ -30,7 +30,7 @@
         "point"
     ],
     "vertex": [
-        "highway/crossing",
+        "highway/crosswalk",
         "railway/level_crossing",
         "highway/traffic_signals",
         "highway/turning_circle",
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 45c942f02..e66b254ff 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -3527,7 +3527,9 @@
         "fields": [
             "crossing",
             "access",
-            "surface"
+            "surface",
+            "sloped_curb",
+            "tactile_paving"
         ],
         "geometry": [
             "line"
@@ -3536,11 +3538,30 @@
             "highway": "footway",
             "footway": "crossing"
         },
+        "terms": [],
+        "name": "Crossing"
+    },
+    "footway/crosswalk": {
+        "fields": [
+            "crossing",
+            "access",
+            "surface",
+            "sloped_curb",
+            "tactile_paving"
+        ],
+        "geometry": [
+            "line"
+        ],
+        "tags": {
+            "highway": "footway",
+            "footway": "crossing",
+            "crossing": "zebra"
+        },
         "terms": [
             "crosswalk",
             "zebra crossing"
         ],
-        "name": "Crossing"
+        "name": "Crosswalk"
     },
     "footway/sidewalk": {
         "fields": [
@@ -3741,11 +3762,27 @@
         "tags": {
             "highway": "crossing"
         },
+        "terms": [],
+        "name": "Crossing"
+    },
+    "highway/crosswalk": {
+        "fields": [
+            "crossing",
+            "sloped_curb",
+            "tactile_paving"
+        ],
+        "geometry": [
+            "vertex"
+        ],
+        "tags": {
+            "highway": "crossing",
+            "crossing": "zebra"
+        },
         "terms": [
             "crosswalk",
             "zebra crossing"
         ],
-        "name": "Crossing"
+        "name": "Crosswalk"
     },
     "highway/cycleway": {
         "icon": "highway-cycleway",
@@ -3869,7 +3906,7 @@
         "fields": [
             "ref"
         ],
-        "name": "Motorway Junction"
+        "name": "Motorway Junction / Exit"
     },
     "highway/motorway_link": {
         "icon": "highway-motorway-link",
diff --git a/data/presets/presets/footway/crossing.json b/data/presets/presets/footway/crossing.json
index 6356af31d..fa24d94e3 100644
--- a/data/presets/presets/footway/crossing.json
+++ b/data/presets/presets/footway/crossing.json
@@ -2,7 +2,9 @@
     "fields": [
         "crossing",
         "access",
-        "surface"
+        "surface",
+        "sloped_curb",
+        "tactile_paving"
     ],
     "geometry": [
         "line"
@@ -11,9 +13,6 @@
         "highway": "footway",
         "footway": "crossing"
     },
-    "terms": [
-        "crosswalk",
-        "zebra crossing"
-    ],
+    "terms": [],
     "name": "Crossing"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/footway/crosswalk.json b/data/presets/presets/footway/crosswalk.json
new file mode 100644
index 000000000..f41afe3b6
--- /dev/null
+++ b/data/presets/presets/footway/crosswalk.json
@@ -0,0 +1,22 @@
+{
+    "fields": [
+        "crossing",
+        "access",
+        "surface",
+        "sloped_curb",
+        "tactile_paving"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "footway",
+        "footway": "crossing",
+        "crossing": "zebra"
+    },
+    "terms": [
+        "crosswalk",
+        "zebra crossing"
+    ],
+    "name": "Crosswalk"
+}
diff --git a/data/presets/presets/highway/crossing.json b/data/presets/presets/highway/crossing.json
index 0d30790e5..f25e507e8 100644
--- a/data/presets/presets/highway/crossing.json
+++ b/data/presets/presets/highway/crossing.json
@@ -10,9 +10,6 @@
     "tags": {
         "highway": "crossing"
     },
-    "terms": [
-        "crosswalk",
-        "zebra crossing"
-    ],
+    "terms": [],
     "name": "Crossing"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway/crosswalk.json b/data/presets/presets/highway/crosswalk.json
new file mode 100644
index 000000000..875c48fe6
--- /dev/null
+++ b/data/presets/presets/highway/crosswalk.json
@@ -0,0 +1,19 @@
+{
+    "fields": [
+        "crossing",
+        "sloped_curb",
+        "tactile_paving"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "highway": "crossing",
+        "crossing": "zebra"
+    },
+    "terms": [
+        "crosswalk",
+        "zebra crossing"
+    ],
+    "name": "Crosswalk"
+}
diff --git a/data/presets/presets/highway/motorway_junction.json b/data/presets/presets/highway/motorway_junction.json
index 373433680..551e133a6 100644
--- a/data/presets/presets/highway/motorway_junction.json
+++ b/data/presets/presets/highway/motorway_junction.json
@@ -8,5 +8,5 @@
     "fields": [
         "ref"
     ],
-    "name": "Motorway Junction"
-}
\ No newline at end of file
+    "name": "Motorway Junction / Exit"
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 5bce147f0..61fe5ce3a 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1739,6 +1739,10 @@
             },
             "footway/crossing": {
                 "name": "Crossing",
+                "terms": ""
+            },
+            "footway/crosswalk": {
+                "name": "Crosswalk",
                 "terms": "crosswalk,zebra crossing"
             },
             "footway/sidewalk": {
@@ -1795,6 +1799,10 @@
             },
             "highway/crossing": {
                 "name": "Crossing",
+                "terms": ""
+            },
+            "highway/crosswalk": {
+                "name": "Crosswalk",
                 "terms": "crosswalk,zebra crossing"
             },
             "highway/cycleway": {
@@ -1818,7 +1826,7 @@
                 "terms": ""
             },
             "highway/motorway_junction": {
-                "name": "Motorway Junction",
+                "name": "Motorway Junction / Exit",
                 "terms": ""
             },
             "highway/motorway_link": {