From ca2b2e5f7a726b44aeb664a3e47172478e5571c4 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 16:26:55 +0200 Subject: [PATCH] crossing: Introduce `@templates/crossing/defaults` This way we have the same fields in all crossing presets: - "crossing" - "tactile_paving" - "crossing/island" This change the order of things slightly for some footway, cycleway crossing where `surface` is now a bit lower, but that should not be a problem. --- .../presets/@templates/crossing/defaults.json | 24 +++++++++++++++++++ data/presets/highway/crossing.json | 4 +--- data/presets/highway/crossing/_marked.json | 4 +--- data/presets/highway/crossing/_zebra.json | 4 +--- .../highway/crossing/traffic_signals.json | 4 +--- .../highway/crossing/uncontrolled.json | 4 +--- data/presets/highway/crossing/unmarked.json | 4 +--- data/presets/highway/cycleway/_crossing.json | 4 +--- .../highway/cycleway/crossing/_marked.json | 4 +--- .../cycleway/crossing/bicycle_foot.json | 4 +--- .../cycleway/crossing/traffic_signals.json | 5 +--- .../cycleway/crossing/uncontrolled.json | 4 +--- .../highway/cycleway/crossing/unmarked.json | 4 +--- data/presets/highway/footway/crossing.json | 4 +--- .../highway/footway/crossing/_marked.json | 4 +--- .../highway/footway/crossing/_zebra.json | 4 +--- .../footway/crossing/traffic_signals.json | 4 +--- .../footway/crossing/uncontrolled.json | 4 +--- .../highway/footway/crossing/unmarked.json | 4 +--- 19 files changed, 42 insertions(+), 55 deletions(-) create mode 100644 data/presets/@templates/crossing/defaults.json diff --git a/data/presets/@templates/crossing/defaults.json b/data/presets/@templates/crossing/defaults.json new file mode 100644 index 00000000..e1701a20 --- /dev/null +++ b/data/presets/@templates/crossing/defaults.json @@ -0,0 +1,24 @@ +{ + "fields": [ + "crossing", + "tactile_paving", + "crossing/island" + ], + "geometry": [ + "point", + "line" + ], + "tags": { + "@template": "crossing/defaults" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index f22e4dfb..83c958ac 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -1,8 +1,6 @@ { "fields": [ - "crossing", - "tactile_paving", - "crossing/island", + "{@templates/crossing/defaults}", "{@templates/crossing/markings}", "crossing_raised" ], diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index c0197027..fea7b491 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -1,9 +1,7 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "crossing", - "tactile_paving", - "crossing/island", + "{@templates/crossing/defaults}", "{@templates/crossing/markings}", "crossing_raised" ], diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json index 53690f05..66a3d12d 100644 --- a/data/presets/highway/crossing/_zebra.json +++ b/data/presets/highway/crossing/_zebra.json @@ -1,9 +1,7 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "crossing", - "tactile_paving", - "crossing/island", + "{@templates/crossing/defaults}", "{@templates/crossing/markings}", "crossing_raised" ], diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index 1a278a84..65330460 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -1,9 +1,7 @@ { "icon": "temaki-railway_signals", "fields": [ - "crossing", - "tactile_paving", - "crossing/island", + "{@templates/crossing/defaults}", "{@templates/crossing/markings}", "crossing_raised", "button_operated", diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index 3a538b03..3a3fe154 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/uncontrolled.json @@ -1,9 +1,7 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "crossing", - "tactile_paving", - "crossing/island", + "{@templates/crossing/defaults}", "{@templates/crossing/markings_yes}", "crossing_raised" ], diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json index 151625eb..2988c0a7 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/data/presets/highway/crossing/unmarked.json @@ -1,9 +1,7 @@ { "icon": "temaki-pedestrian", "fields": [ - "crossing", - "tactile_paving", - "crossing/island", + "{@templates/crossing/defaults}", "crossing_raised" ], "geometry": [ diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json index 55c0cd07..825e9b25 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/_crossing.json @@ -1,10 +1,8 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "{@templates/crossing/markings}", "access" ], diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index 352a0f20..1a1054f7 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -1,10 +1,8 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "{@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 c6ee1fc4..1904f44d 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -11,11 +11,9 @@ "icon": "temaki-ped_cyclist_crosswalk", "fields": [ "oneway", - "crossing", + "{@templates/crossing/defaults}", "surface", "smoothness", - "tactile_paving", - "crossing/island", "{@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 38e3c7cb..a04bfeea 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -2,10 +2,8 @@ "icon": "fas-biking", "fields": [ "oneway", - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "{@templates/crossing/markings}", "crossing_raised", "button_operated", @@ -14,7 +12,6 @@ "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 2501d8fb..ebf26335 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/uncontrolled.json @@ -2,10 +2,8 @@ "icon": "temaki-cyclist_crosswalk", "fields": [ "oneway", - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "{@templates/crossing/markings_yes}", "crossing_raised", "access" diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index 7aabc763..1f98202c 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/unmarked.json @@ -2,10 +2,8 @@ "icon": "fas-biking", "fields": [ "oneway", - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "crossing_raised", "access" ], diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json index f8f2d6d1..1685344e 100644 --- a/data/presets/highway/footway/crossing.json +++ b/data/presets/highway/footway/crossing.json @@ -1,9 +1,7 @@ { "fields": [ - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "{@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 0fad1396..290faf2b 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/data/presets/highway/footway/crossing/_marked.json @@ -1,10 +1,8 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "{@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 502f7d32..5694bbf7 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -1,10 +1,8 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "{@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 bf2a1984..839b9700 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -1,10 +1,8 @@ { "icon": "temaki-railway_signals", "fields": [ - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "{@templates/crossing/markings}", "crossing_raised", "button_operated", diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json index 04b25e34..d10da93c 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/uncontrolled.json @@ -1,10 +1,8 @@ { "icon": "temaki-pedestrian", "fields": [ - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "{@templates/crossing/markings_yes}", "crossing_raised", "access" diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json index c9ca1562..a4af0031 100644 --- a/data/presets/highway/footway/crossing/unmarked.json +++ b/data/presets/highway/footway/crossing/unmarked.json @@ -1,10 +1,8 @@ { "icon": "temaki-pedestrian", "fields": [ - "crossing", + "{@templates/crossing/defaults}", "surface", - "tactile_paving", - "crossing/island", "crossing_raised", "access" ],