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"
2025-10-31 06:43:53 +01:00 · 2022-11-09 13:16:07 +01:00 · 2022-11-09 13:16:07 +01:00 · 6a013006cc
commit 6a013006cc
parent 89aaad1885 a7037f96cd
23 changed files with 280 additions and 52 deletions
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@ -758,6 +758,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 Signals
      crossing/barrier:
        # crossing:barrier=*
        label: Barrier Arm
@ -781,6 +788,41 @@ en:
      crossing/light:
        # crossing:light=*
        label: Lights
+      crossing/markings:
+        # crossing:markings=*
+        label: Crossing Markings
+        options:
+          # crossing:markings=dashes
+          dashes: Dashed Transverse Lines
+          # crossing:markings=dots
+          dots: Dotted Transverse Lines
+          # crossing:markings=ladder
+          ladder: Ladder With Longitudinal Bars
+          #paired': crossing:markings=ladder:paired
+          ladder:paired: Ladder With Paired Longitudinal Bars
+          #skewed': crossing:markings=ladder:skewed
+          ladder:skewed: Ladder With Diagonal Bars
+          # crossing:markings=lines
+          lines: Transverse Lines
+          #paired': crossing:markings=lines:paired
+          lines:paired: Double Transverse Lines
+          # crossing:markings=no
+          'no': Unmarked
+          # crossing:markings=pictograms
+          pictograms: Painted Pictograms
+          # crossing:markings=surface
+          surface: Surface Treatment Only
+          # crossing:markings=yes
+          'yes': Marked Somehow
+          # crossing:markings=zebra
+          zebra: Longitudinal Bars
+          #bicolour': crossing:markings=zebra:bicolour
+          zebra:bicolour: Longitudinal Bars With Alternating Colors
+          #double': crossing:markings=zebra:double
+          zebra:double: Triple-Four
+          #paired': crossing:markings=zebra:paired
+          zebra:paired: Paired Longitudinal Bars
+        terms: '[translate with synonyms or related terms for ''Crossing Markings'', separated by commas]'
      crossing_raised:
        # traffic_calming=*
        label: Raised
@ -6829,8 +6871,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
@ -6839,6 +6879,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
@ -6868,6 +6909,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:
@ -6922,32 +6971,40 @@ 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/footway/traffic_island:
+        # footway=traffic_island | Crosswalk Island, Traffic Island | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Refuge Island
+        # 'terms: crossing island'
+        terms: <translate with synonyms or related terms for 'Refuge Island', separated by commas>
      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