refactor crossing presets to use (new) crossing:markings tag

The tag proposal `crossing:markings` was recently accepted: https://wiki.openstreetmap.org/wiki/Key:crossing:markings Closes #589 Closes #507 Closes #568 See also #408
2025-10-26 04:13:50 +01:00 · 2022-09-23 15:22:38 +02:00 · 2022-09-23 15:22:38 +02:00 · 80c5df168a
commit 80c5df168a
parent 4670fa066d
23 changed files with 200 additions and 59 deletions
--- 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 Lights"
+        }
+    }
 }
--- a/data/fields/crossing/markings.json
+++ b/data/fields/crossing/markings.json
@ -0,0 +1,5 @@
+{
+    "key": "crossing:markings",
+    "type": "combo",
+    "label": "Crossing Markings"
+}
--- 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",
--- 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",
--- a/data/presets/highway/crossing/_marked.json
+++ b/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
 }
--- 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": [
--- a/data/presets/highway/crossing/traffic_signals.json
+++ b/data/presets/highway/crossing/traffic_signals.json
@ -1,9 +1,9 @@
 {
    "icon": "temaki-railway_signals",
    "fields": [
-        "crossing",
        "tactile_paving",
        "crossing/island",
+        "crossing/markings",
        "crossing_raised",
        "button_operated",
        "traffic_signals/sound",
--- a/data/presets/highway/crossing/_uncontrolled.json
+++ b/data/presets/highway/crossing/_uncontrolled.json
@ -1,9 +1,9 @@
 {
    "icon": "temaki-pedestrian_crosswalk",
    "fields": [
-        "crossing",
        "tactile_paving",
        "crossing/island",
+        "crossing/markings",
        "crossing_raised"
    ],
    "geometry": [
@ -17,6 +17,5 @@
        "key": "crossing",
        "value": "uncontrolled"
    },
-    "name": "Marked Crosswalk",
-    "searchable": false
+    "name": "Marked Crosswalk"
 }
--- a/data/presets/highway/crossing/unmarked.json
+++ b/data/presets/highway/crossing/unmarked.json
@ -1,7 +1,6 @@
 {
    "icon": "temaki-pedestrian",
    "fields": [
-        "crossing",
        "tactile_paving",
        "crossing/island",
        "crossing_raised"
--- 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"
--- 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
+}
--- 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"
--- 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"
+}
--- a/data/presets/highway/cycleway/crossing/uncontrolled.json
+++ b/data/presets/highway/cycleway/crossing/uncontrolled.json
@ -1,11 +1,12 @@
 {
    "icon": "temaki-cyclist_crosswalk",
    "fields": [
-        "crossing",
-        "access",
        "surface",
        "tactile_paving",
-        "crossing/island"
+        "crossing/island",
+        "crossing/markings",
+        "crossing_raised",
+        "access"
    ],
    "geometry": [
        "line"
@ -13,11 +14,11 @@
    "tags": {
        "highway": "cycleway",
        "cycleway": "crossing",
-        "crossing": "marked"
+        "crossing": "uncontrolled"
    },
    "reference": {
        "key": "crossing",
-        "value": "marked"
+        "value": "uncontrolled"
    },
    "terms": [
        "cycle crosswalk",
--- 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"
--- 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"
--- 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
+}
--- a/data/presets/highway/footway/crossing/_zebra.json
+++ b/data/presets/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
 }
--- a/data/presets/highway/footway/crossing/traffic_signals.json
+++ b/data/presets/highway/footway/crossing/traffic_signals.json
@ -1,15 +1,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",
--- a/data/presets/highway/footway/crossing/uncontrolled.json
+++ b/data/presets/highway/footway/crossing/uncontrolled.json
@ -1,12 +1,12 @@
 {
-    "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 +17,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"
 }
--- a/data/presets/highway/footway/crossing/unmarked.json
+++ b/data/presets/highway/footway/crossing/unmarked.json
@ -1,12 +1,11 @@
 {
    "icon": "temaki-pedestrian",
    "fields": [
-        "crossing",
-        "access",
        "surface",
        "tactile_paving",
        "crossing/island",
-        "crossing_raised"
+        "crossing_raised",
+        "access"
    ],
    "moreFields": [
        "flashing_lights"
--- a/data/presets/railway/crossing.json
+++ b/data/presets/railway/crossing.json
@ -1,10 +1,14 @@
 {
    "icon": "temaki-pedestrian",
    "fields": [
+        "crossing",
        "crossing/barrier",
        "crossing/bell",
        "crossing/light"
    ],
+    "moreFields": [
+        "crossing/markings"
+    ],
    "geometry": [
        "vertex"
    ],
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@ -685,6 +685,13 @@ en:
      crossing:
        # crossing=*
        label: Type
+        options:
+          # crossing=traffic_signals
+          traffic_signals: Crossing With Traffic Signals
+          # crossing=uncontrolled
+          uncontrolled: Only Road Markings
+          # crossing=unmarked
+          unmarked: No Road Markings or Traffic Lights
      crossing/barrier:
        # crossing:barrier=*
        label: Barrier Arm
@ -708,6 +715,10 @@ en:
      crossing/light:
        # crossing:light=*
        label: Lights
+      crossing/markings:
+        # crossing:markings=*
+        label: Crossing Markings
+        terms: '[translate with synonyms or related terms for ''Crossing Markings'', separated by commas]'
      crossing_raised:
        # traffic_calming=*
        label: Raised
@ -6200,8 +6211,6 @@ en:
      highway/crossing/marked:
        # highway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
        name: Marked Crosswalk
-        # 'terms: zebra crossing,marked crossing,crosswalk'
-        terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
      highway/crossing/traffic_signals:
        # highway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
        name: Crossing With Pedestrian Signals
@ -6210,6 +6219,7 @@ en:
      highway/crossing/uncontrolled:
        # highway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
        name: Marked Crosswalk
+        terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
      highway/crossing/unmarked:
        # highway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
        name: Unmarked Crossing
@ -6239,6 +6249,14 @@ en:
      highway/cycleway/crossing/marked:
        # highway=cycleway + cycleway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
        name: Marked Cycle Crossing
+      highway/cycleway/crossing/traffic_signals:
+        # highway=cycleway + cycleway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Cycle Crossing With Traffic Signals
+        # 'terms: cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
+        terms: <translate with synonyms or related terms for 'Cycle Crossing With Traffic Signals', separated by commas>
+      highway/cycleway/crossing/uncontrolled:
+        # highway=cycleway + cycleway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Marked Cycle Crossing
        # 'terms: cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
        terms: <translate with synonyms or related terms for 'Marked Cycle Crossing', separated by commas>
      highway/cycleway/crossing/unmarked:
@ -6293,32 +6311,35 @@ en:
      highway/footway/crossing:
        # highway=footway + footway=crossing | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
        name: Pedestrian Crossing
+      highway/footway/crossing/marked:
+        # highway=footway + footway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Marked Crossing
+      highway/footway/crossing/traffic_signals:
+        # highway=footway + footway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Crossing With Pedestrian Signals
+        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
+        terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
+      highway/footway/crossing/uncontrolled:
+        # highway=footway + footway=crossing + crossing=uncontrolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Marked Crossing
+        # 'terms: marked foot path crossing,marked crosswalk,marked pedestrian crosswalk,zebra crossing,crosswalk'
+        terms: <translate with synonyms or related terms for 'Marked Crossing', separated by commas>
+      highway/footway/crossing/unmarked:
+        # highway=footway + footway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Unmarked Crossing
+        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
+        terms: <translate with synonyms or related terms for 'Unmarked Crossing', separated by commas>
+      highway/footway/crossing/zebra:
+        # highway=footway + footway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Marked Crossing
      highway/footway/informal:
        # highway=footway + informal=yes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
        name: Informal Foot Path
-      highway/footway/marked:
-        # highway=footway + footway=crossing + crossing=marked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Marked Crosswalk
-        # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing,crosswalk'
-        terms: <translate with synonyms or related terms for 'Marked Crosswalk', separated by commas>
      highway/footway/sidewalk:
        # footway=sidewalk | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
        name: Sidewalk
        # 'terms: pavement,sidepath'
        terms: <translate with synonyms or related terms for 'Sidewalk', separated by commas>
-      highway/footway/traffic_signals:
-        # highway=footway + footway=crossing + crossing=traffic_signals | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Crossing With Pedestrian Signals
-        # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)'
-        terms: <translate with synonyms or related terms for 'Crossing With Pedestrian Signals', separated by commas>
-      highway/footway/unmarked:
-        # highway=footway + footway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Unmarked Crossing
-        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
-        terms: <translate with synonyms or related terms for 'Unmarked Crossing', separated by commas>
-      highway/footway/zebra:
-        # highway=footway + footway=crossing + crossing=zebra | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Marked Crosswalk
      highway/give_way:
        # highway=give_way | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
        name: Yield Sign