Merge pull request #590 from openstreetmap/crossing_markings

refactor crossing presets to use approved "crossing:markings" tag: add field for the new tag, change "Marked Crosswalk" presets to use "crossing=uncontrolled" tag and add preset for "Cycle Crossing With Traffic Signals"
openstreetmap · Nov 9, 2022 · 6a01300 · 6a01300
2 parents 89aaad1 + a7037f9
commit 6a01300
Show file tree

Hide file tree

Showing 23 changed files with 278 additions and 50 deletions.
diff --git a/data/fields/crossing.json b/data/fields/crossing.json
@@ -1,5 +1,17 @@
 {
     "key": "crossing",
     "type": "combo",
-    "label": "Type"
+    "label": "Type",
+    "options": [
+        "traffic_signals",
+        "uncontrolled",
+        "unmarked"
+    ],
+    "strings": {
+        "options": {
+            "traffic_signals": "Crossing With Traffic Signals",
+            "uncontrolled": "Only Road Markings",
+            "unmarked": "No Road Markings or Traffic Signals"
+        }
+    }
 }
diff --git a/data/fields/crossing/markings.json b/data/fields/crossing/markings.json
@@ -0,0 +1,24 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "Crossing Markings",
+    "strings": {
+        "options": {
+            "zebra": "Longitudinal Bars",
+            "lines": "Transverse Lines",
+            "no": "Unmarked",
+            "ladder": "Ladder With Longitudinal Bars",
+            "dots": "Dotted Transverse Lines",
+            "dashes": "Dashed Transverse Lines",
+            "yes": "Marked Somehow",
+            "surface": "Surface Treatment Only",
+            "ladder:skewed": "Ladder With Diagonal Bars",
+            "pictograms": "Painted Pictograms",
+            "lines:paired": "Double Transverse Lines",
+            "zebra:double": "Triple-Four",
+            "zebra:paired": "Paired Longitudinal Bars",
+            "zebra:bicolour": "Longitudinal Bars With Alternating Colors",
+            "ladder:paired": "Ladder With Paired Longitudinal Bars"
+        }
+    }
+}
diff --git a/data/preset_categories/path.json b/data/preset_categories/path.json
@@ -4,7 +4,7 @@
     "members": [
         "highway/path",
         "highway/footway",
-        "highway/footway/marked",
+        "highway/footway/crossing/uncontrolled",
         "highway/footway/sidewalk",
         "highway/steps",
         "highway/cycleway",

diff --git a/data/preset_defaults.json b/data/preset_defaults.json
@@ -36,7 +36,8 @@
         "point"
     ],
     "vertex": [
-        "highway/crossing/marked",
+        "highway/crossing/traffic_signals",
+        "highway/crossing/uncontrolled",
         "highway/crossing/unmarked",
         "railway/level_crossing",
         "highway/traffic_signals",

diff --git a/data/presets/highway/crossing/marked.json → data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/marked.json → data/presets/highway/crossing/_marked.json
@@ -4,6 +4,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
+        "crossing/markings",
         "crossing_raised"
     ],
     "moreFields": [
@@ -25,5 +26,6 @@
         "marked crossing",
         "crosswalk"
     ],
-    "name": "Marked Crosswalk"
+    "name": "Marked Crosswalk",
+    "searchable": false
 }
diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json
@@ -4,6 +4,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
+        "crossing/markings",
         "crossing_raised"
     ],
     "geometry": [

diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json
@@ -4,6 +4,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
+        "crossing/markings",
         "crossing_raised",
         "button_operated",
         "traffic_signals/sound",

diff --git a/...esets/highway/crossing/_uncontrolled.json → ...resets/highway/crossing/uncontrolled.json b/...esets/highway/crossing/_uncontrolled.json → ...resets/highway/crossing/uncontrolled.json
@@ -4,6 +4,7 @@
         "crossing",
         "tactile_paving",
         "crossing/island",
+        "crossing/markings",
         "crossing_raised"
     ],
     "geometry": [
@@ -17,6 +18,5 @@
         "key": "crossing",
         "value": "uncontrolled"
     },
-    "name": "Marked Crosswalk",
-    "searchable": false
+    "name": "Marked Crosswalk"
 }
diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json
@@ -2,10 +2,11 @@
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
         "crossing",
-        "access",
         "surface",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing/markings",
