consolidate naming of marked crossings

* reduce duplication of names
* consistent use of "Crossing" vs. "Crosswalk" across similar presets
* consistent use of terms
* sort terms alphabetically

data/presets/highway/crossing/_marked.json

@@ -31,6 +31,6 @@
         "marked crossing",
         "crosswalk"
     ],
-    "name": "Marked Crosswalk",
+    "name": "{highway/crossing/uncontrolled}",
     "searchable": false
 }

data/presets/highway/crossing/_zebra.json

@@ -18,6 +18,6 @@
         "key": "crossing",
         "value": "zebra"
     },
-    "name": "Marked Crosswalk",
+    "name": "{highway/crossing/uncontrolled}",
     "searchable": false
 }

data/presets/highway/crossing/traffic_signals.json

@@ -28,10 +28,10 @@
     },
     "name": "Crossing With Pedestrian Signals",
     "terms": [
-        "pedestrian traffic lights",
-        "pedestrian traffic signals",
-        "pedestrian crossing (lights)",
         "bicycle crossing (lights)",
-        "crosswalk (lights)"
+        "crosswalk (lights)",
+        "pedestrian crossing (lights)",
+        "pedestrian traffic lights",
+        "pedestrian traffic signals"
     ]
 }

data/presets/highway/crossing/uncontrolled.json

@@ -18,5 +18,12 @@
         "key": "crossing",
         "value": "uncontrolled"
     },
-    "name": "Marked Crosswalk"
+    "terms": [
+        "marked foot path crossing",
+        "marked crosswalk",
+        "marked pedestrian crosswalk",
+        "zebra crossing",
+        "crosswalk"
+    ],
+    "name": "Marked Crossing"
 }

data/presets/highway/crossing/unmarked.json

@@ -21,8 +21,8 @@
         "value": "unmarked"
     },
     "terms": [
-        "unmarked foot path crossing",
         "unmarked crosswalk",
+        "unmarked foot path crossing",
         "unmarked pedestrian crossing"
     ],
     "name": "Unmarked Crossing"

data/presets/highway/cycleway/crossing/_marked.json

@@ -28,6 +28,6 @@
         "value": "marked"
     },
     "matchScore": 0.95,
-    "name": "Marked Cycle Crossing",
+    "name": "{highway/cycleway/crossing/uncontrolled}",
     "searchable": false
 }

data/presets/highway/cycleway/crossing/traffic_signals.json

@@ -25,10 +25,10 @@
         "value": "traffic_signals"
     },
     "terms": [
-        "cycle path crossing",
-        "cycleway crossing",
         "bicycle crossing",
-        "bike crossing"
+        "bike crossing",
+        "cycle path crossing",
+        "cycleway crossing"
     ],
     "matchScore": 0.95,
     "name": "Cycle Crossing With Traffic Signals"

data/presets/highway/cycleway/crossing/unmarked.json

@@ -21,10 +21,10 @@
         "value": "unmarked"
     },
     "terms": [
-        "cycle path crossing",
-        "cycleway crossing",
+        "bike crossing",
         "bicycle crossing",
-        "bike crossing"
+        "cycle path crossing",
+        "cycleway crossing"
     ],
     "matchScore": 0.95,
     "name": "Unmarked Cycle Crossing"

data/presets/highway/footway/crossing/_marked.json

@@ -30,6 +30,6 @@
         "key": "crossing",
         "value": "marked"
     },
-    "name": "Marked Crossing",
+    "name": "{highway/footway/crossing/uncontrolled}",
     "searchable": false
 }

data/presets/highway/footway/crossing/_zebra.json

@@ -21,6 +21,6 @@
         "key": "crossing",
         "value": "zebra"
     },
-    "name": "Marked Crossing",
+    "name": "{highway/footway/crossing/uncontrolled}",
     "searchable": false
 }

data/presets/highway/footway/crossing/traffic_signals.json

@@ -31,10 +31,9 @@
     },
     "name": "Crossing With Pedestrian Signals",
     "terms": [
+        "crosswalk (lights)",
         "pedestrian traffic lights",
         "pedestrian traffic signals",
-        "pedestrian crossing (lights)",
-        "bicycle crossing (lights)",
-        "crosswalk (lights)"
+        "pedestrian crossing (lights)"
     ]
 }

data/presets/highway/footway/crossing/unmarked.json

@@ -24,8 +24,8 @@
         "value": "unmarked"
     },
     "terms": [
-        "unmarked foot path crossing",
         "unmarked crosswalk",
+        "unmarked foot path crossing",
         "unmarked pedestrian crossing"
     ],
     "name": "Unmarked Crossing"