From febe27d800e867982f5a14e3cb8e975a5cd9c36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Wed, 22 Jun 2022 14:27:22 +0200 Subject: [PATCH] improve terms of crossing and traffic calming presets/fields (#508) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squashed commit of the following: commit d49ade35743fe583a52f15ddd252787f9602784f Author: Minh Nguyễn Date: Wed Jun 22 01:58:14 2022 -0700 Added table terms to Raised field commit b29faf0575d60193516c3935d6aae53e8972ebfc Author: Minh Nguyễn Date: Wed Jun 22 01:48:00 2022 -0700 Renamed crossing=traffic_signals presets to correct name commit fe3caadc8e19be522dad2fec458b91c44d626fe7 Author: Minh Nguyễn Date: Wed Jun 22 01:37:45 2022 -0700 Removed table-related terms from crossing presets These terms only made sense for the raised crossing presets, which got merged with the unraised crossing presets. --- data/fields/crossing_raised.json | 8 +++++++- data/presets/highway/crossing/marked.json | 6 +----- .../{signals.json => traffic_signals.json} | 0 data/presets/highway/crossing/unmarked.json | 6 +----- data/presets/highway/footway/marked.json | 6 +----- .../{signals.json => traffic_signals.json} | 6 +----- data/presets/highway/footway/unmarked.json | 6 +----- interim/source_strings.yaml | 16 ++++++++-------- 8 files changed, 20 insertions(+), 34 deletions(-) rename data/presets/highway/crossing/{signals.json => traffic_signals.json} (100%) rename data/presets/highway/footway/{signals.json => traffic_signals.json} (90%) diff --git a/data/fields/crossing_raised.json b/data/fields/crossing_raised.json index 3717dafd..b28dd659 100644 --- a/data/fields/crossing_raised.json +++ b/data/fields/crossing_raised.json @@ -13,5 +13,11 @@ "undefined": "No", "table": "Yes" } - } + }, + "terms": [ + "flat top", + "hump", + "speed", + "slow" + ] } diff --git a/data/presets/highway/crossing/marked.json b/data/presets/highway/crossing/marked.json index ebb308dc..3c248b50 100644 --- a/data/presets/highway/crossing/marked.json +++ b/data/presets/highway/crossing/marked.json @@ -23,11 +23,7 @@ "terms": [ "zebra crossing", "marked crossing", - "crosswalk", - "flat top", - "hump", - "speed", - "slow" + "crosswalk" ], "name": "Marked Crosswalk" } diff --git a/data/presets/highway/crossing/signals.json b/data/presets/highway/crossing/traffic_signals.json similarity index 100% rename from data/presets/highway/crossing/signals.json rename to data/presets/highway/crossing/traffic_signals.json diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json index 034f9fca..0640f22f 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/data/presets/highway/crossing/unmarked.json @@ -23,11 +23,7 @@ "terms": [ "unmarked foot path crossing", "unmarked crosswalk", - "unmarked pedestrian crossing", - "flat top", - "hump", - "speed", - "slow" + "unmarked pedestrian crossing" ], "name": "Unmarked Crossing" } diff --git a/data/presets/highway/footway/marked.json b/data/presets/highway/footway/marked.json index daf6e9bb..90fe6960 100644 --- a/data/presets/highway/footway/marked.json +++ b/data/presets/highway/footway/marked.json @@ -28,11 +28,7 @@ "marked crossing", "marked pedestrian crosswalk", "zebra crossing", - "crosswalk", - "flat top", - "hump", - "speed", - "slow" + "crosswalk" ], "name": "Marked Crosswalk" } diff --git a/data/presets/highway/footway/signals.json b/data/presets/highway/footway/traffic_signals.json similarity index 90% rename from data/presets/highway/footway/signals.json rename to data/presets/highway/footway/traffic_signals.json index 5a7d287a..404108f3 100644 --- a/data/presets/highway/footway/signals.json +++ b/data/presets/highway/footway/traffic_signals.json @@ -34,10 +34,6 @@ "pedestrian traffic signals", "pedestrian crossing (lights)", "bicycle crossing (lights)", - "crosswalk (lights)", - "flat top", - "hump", - "speed", - "slow" + "crosswalk (lights)" ] } diff --git a/data/presets/highway/footway/unmarked.json b/data/presets/highway/footway/unmarked.json index dc373b26..99a5bb35 100644 --- a/data/presets/highway/footway/unmarked.json +++ b/data/presets/highway/footway/unmarked.json @@ -26,11 +26,7 @@ "terms": [ "unmarked foot path crossing", "unmarked crosswalk", - "unmarked pedestrian crossing", - "flat top", - "hump", - "speed", - "slow" + "unmarked pedestrian crossing" ], "name": "Unmarked Crossing" } diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index b9fab09e..122ae509 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -6019,12 +6019,12 @@ 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,flat top,hump,speed,slow' + # 'terms: zebra crossing,marked crossing,crosswalk' terms: - highway/crossing/signals: + 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),flat top,hump,speed,slow' + # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)' 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). @@ -6032,7 +6032,7 @@ en: 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,flat top,hump,speed,slow' + # 'terms: unmarked foot path crossing,unmarked crosswalk,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). @@ -6109,22 +6109,22 @@ en: 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,flat top,hump,speed,slow' + # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing,crosswalk' terms: 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: - highway/footway/signals: + 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),flat top,hump,speed,slow' + # 'terms: pedestrian traffic lights,pedestrian traffic signals,pedestrian crossing (lights),bicycle crossing (lights),crosswalk (lights)' terms: 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,flat top,hump,speed,slow' + # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing' terms: 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).