+        "access"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json
@@ -0,0 +1,27 @@
+{
+    "icon": "temaki-cyclist_crosswalk",
+    "fields": [
+        "crossing",
+        "surface",
+        "tactile_paving",
+        "crossing/island",
+        "crossing/markings",
+        "crossing_raised",
+        "access"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "cycleway",
+        "cycleway": "crossing",
+        "crossing": "marked"
+    },
+    "reference": {
+        "key": "crossing",
+        "value": "marked"
+    },
+    "matchScore": 0.95,
+    "name": "Marked Cycle Crossing",
+    "searchable": false
+}
diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json
@@ -9,11 +9,13 @@
     "icon": "temaki-ped_cyclist_crosswalk",
     "fields": [
         "crossing",
-        "access",
         "surface",
         "smoothness",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing/markings",
+        "crossing_raised",
+        "access"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json
@@ -0,0 +1,34 @@
+{
+    "icon": "fas-biking",
+    "fields": [
+        "crossing",
+        "surface",
+        "tactile_paving",
+        "crossing/island",
+        "crossing_raised",
+        "button_operated",
+        "traffic_signals/sound",
+        "traffic_signals/vibration",
+        "access"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "cycleway",
+        "cycleway": "crossing",
+        "crossing": "traffic_signals"
+    },
+    "reference": {
+        "key": "crossing",
+        "value": "traffic_signals"
+    },
+    "terms": [
+        "cycle path crossing",
+        "cycleway crossing",
+        "bicycle crossing",
+        "bike crossing"
+    ],
+    "matchScore": 0.95,
+    "name": "Cycle Crossing With Traffic Signals"
+}
diff --git a/...ets/highway/cycleway/crossing/marked.json → ...ghway/cycleway/crossing/uncontrolled.json b/...ets/highway/cycleway/crossing/marked.json → ...ghway/cycleway/crossing/uncontrolled.json
@@ -2,22 +2,24 @@
     "icon": "temaki-cyclist_crosswalk",
     "fields": [
         "crossing",
-        "access",
         "surface",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing/markings",
+        "crossing_raised",
+        "access"
     ],
     "geometry": [
         "line"
     ],
     "tags": {
         "highway": "cycleway",
         "cycleway": "crossing",
-        "crossing": "marked"
+        "crossing": "uncontrolled"
     },
     "reference": {
         "key": "crossing",
-        "value": "marked"
+        "value": "uncontrolled"
     },
     "terms": [
         "cycle crosswalk",

diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json
@@ -2,10 +2,11 @@
     "icon": "fas-biking",
     "fields": [
         "crossing",
-        "access",
         "surface",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing_raised",
+        "access"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/footway/_crossing.json b/data/presets/highway/footway/_crossing.json
@@ -1,10 +1,12 @@
 {
     "fields": [
         "crossing",
-        "access",
         "surface",
         "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing/markings",
+        "crossing_raised",
+        "access"
     ],
     "geometry": [
         "line"

diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json
@@ -0,0 +1,29 @@
+{
+    "icon": "temaki-pedestrian_crosswalk",
+    "fields": [
+        "crossing",
+        "surface",
+        "tactile_paving",
+        "crossing/island",
+        "crossing/markings",
+        "crossing_raised",
+        "access"
+    ],
+    "moreFields": [
+        "flashing_lights"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "footway",
+        "footway": "crossing",
+        "crossing": "marked"
+    },
+    "reference": {
+        "key": "crossing",
+        "value": "marked"
+    },
+    "name": "Marked Crossing",
+    "searchable": false
+}
diff --git a/data/presets/highway/footway/_zebra.json → ...sets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/_zebra.json → ...sets/highway/footway/crossing/_zebra.json
@@ -2,11 +2,12 @@
     "icon": "temaki-pedestrian_crosswalk",
     "fields": [
         "crossing",
-        "access",
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing_raised"
+        "crossing/markings",
+        "crossing_raised",
+        "access"
     ],
     "geometry": [
         "line"
@@ -20,6 +21,6 @@
         "key": "crossing",
         "value": "zebra"
     },
-    "name": "Marked Crosswalk",
+    "name": "Marked Crossing",
     "searchable": false
 }
diff --git a/...sets/highway/footway/traffic_signals.json → ...way/footway/crossing/traffic_signals.json b/...sets/highway/footway/traffic_signals.json → ...way/footway/crossing/traffic_signals.json
@@ -2,14 +2,15 @@
     "icon": "temaki-railway_signals",
     "fields": [
         "crossing",
-        "access",
         "surface",
         "tactile_paving",
         "crossing/island",
+        "crossing/markings",
         "crossing_raised",
         "button_operated",
         "traffic_signals/sound",
-        "traffic_signals/vibration"
+        "traffic_signals/vibration",
+        "access"
     ],
     "moreFields": [
         "traffic_signals/arrow",

diff --git a/data/presets/highway/footway/marked.json → ...ighway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/marked.json → ...ighway/footway/crossing/uncontrolled.json
@@ -1,12 +1,13 @@
 {
-    "icon": "temaki-pedestrian_crosswalk",
+    "icon": "temaki-pedestrian",
     "fields": [
         "crossing",
-        "access",
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing_raised"
+        "crossing/markings",
+        "crossing_raised",
+        "access"
     ],
     "moreFields": [
         "flashing_lights"
@@ -17,18 +18,18 @@
     "tags": {
         "highway": "footway",
         "footway": "crossing",
-        "crossing": "marked"
+        "crossing": "uncontrolled"
     },
     "reference": {
         "key": "crossing",
-        "value": "marked"
+        "value": "uncontrolled"
     },
     "terms": [
         "marked foot path crossing",
-        "marked crossing",
+        "marked crosswalk",
         "marked pedestrian crosswalk",
         "zebra crossing",
         "crosswalk"
     ],
-    "name": "Marked Crosswalk"
+    "name": "Marked Crossing"
 }
diff --git a/data/presets/highway/footway/unmarked.json → ...ts/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/unmarked.json → ...ts/highway/footway/crossing/unmarked.json
@@ -2,11 +2,11 @@
     "icon": "temaki-pedestrian",
     "fields": [
         "crossing",
-        "access",
         "surface",
         "tactile_paving",
         "crossing/island",
-        "crossing_raised"
+        "crossing_raised",
+        "access"
     ],
     "moreFields": [
         "flashing_lights"