From 6d74dc804e13544f0e0863f1475c46d0971075bd Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Wed, 12 Apr 2023 17:57:25 +0200 Subject: [PATCH 1/2] add "kerb" tag as an optional field to crossing vertices when used without `barrier=kerb`, but on a crossing node. see also https://wiki.openstreetmap.org/w/index.php?title=Key:kerb&oldid=2501049#By_itself --- data/presets/highway/crossing.json | 3 ++- data/presets/highway/crossing/_marked.json | 3 --- data/presets/highway/crossing/traffic_signals.json | 1 + data/presets/highway/crossing/uncontrolled.json | 3 --- data/presets/highway/crossing/unmarked.json | 3 --- interim/source_strings.yaml | 1 + 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index 19f4e478..4da6be10 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -7,7 +7,8 @@ "crossing_raised" ], "moreFields": [ - "flashing_lights" + "flashing_lights", + "kerb" ], "geometry": [ "vertex" diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index 4d53aa5f..e5600014 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -7,9 +7,6 @@ "crossing/markings", "crossing_raised" ], - "moreFields": [ - "flashing_lights" - ], "geometry": [ "vertex" ], diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index a865f9aa..1e4d259f 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -11,6 +11,7 @@ "traffic_signals/vibration" ], "moreFields": [ + "kerb", "traffic_signals/arrow", "traffic_signals/countdown", "traffic_signals/minimap" diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index 804a5fdd..dcb386f0 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/uncontrolled.json @@ -7,9 +7,6 @@ "crossing/markings_yes", "crossing_raised" ], - "moreFields": [ - "flashing_lights" - ], "geometry": [ "vertex" ], diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json index 7f532cde..151625eb 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/data/presets/highway/crossing/unmarked.json @@ -6,9 +6,6 @@ "crossing/island", "crossing_raised" ], - "moreFields": [ - "flashing_lights" - ], "geometry": [ "vertex" ], diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 84c6aa58..886e1c49 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -2711,6 +2711,7 @@ en: kerb: # kerb=* label: Curb + terms: '[translate with synonyms or related terms for ''Curb'', separated by commas]' kerb/height: # kerb:height=* label: Height From 39b4f96519712579e8a20032460070bfcf82791e Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Wed, 12 Apr 2023 18:15:29 +0200 Subject: [PATCH 2/2] when the kerb tag is used by iteslef, we can't assume it's a barrier as it might also be an incompletely tagged crossing node fixes #858 --- data/presets/barrier/kerb/flush.json | 3 --- data/presets/barrier/kerb/lowered.json | 3 --- data/presets/barrier/kerb/raised.json | 3 --- data/presets/barrier/kerb/rolled.json | 3 --- interim/source_strings.yaml | 8 ++++---- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/data/presets/barrier/kerb/flush.json b/data/presets/barrier/kerb/flush.json index 3f635e72..3844b677 100644 --- a/data/presets/barrier/kerb/flush.json +++ b/data/presets/barrier/kerb/flush.json @@ -9,9 +9,6 @@ "line" ], "tags": { - "kerb": "flush" - }, - "addTags": { "barrier": "kerb", "kerb": "flush" }, diff --git a/data/presets/barrier/kerb/lowered.json b/data/presets/barrier/kerb/lowered.json index c45a46ca..ec3f88cd 100644 --- a/data/presets/barrier/kerb/lowered.json +++ b/data/presets/barrier/kerb/lowered.json @@ -10,9 +10,6 @@ "line" ], "tags": { - "kerb": "lowered" - }, - "addTags": { "barrier": "kerb", "kerb": "lowered" }, diff --git a/data/presets/barrier/kerb/raised.json b/data/presets/barrier/kerb/raised.json index 971965fe..14b06fb4 100644 --- a/data/presets/barrier/kerb/raised.json +++ b/data/presets/barrier/kerb/raised.json @@ -10,9 +10,6 @@ "line" ], "tags": { - "kerb": "raised" - }, - "addTags": { "barrier": "kerb", "kerb": "raised" }, diff --git a/data/presets/barrier/kerb/rolled.json b/data/presets/barrier/kerb/rolled.json index 6982f1fa..6b494915 100644 --- a/data/presets/barrier/kerb/rolled.json +++ b/data/presets/barrier/kerb/rolled.json @@ -10,9 +10,6 @@ "line" ], "tags": { - "kerb": "rolled" - }, - "addTags": { "barrier": "kerb", "kerb": "rolled" }, diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 886e1c49..0c9a2eda 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -7224,22 +7224,22 @@ en: name: Curb terms: barrier/kerb/flush: - # kerb=flush | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + # barrier=kerb + kerb=flush | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Flush Curb # 'terms: even curb,level curb,tactile curb' terms: barrier/kerb/lowered: - # kerb=lowered | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + # barrier=kerb + kerb=lowered | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Lowered Curb # 'terms: curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp' terms: barrier/kerb/raised: - # kerb=raised | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + # barrier=kerb + kerb=raised | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Raised Curb # 'terms: step' terms: barrier/kerb/rolled: - # kerb=rolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). + # barrier=kerb + kerb=rolled | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Rolled Curb # 'terms: gutter' terms: