From 49f782c303b9902bd1ea22d5dc2029aa84f5a6e5 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 26 Apr 2024 11:45:47 +0200 Subject: [PATCH] crossing: Add `lit` to all crossing "way" geometry presets via new `@template/geometry_way_more` The "lit" value was present on some of the presets before and is common to be applied to all kind of ways. --- .../crossing/geometry_way_more.json | 22 +++++++++++++++++++ data/presets/highway/cycleway/_crossing.json | 2 +- .../highway/cycleway/crossing/_marked.json | 2 +- .../cycleway/crossing/bicycle_foot.json | 2 +- .../cycleway/crossing/traffic_signals.json | 2 +- .../cycleway/crossing/uncontrolled.json | 2 +- .../highway/cycleway/crossing/unmarked.json | 2 +- data/presets/highway/footway/crossing.json | 2 +- .../highway/footway/crossing/_marked.json | 2 +- .../highway/footway/crossing/_zebra.json | 2 +- .../footway/crossing/traffic_signals.json | 2 +- .../footway/crossing/uncontrolled.json | 2 +- .../highway/footway/crossing/unmarked.json | 2 +- data/presets/highway/path/_crossing.json | 2 +- .../highway/path/crossing/_marked.json | 2 +- .../path/crossing/_traffic_signals.json | 2 +- .../highway/path/crossing/_uncontrolled.json | 2 +- .../highway/path/crossing/_unmarked.json | 2 +- 18 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 data/presets/@templates/crossing/geometry_way_more.json diff --git a/data/presets/@templates/crossing/geometry_way_more.json b/data/presets/@templates/crossing/geometry_way_more.json new file mode 100644 index 000000000..ccc6845d2 --- /dev/null +++ b/data/presets/@templates/crossing/geometry_way_more.json @@ -0,0 +1,22 @@ +{ + "fields": [ + "smoothness", + "lit" + ], + "geometry": [ + "line" + ], + "tags": { + "@template": "crossing/geometry_way_more" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json index 0af018bc6..a15ee458a 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/_crossing.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index 35ec954a1..0ebea5fef 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json index e4421eb0a..e4a6a6a6b 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -16,7 +16,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index 1989de6ba..f40fd2571 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -9,7 +9,7 @@ ], "moreFields": [ "{@templates/crossing/traffic_signal_more}", - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json index 6f1aa18b6..5a8c70066 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/uncontrolled.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index 6f7aa7645..3d93b8025 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/unmarked.json @@ -6,7 +6,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json index b45c2f0d4..78513071d 100644 --- a/data/presets/highway/footway/crossing.json +++ b/data/presets/highway/footway/crossing.json @@ -6,7 +6,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json index 0c1ccaae6..599ee3314 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/data/presets/highway/footway/crossing/_marked.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index f0f284dfa..7ac1a29df 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index 5e8504ec5..28807d162 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -9,7 +9,7 @@ ], "moreFields": [ "{@templates/crossing/traffic_signal_more}", - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json index c38557ae9..828bb345b 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/uncontrolled.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json index b7a1a8ee9..bf0046273 100644 --- a/data/presets/highway/footway/crossing/unmarked.json +++ b/data/presets/highway/footway/crossing/unmarked.json @@ -6,7 +6,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json index 84573e127..a6e412fb8 100644 --- a/data/presets/highway/path/_crossing.json +++ b/data/presets/highway/path/_crossing.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ], diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json index 72372f99c..cb2d398ed 100644 --- a/data/presets/highway/path/crossing/_marked.json +++ b/data/presets/highway/path/crossing/_marked.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ], diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json index 514db5ee0..4ff6d51fa 100644 --- a/data/presets/highway/path/crossing/_traffic_signals.json +++ b/data/presets/highway/path/crossing/_traffic_signals.json @@ -9,7 +9,7 @@ ], "moreFields": [ "{@templates/crossing/traffic_signal_more}", - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ], diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json index e8da6fd3c..3dc03f42a 100644 --- a/data/presets/highway/path/crossing/_uncontrolled.json +++ b/data/presets/highway/path/crossing/_uncontrolled.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ], diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json index 88c8477a8..f904a086e 100644 --- a/data/presets/highway/path/crossing/_unmarked.json +++ b/data/presets/highway/path/crossing/_unmarked.json @@ -6,7 +6,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ],