From 0b39257bd5206d45991076735dfaf68269cbb5ef Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 13 Jan 2023 13:58:46 +0100 Subject: [PATCH] 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 | 2 +- data/presets/highway/crossing/_zebra.json | 2 +- .../highway/crossing/traffic_signals.json | 8 +++---- .../highway/crossing/uncontrolled.json | 9 +++++++- data/presets/highway/crossing/unmarked.json | 2 +- .../highway/cycleway/crossing/_marked.json | 2 +- .../cycleway/crossing/traffic_signals.json | 6 ++--- .../highway/cycleway/crossing/unmarked.json | 6 ++--- .../highway/footway/crossing/_marked.json | 2 +- .../highway/footway/crossing/_zebra.json | 2 +- .../footway/crossing/traffic_signals.json | 5 ++--- .../highway/footway/crossing/unmarked.json | 2 +- interim/source_strings.yaml | 22 ++++++++----------- 13 files changed, 36 insertions(+), 34 deletions(-) diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index f8b2475b..4d53aa5f 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -31,6 +31,6 @@ "marked crossing", "crosswalk" ], - "name": "Marked Crosswalk", + "name": "{highway/crossing/uncontrolled}", "searchable": false } diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json index 87de5a7e..e672ea4c 100644 --- a/data/presets/highway/crossing/_zebra.json +++ b/data/presets/highway/crossing/_zebra.json @@ -18,6 +18,6 @@ "key": "crossing", "value": "zebra" }, - "name": "Marked Crosswalk", + "name": "{highway/crossing/uncontrolled}", "searchable": false } diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index 428406f2..a865f9aa 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/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" ] } diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index f6ef77c6..dcb386f0 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/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" } diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json index 0640f22f..d60c7fe3 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/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" diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index 955f54ef..884895fa 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/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 } diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index 566bb1de..921e579d 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/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" diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index d3a3223c..aa36a003 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/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" diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json index 45b9d6d5..ed53ca7e 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/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 } diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index ceeaab56..bd0ae076 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/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 } diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index cc519757..33cba869 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/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)" ] } diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json index 3b24adc5..cfc7218a 100644 --- a/data/presets/highway/footway/crossing/unmarked.json +++ b/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" diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index c2ab15d0..a6a9fc2f 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -7255,24 +7255,23 @@ en: name: Crossing 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 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 - # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)' + # 'terms: bicycle crossing (lights),crosswalk (lights),pedestrian crossing (lights),pedestrian traffic lights,pedestrian traffic signals' terms: 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: + name: Marked Crossing + # 'terms: marked foot path crossing,marked crosswalk,marked pedestrian crosswalk,zebra crossing,crosswalk' + terms: 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 - # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing' + # 'terms: unmarked crosswalk,unmarked foot path crossing,unmarked pedestrian crossing' terms: highway/crossing/zebra: # highway=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/cycleway: # highway=cycleway | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Cycle Path @@ -7293,11 +7292,10 @@ en: terms: 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: bicycle crossing,bike crossing,cycle path crossing,cycleway crossing' terms: 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). @@ -7307,7 +7305,7 @@ en: highway/cycleway/crossing/unmarked: # highway=cycleway + cycleway=crossing + crossing=unmarked | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Unmarked Cycle Crossing - # 'terms: cycle path crossing,cycleway crossing,bicycle crossing,bike crossing' + # 'terms: bike crossing,bicycle crossing,cycle path crossing,cycleway crossing' terms: highway/cycleway/moped_link-NL: # highway=cycleway + bicycle=no + moped=designated | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). @@ -7358,11 +7356,10 @@ en: 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: crosswalk (lights),pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights)' terms: 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). @@ -7372,11 +7369,10 @@ en: 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: unmarked crosswalk,unmarked foot path crossing,unmarked pedestrian crossing' terms: 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