From fa3907b55110c1a2aa48ad7bf42033247adb07ee Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 25 Apr 2024 05:39:41 +0200 Subject: [PATCH] crossing: New approach with `@templates/crossing/bicycle_more`, adding `segregated` The fields `oneway` and `access` are important for `highway=cycleway|path` crossings but not essential. They are more of a advanced user setup which should be visible when prev filled in but only added by users that read more about it before. They are moved to the `moreFields` for that reason. The `segregated` is added here for the same reasons and because of it's importance for highway types that likely have bike traffic. Ping https://github.com/openstreetmap/id-tagging-schema/issues/317 The `surface` and `smoothness` is extracted from the `@template` because it makes more sense to split them up in `fields` and `moreFields`. A templates adds too much abstraction in this case. --- .../crossing/{bicycle_relevance.json => bicycle_more.json} | 5 +++-- data/presets/highway/cycleway/_crossing.json | 6 +++++- data/presets/highway/cycleway/crossing/_marked.json | 6 +++++- data/presets/highway/cycleway/crossing/bicycle_foot.json | 6 +++++- .../presets/highway/cycleway/crossing/traffic_signals.json | 6 ++++-- data/presets/highway/cycleway/crossing/uncontrolled.json | 6 +++++- data/presets/highway/cycleway/crossing/unmarked.json | 6 +++++- data/presets/highway/footway/crossing.json | 3 ++- data/presets/highway/footway/crossing/_marked.json | 3 ++- data/presets/highway/footway/crossing/_zebra.json | 5 ++++- data/presets/highway/footway/crossing/traffic_signals.json | 5 +++-- data/presets/highway/footway/crossing/uncontrolled.json | 3 ++- data/presets/highway/footway/crossing/unmarked.json | 3 ++- data/presets/highway/path/_crossing.json | 7 +++++-- data/presets/highway/path/crossing/_marked.json | 5 +++-- data/presets/highway/path/crossing/_traffic_signals.json | 7 ++++--- data/presets/highway/path/crossing/_uncontrolled.json | 5 +++-- data/presets/highway/path/crossing/_unmarked.json | 5 +++-- 18 files changed, 65 insertions(+), 27 deletions(-) rename data/presets/@templates/crossing/{bicycle_relevance.json => bicycle_more.json} (76%) diff --git a/data/presets/@templates/crossing/bicycle_relevance.json b/data/presets/@templates/crossing/bicycle_more.json similarity index 76% rename from data/presets/@templates/crossing/bicycle_relevance.json rename to data/presets/@templates/crossing/bicycle_more.json index 8e193d4d5..aa9eea938 100644 --- a/data/presets/@templates/crossing/bicycle_relevance.json +++ b/data/presets/@templates/crossing/bicycle_more.json @@ -1,13 +1,14 @@ { "fields": [ "oneway", - "access" + "access", + "segregated" ], "geometry": [ "line" ], "tags": { - "@template": "crossing/bicycle_relevance" + "@template": "crossing/bicycle_more" }, "searchable": false, "locationSet": { diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json index 9c51821c3..0af018bc6 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/_crossing.json @@ -4,7 +4,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index b3076003f..35ec954a1 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -4,7 +4,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json index 0a708e235..e4421eb0a 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -13,7 +13,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index 4a52ea6ef..1989de6ba 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -5,10 +5,12 @@ "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ - "{@templates/crossing/traffic_signal_more}" + "{@templates/crossing/traffic_signal_more}", + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json index ecec949f5..6f1aa18b6 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/uncontrolled.json @@ -4,7 +4,11 @@ "crossing", "{@templates/crossing/defaults}", "{@templates/crossing/markings_yes}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index 1a5edb746..6f7aa7645 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/unmarked.json @@ -3,7 +3,11 @@ "fields": [ "crossing", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json index 758f272d3..b45c2f0d4 100644 --- a/data/presets/highway/footway/crossing.json +++ b/data/presets/highway/footway/crossing.json @@ -3,9 +3,10 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ + "smoothness", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json index e6070d6f9..0c1ccaae6 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/data/presets/highway/footway/crossing/_marked.json @@ -4,9 +4,10 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ + "smoothness", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index 86cf614ad..b475230bf 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -4,7 +4,10 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index 243225791..f543d2045 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -5,10 +5,11 @@ "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ - "{@templates/crossing/traffic_signal_more}" + "{@templates/crossing/traffic_signal_more}", + "smoothness", ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json index 7d5635c91..c38557ae9 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/uncontrolled.json @@ -4,9 +4,10 @@ "crossing", "{@templates/crossing/markings_yes}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ + "smoothness", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json index c641a079a..b7a1a8ee9 100644 --- a/data/presets/highway/footway/crossing/unmarked.json +++ b/data/presets/highway/footway/crossing/unmarked.json @@ -3,9 +3,10 @@ "fields": [ "crossing", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ + "smoothness", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json index 5131c48af..4031ce295 100644 --- a/data/presets/highway/path/_crossing.json +++ b/data/presets/highway/path/_crossing.json @@ -4,8 +4,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}", ], "geometry": [ "line" diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json index c0b9ec949..72372f99c 100644 --- a/data/presets/highway/path/crossing/_marked.json +++ b/data/presets/highway/path/crossing/_marked.json @@ -4,10 +4,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" ], "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json index bba994e5f..06dcac11f 100644 --- a/data/presets/highway/path/crossing/_traffic_signals.json +++ b/data/presets/highway/path/crossing/_traffic_signals.json @@ -5,11 +5,12 @@ "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" ], "moreFields": [ - "{@templates/crossing/traffic_signal_more}" + "{@templates/crossing/traffic_signal_more}", + "smoothness", + "{@templates/crossing/bicycle_more}", ], "geometry": [ "line" diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json index 1618feda9..e8da6fd3c 100644 --- a/data/presets/highway/path/crossing/_uncontrolled.json +++ b/data/presets/highway/path/crossing/_uncontrolled.json @@ -4,10 +4,11 @@ "crossing", "{@templates/crossing/markings_yes}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" ], "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json index 565112a89..88c8477a8 100644 --- a/data/presets/highway/path/crossing/_unmarked.json +++ b/data/presets/highway/path/crossing/_unmarked.json @@ -3,10 +3,11 @@ "fields": [ "crossing", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" ], "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}", "flashing_lights" ], "geometry": [