From 8d45c78e651c588fab208c391525c49b98e38644 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Wed, 26 Apr 2023 11:32:27 +0200 Subject: [PATCH] create template for crossing:markings fields, and add regional field for DE-AT-CH --- data/fields/crossing/markings-DE-AT-CH.json | 23 ++++++++++++++++++ data/fields/crossing/markings.json | 5 +++- .../crossing/markings_yes-DE-AT-CH.json | 24 +++++++++++++++++++ data/fields/crossing/markings_yes.json | 5 +++- .../presets/@templates/crossing/markings.json | 23 ++++++++++++++++++ .../@templates/crossing/markings_yes.json | 23 ++++++++++++++++++ data/presets/highway/crossing.json | 2 +- data/presets/highway/crossing/_marked.json | 3 +-- data/presets/highway/crossing/_zebra.json | 3 +-- .../highway/crossing/traffic_signals.json | 3 +-- .../highway/crossing/uncontrolled.json | 3 +-- data/presets/highway/cycleway/_crossing.json | 3 +-- .../highway/cycleway/crossing/_marked.json | 3 +-- .../cycleway/crossing/bicycle_foot.json | 3 +-- .../cycleway/crossing/traffic_signals.json | 7 +++--- .../cycleway/crossing/uncontrolled.json | 3 +-- data/presets/highway/footway/_crossing.json | 3 +-- .../highway/footway/crossing/_marked.json | 3 +-- .../highway/footway/crossing/_zebra.json | 3 +-- .../footway/crossing/traffic_signals.json | 3 +-- .../footway/crossing/uncontrolled.json | 3 +-- interim/source_strings.yaml | 8 +++++++ 22 files changed, 127 insertions(+), 32 deletions(-) create mode 100644 data/fields/crossing/markings-DE-AT-CH.json create mode 100644 data/fields/crossing/markings_yes-DE-AT-CH.json create mode 100644 data/presets/@templates/crossing/markings.json create mode 100644 data/presets/@templates/crossing/markings_yes.json diff --git a/data/fields/crossing/markings-DE-AT-CH.json b/data/fields/crossing/markings-DE-AT-CH.json new file mode 100644 index 000000000..5268a8186 --- /dev/null +++ b/data/fields/crossing/markings-DE-AT-CH.json @@ -0,0 +1,23 @@ +{ + "key": "crossing:markings", + "type": "combo", + "label": "{crossing/markings}", + "options": [ + "zebra", + "yes", + "no", + "dots", + "dashes", + "surface" + ], + "autoSuggestions": false, + "iconsCrossReference": "{crossing/markings}", + "stringsCrossReference": "{crossing/markings}", + "locationSet": { + "include": [ + "DE", + "AT", + "CH" + ] + } +} diff --git a/data/fields/crossing/markings.json b/data/fields/crossing/markings.json index d782572ea..0f5b4eed1 100644 --- a/data/fields/crossing/markings.json +++ b/data/fields/crossing/markings.json @@ -37,7 +37,10 @@ }, "locationSet": { "exclude": [ - "BG" + "BG", + "DE", + "AT", + "CH" ] } } diff --git a/data/fields/crossing/markings_yes-DE-AT-CH.json b/data/fields/crossing/markings_yes-DE-AT-CH.json new file mode 100644 index 000000000..eee9c475d --- /dev/null +++ b/data/fields/crossing/markings_yes-DE-AT-CH.json @@ -0,0 +1,24 @@ +{ + "key": "crossing:markings", + "type": "combo", + "label": "{crossing/markings}", + "options": [ + "zebra", + "yes", + "no", + "dots", + "dashes", + "surface" + ], + "autoSuggestions": false, + "iconsCrossReference": "{crossing/markings}", + "stringsCrossReference": "{crossing/markings}", + "locationSet": { + "include": [ + "DE", + "AT", + "CH" + ] + }, + "default": "yes" +} diff --git a/data/fields/crossing/markings_yes.json b/data/fields/crossing/markings_yes.json index c7dac351f..64fd2ad48 100644 --- a/data/fields/crossing/markings_yes.json +++ b/data/fields/crossing/markings_yes.json @@ -7,7 +7,10 @@ "default": "yes", "locationSet": { "exclude": [ - "BG" + "BG", + "DE", + "AT", + "CH" ] } } diff --git a/data/presets/@templates/crossing/markings.json b/data/presets/@templates/crossing/markings.json new file mode 100644 index 000000000..b71b0b19c --- /dev/null +++ b/data/presets/@templates/crossing/markings.json @@ -0,0 +1,23 @@ +{ + "fields": [ + "crossing/markings", + "crossing/markings-BG", + "crossing/markings-DE-AT-CH" + ], + "geometry": [ + "point" + ], + "tags": { + "@template": "crossing/markings" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/@templates/crossing/markings_yes.json b/data/presets/@templates/crossing/markings_yes.json new file mode 100644 index 000000000..a1c7bf096 --- /dev/null +++ b/data/presets/@templates/crossing/markings_yes.json @@ -0,0 +1,23 @@ +{ + "fields": [ + "crossing/markings_yes", + "crossing/markings_yes-BG", + "crossing/markings_yes-DE-AT-CH" + ], + "geometry": [ + "point" + ], + "tags": { + "@template": "crossing/markings_yes" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index dd3a0b769..b6446121a 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -3,7 +3,7 @@ "crossing", "tactile_paving", "crossing/island", - "crossing/markings", + "{@templates/crossing/markings}", "crossing_raised" ], "moreFields": [ diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index a12068e46..cd054db53 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -4,8 +4,7 @@ "crossing", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised" ], "geometry": [ diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json index c69859ed4..53690f057 100644 --- a/data/presets/highway/crossing/_zebra.json +++ b/data/presets/highway/crossing/_zebra.json @@ -4,8 +4,7 @@ "crossing", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised" ], "geometry": [ diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index 7175f2df1..1a278a84b 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -4,8 +4,7 @@ "crossing", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised", "button_operated", "traffic_signals/sound", diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index c31e83b75..3a538b03e 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/uncontrolled.json @@ -4,8 +4,7 @@ "crossing", "tactile_paving", "crossing/island", - "crossing/markings_yes", - "crossing/markings_yes-BG", + "{@templates/crossing/markings_yes}", "crossing_raised" ], "geometry": [ diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json index e3cff20e7..55c0cd072 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/_crossing.json @@ -5,8 +5,7 @@ "surface", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "access" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index 32b76bb4f..352a0f20e 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -5,8 +5,7 @@ "surface", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised", "access" ], diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json index 93b430cf8..6aed22938 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -13,8 +13,7 @@ "smoothness", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised", "access" ], diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index 0859fcc4c..feee3cc88 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -4,16 +4,17 @@ "oneway", "crossing", "surface", - "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised", "button_operated", "traffic_signals/sound", "traffic_signals/vibration", "access" ], + "moreFields": [ + "tactile_paving" + ], "geometry": [ "line" ], diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json index 2751b2816..2501d8fba 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/uncontrolled.json @@ -6,8 +6,7 @@ "surface", "tactile_paving", "crossing/island", - "crossing/markings_yes", - "crossing/markings_yes-BG", + "{@templates/crossing/markings_yes}", "crossing_raised", "access" ], diff --git a/data/presets/highway/footway/_crossing.json b/data/presets/highway/footway/_crossing.json index 45e96be92..fd062699f 100644 --- a/data/presets/highway/footway/_crossing.json +++ b/data/presets/highway/footway/_crossing.json @@ -4,8 +4,7 @@ "surface", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised", "access" ], diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json index a596537dd..0fad13965 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/data/presets/highway/footway/crossing/_marked.json @@ -5,8 +5,7 @@ "surface", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised", "access" ], diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index 1c3ccadfb..502f7d326 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -5,8 +5,7 @@ "surface", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised", "access" ], diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index 26989d7ae..bf2a19843 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -5,8 +5,7 @@ "surface", "tactile_paving", "crossing/island", - "crossing/markings", - "crossing/markings-BG", + "{@templates/crossing/markings}", "crossing_raised", "button_operated", "traffic_signals/sound", diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json index 1619f118a..04b25e34c 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/uncontrolled.json @@ -5,8 +5,7 @@ "surface", "tactile_paving", "crossing/island", - "crossing/markings_yes", - "crossing/markings_yes-BG", + "{@templates/crossing/markings_yes}", "crossing_raised", "access" ], diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index b2352642d..6227ee529 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -1387,10 +1387,14 @@ en: terms: '[translate with synonyms or related terms for ''Crossing Markings'', separated by commas]' crossing/markings-BG: # crossing:markings=* | Local preset for countries "BG" + crossing/markings-DE-AT-CH: + # crossing:markings=* | Local preset for countries "DE", "AT", "CH" crossing/markings_yes: # crossing:markings=* crossing/markings_yes-BG: # crossing:markings=* | Local preset for countries "BG" + crossing/markings_yes-DE-AT-CH: + # crossing:markings=* | Local preset for countries "DE", "AT", "CH" crossing_raised: # traffic_calming=* label: Raised @@ -5542,6 +5546,10 @@ en: presets: '@templates/contact': # '@template=contact | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"' + '@templates/crossing/markings': + # '@template=crossing/markings | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"' + '@templates/crossing/markings_yes': + # '@template=crossing/markings_yes | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"' '@templates/internet_access': # '@template=internet_access | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"' '@templates/poi':