From 02eb4d0235a968645e9f24618606536c2adb55e9 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 16:02:19 +0200 Subject: [PATCH 01/27] crossing/_marked: remove terms Terms are not used for unsearchable preset so we can remove them. --- data/presets/highway/crossing/_marked.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index cd054db5..c0197027 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -23,11 +23,6 @@ "key": "crossing", "value": "marked" }, - "terms": [ - "zebra crossing", - "marked crossing", - "crosswalk" - ], "name": "{highway/crossing/uncontrolled}", "searchable": false } From 41a9443e8461558b85597d59a79cf783ddf23f61 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 16:10:04 +0200 Subject: [PATCH 02/27] cycleway/crossing: add "oneway" field to unmarked in bicycle_foot This streamlines the presets and makes it easer to review and use them. --- data/presets/highway/cycleway/crossing/bicycle_foot.json | 1 + data/presets/highway/cycleway/crossing/unmarked.json | 1 + 2 files changed, 2 insertions(+) diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json index e98be5da..c6ee1fc4 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -10,6 +10,7 @@ }, "icon": "temaki-ped_cyclist_crosswalk", "fields": [ + "oneway", "crossing", "surface", "smoothness", diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index a008c3ee..7aabc763 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/unmarked.json @@ -1,6 +1,7 @@ { "icon": "fas-biking", "fields": [ + "oneway", "crossing", "surface", "tactile_paving", From 89a1671c3fcc7061598438f370fdd66b0220493c Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 16:10:36 +0200 Subject: [PATCH 03/27] cycleway/crossing: add "tactile_paving" to traffic_signal This streamlines the crossings presets --- data/presets/highway/cycleway/crossing/traffic_signals.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index feee3cc8..38e3c7cb 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -4,6 +4,7 @@ "oneway", "crossing", "surface", + "tactile_paving", "crossing/island", "{@templates/crossing/markings}", "crossing_raised", From ca2b2e5f7a726b44aeb664a3e47172478e5571c4 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 16:26:55 +0200 Subject: [PATCH 04/27] 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" ], From e47e4d63259186447e3f0f524d86c7d2b8c1d916 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 16:54:32 +0200 Subject: [PATCH 05/27] crossing: Introduce `@templates/crossing/geometry_line` This streamlines the fields on all line geometry crossings. - "oneway" - "surface" - "smoothness" - "crossing_raised" - "access" Those fields are always the last in the list. For traffic signal those specific fields are put above. Which is also the only change for one vertex preset in this commit, to have the "crossing_raised" come after the traffic signal specific fields and so the order is the same across presets. This will roll out the smoothness field for all crossings; it was previously only present in some. But given the importance of smoothness for accessibility I think that is OK. This commit also moves the surface (and smoothness where present) fields further down the list which reduces the priority a bit. The biggest change in priority is the oneway-field which had the first position before and now is below the defaults- and markings-field. --- .../@templates/crossing/geometry_line.json | 25 +++++++++++++++++++ .../highway/crossing/traffic_signals.json | 4 +-- data/presets/highway/cycleway/_crossing.json | 3 +-- .../highway/cycleway/crossing/_marked.json | 4 +-- .../cycleway/crossing/bicycle_foot.json | 6 +---- .../cycleway/crossing/traffic_signals.json | 5 +--- .../cycleway/crossing/uncontrolled.json | 5 +--- .../highway/cycleway/crossing/unmarked.json | 5 +--- 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 +-- 14 files changed, 39 insertions(+), 42 deletions(-) create mode 100644 data/presets/@templates/crossing/geometry_line.json diff --git a/data/presets/@templates/crossing/geometry_line.json b/data/presets/@templates/crossing/geometry_line.json new file mode 100644 index 00000000..87890b8c --- /dev/null +++ b/data/presets/@templates/crossing/geometry_line.json @@ -0,0 +1,25 @@ +{ + "fields": [ + "oneway", + "surface", + "smoothness", + "crossing_raised", + "access" + ], + "geometry": [ + "point" + ], + "tags": { + "@template": "crossing/geometry_line" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index 65330460..3caaf7d8 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -3,10 +3,10 @@ "fields": [ "{@templates/crossing/defaults}", "{@templates/crossing/markings}", - "crossing_raised", "button_operated", "traffic_signals/sound", - "traffic_signals/vibration" + "traffic_signals/vibration", + "crossing_raised" ], "moreFields": [ "kerb", diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json index 825e9b25..05d4c30f 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/_crossing.json @@ -2,9 +2,8 @@ "icon": "temaki-cyclist_crosswalk", "fields": [ "{@templates/crossing/defaults}", - "surface", "{@templates/crossing/markings}", - "access" + "{@templates/crossing/geometry_line}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index 1a1054f7..53e42d24 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -2,10 +2,8 @@ "icon": "temaki-cyclist_crosswalk", "fields": [ "{@templates/crossing/defaults}", - "surface", "{@templates/crossing/markings}", - "crossing_raised", - "access" + "{@templates/crossing/geometry_line}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json index 1904f44d..15b6ecb3 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -10,13 +10,9 @@ }, "icon": "temaki-ped_cyclist_crosswalk", "fields": [ - "oneway", "{@templates/crossing/defaults}", - "surface", - "smoothness", "{@templates/crossing/markings}", - "crossing_raised", - "access" + "{@templates/crossing/geometry_line}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index a04bfeea..01325c92 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -1,15 +1,12 @@ { "icon": "fas-biking", "fields": [ - "oneway", "{@templates/crossing/defaults}", - "surface", "{@templates/crossing/markings}", - "crossing_raised", "button_operated", "traffic_signals/sound", "traffic_signals/vibration", - "access" + "{@templates/crossing/geometry_line}" ], "moreFields": [ ], diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json index ebf26335..b48e7476 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/uncontrolled.json @@ -1,12 +1,9 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ - "oneway", "{@templates/crossing/defaults}", - "surface", "{@templates/crossing/markings_yes}", - "crossing_raised", - "access" + "{@templates/crossing/geometry_line}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index 1f98202c..fe523975 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/unmarked.json @@ -1,11 +1,8 @@ { "icon": "fas-biking", "fields": [ - "oneway", "{@templates/crossing/defaults}", - "surface", - "crossing_raised", - "access" + "{@templates/crossing/geometry_line}" ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json index 1685344e..9054f4ea 100644 --- a/data/presets/highway/footway/crossing.json +++ b/data/presets/highway/footway/crossing.json @@ -1,10 +1,8 @@ { "fields": [ "{@templates/crossing/defaults}", - "surface", "{@templates/crossing/markings}", - "crossing_raised", - "access" + "{@templates/crossing/geometry_line}" ], "moreFields": [ "flashing_lights" diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json index 290faf2b..6de5d5bb 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/data/presets/highway/footway/crossing/_marked.json @@ -2,10 +2,8 @@ "icon": "temaki-pedestrian_crosswalk", "fields": [ "{@templates/crossing/defaults}", - "surface", "{@templates/crossing/markings}", - "crossing_raised", - "access" + "{@templates/crossing/geometry_line}" ], "moreFields": [ "flashing_lights" diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index 5694bbf7..f8ac8526 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -2,10 +2,8 @@ "icon": "temaki-pedestrian_crosswalk", "fields": [ "{@templates/crossing/defaults}", - "surface", "{@templates/crossing/markings}", - "crossing_raised", - "access" + "{@templates/crossing/geometry_line}" ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index 839b9700..6114cfa6 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -2,13 +2,11 @@ "icon": "temaki-railway_signals", "fields": [ "{@templates/crossing/defaults}", - "surface", "{@templates/crossing/markings}", - "crossing_raised", "button_operated", "traffic_signals/sound", "traffic_signals/vibration", - "access" + "{@templates/crossing/geometry_line}" ], "moreFields": [ "traffic_signals/arrow", diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json index d10da93c..9a5150d6 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/uncontrolled.json @@ -2,10 +2,8 @@ "icon": "temaki-pedestrian", "fields": [ "{@templates/crossing/defaults}", - "surface", "{@templates/crossing/markings_yes}", - "crossing_raised", - "access" + "{@templates/crossing/geometry_line}" ], "moreFields": [ "flashing_lights" diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json index a4af0031..b2e01858 100644 --- a/data/presets/highway/footway/crossing/unmarked.json +++ b/data/presets/highway/footway/crossing/unmarked.json @@ -2,9 +2,7 @@ "icon": "temaki-pedestrian", "fields": [ "{@templates/crossing/defaults}", - "surface", - "crossing_raised", - "access" + "{@templates/crossing/geometry_line}" ], "moreFields": [ "flashing_lights" From 50aeb69b4e33121b94752e9c48194cfec06abf5b Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 17:01:26 +0200 Subject: [PATCH 06/27] crossing: Introduce `@templates/crossing/traffic_signal` This extract the three fields to be reused in all traffic_signals presets. - "button_operated" - "traffic_signals/sound" - "traffic_signals/vibration" Nothing else is changed, this is just an extraction into a template. --- .../@templates/crossing/traffic_signal.json | 24 +++++++++++++++++++ .../highway/crossing/traffic_signals.json | 4 +--- .../cycleway/crossing/traffic_signals.json | 4 +--- .../footway/crossing/traffic_signals.json | 4 +--- 4 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 data/presets/@templates/crossing/traffic_signal.json diff --git a/data/presets/@templates/crossing/traffic_signal.json b/data/presets/@templates/crossing/traffic_signal.json new file mode 100644 index 00000000..9fba2425 --- /dev/null +++ b/data/presets/@templates/crossing/traffic_signal.json @@ -0,0 +1,24 @@ +{ + "fields": [ + "button_operated", + "traffic_signals/sound", + "traffic_signals/vibration" + ], + "geometry": [ + "point", + "line" + ], + "tags": { + "@template": "crossing/traffic_signal" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index 3caaf7d8..af126ca2 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -3,9 +3,7 @@ "fields": [ "{@templates/crossing/defaults}", "{@templates/crossing/markings}", - "button_operated", - "traffic_signals/sound", - "traffic_signals/vibration", + "{@templates/crossing/traffic_signal}", "crossing_raised" ], "moreFields": [ diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index 01325c92..cd7efaf2 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -3,9 +3,7 @@ "fields": [ "{@templates/crossing/defaults}", "{@templates/crossing/markings}", - "button_operated", - "traffic_signals/sound", - "traffic_signals/vibration", + "{@templates/crossing/traffic_signal}", "{@templates/crossing/geometry_line}" ], "moreFields": [ diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index 6114cfa6..c672d2d3 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -3,9 +3,7 @@ "fields": [ "{@templates/crossing/defaults}", "{@templates/crossing/markings}", - "button_operated", - "traffic_signals/sound", - "traffic_signals/vibration", + "{@templates/crossing/traffic_signal}", "{@templates/crossing/geometry_line}" ], "moreFields": [ From c62470065636010b8b631010544f19294d01d547 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 17:14:15 +0200 Subject: [PATCH 07/27] crossing: Introduce `@templates/crossing/traffic_signal_more` This extract the three moreFields to be reused in all traffic_signals presets. - "traffic_signals/arrow" - "traffic_signals/countdown" - "traffic_signals/minimap" For unclear reasons the cycleway/crossing/traffic_signals did not have those more fields which are now added to streamline the presets. --- .../crossing/traffic_signal_more.json | 24 +++++++++++++++++++ .../highway/crossing/traffic_signals.json | 4 +--- .../cycleway/crossing/traffic_signals.json | 1 + .../footway/crossing/traffic_signals.json | 4 +--- 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 data/presets/@templates/crossing/traffic_signal_more.json diff --git a/data/presets/@templates/crossing/traffic_signal_more.json b/data/presets/@templates/crossing/traffic_signal_more.json new file mode 100644 index 00000000..7d4f5ab8 --- /dev/null +++ b/data/presets/@templates/crossing/traffic_signal_more.json @@ -0,0 +1,24 @@ +{ + "moreFields": [ + "traffic_signals/arrow", + "traffic_signals/countdown", + "traffic_signals/minimap" + ], + "geometry": [ + "point", + "line" + ], + "tags": { + "@template": "crossing/traffic_signal_more" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index af126ca2..be8dd91e 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -8,9 +8,7 @@ ], "moreFields": [ "kerb", - "traffic_signals/arrow", - "traffic_signals/countdown", - "traffic_signals/minimap" + "{@templates/crossing/traffic_signal_more}" ], "geometry": [ "vertex" diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index cd7efaf2..577d3dfe 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -7,6 +7,7 @@ "{@templates/crossing/geometry_line}" ], "moreFields": [ + "{@templates/crossing/traffic_signal_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index c672d2d3..ccaa2bb9 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -7,9 +7,7 @@ "{@templates/crossing/geometry_line}" ], "moreFields": [ - "traffic_signals/arrow", - "traffic_signals/countdown", - "traffic_signals/minimap" + "{@templates/crossing/traffic_signal_more}" ], "geometry": [ "line" From 99caf278b028f53c8c651e3c2e11edb0a889d893 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 19:59:45 +0200 Subject: [PATCH 08/27] crossing: remove "oneway" on highway/crossing vertex I added this in https://github.com/openstreetmap/id-tagging-schema/commit/3e5e99ff881d88f4e8761e64356c830875bc8437 an I think that was a mistake so lets remove it again. --- data/presets/highway/crossing.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index 83c958ac..94415e72 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -6,8 +6,7 @@ ], "moreFields": [ "flashing_lights", - "kerb", - "oneway" + "kerb" ], "geometry": [ "vertex" From cb4b64e2c95bd184a8512138906dd6b62e6ac9fa Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 20:03:18 +0200 Subject: [PATCH 09/27] crossing: Add `kerb` to all vertex crossings The convention is, to tag this on the node _and_/_or_ on the separate `barrier=kerb+kerb=*` node when the path is mapped separately. It should be part of all crossing vertex presets. --- data/presets/highway/crossing/_marked.json | 3 +++ data/presets/highway/crossing/_zebra.json | 3 +++ data/presets/highway/crossing/uncontrolled.json | 3 +++ data/presets/highway/crossing/unmarked.json | 3 +++ 4 files changed, 12 insertions(+) diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index fea7b491..c0de124d 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -5,6 +5,9 @@ "{@templates/crossing/markings}", "crossing_raised" ], + "moreFields": [ + "kerb" + ], "geometry": [ "vertex" ], diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json index 66a3d12d..1a4fc281 100644 --- a/data/presets/highway/crossing/_zebra.json +++ b/data/presets/highway/crossing/_zebra.json @@ -5,6 +5,9 @@ "{@templates/crossing/markings}", "crossing_raised" ], + "moreFields": [ + "kerb" + ], "geometry": [ "vertex" ], diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index 3a3fe154..5582d433 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/uncontrolled.json @@ -5,6 +5,9 @@ "{@templates/crossing/markings_yes}", "crossing_raised" ], + "moreFields": [ + "kerb" + ], "geometry": [ "vertex" ], diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json index 2988c0a7..d3eb170b 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/data/presets/highway/crossing/unmarked.json @@ -4,6 +4,9 @@ "{@templates/crossing/defaults}", "crossing_raised" ], + "moreFields": [ + "kerb" + ], "geometry": [ "vertex" ], From 3ab88d0fcd855f2f5b91e5a3c26d60b42a6b0367 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 20:51:38 +0200 Subject: [PATCH 10/27] crossing: Use the same property order for `fields/crossing/markings*` All those fields used a different order of properties, which made it hard to compare them. This commit does not change anything on the fields, it just streamlines the same order of properties across files. --- data/fields/crossing/markings-BG.json | 4 ++-- data/fields/crossing/markings-DE-AT-CH.json | 6 +++--- data/fields/crossing/markings-PL.json | 6 +++--- data/fields/crossing/markings_yes-BG.json | 6 +++--- data/fields/crossing/markings_yes-DE-AT-CH.json | 10 +++++----- data/fields/crossing/markings_yes-PL.json | 10 +++++----- data/fields/crossing/markings_yes.json | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/data/fields/crossing/markings-BG.json b/data/fields/crossing/markings-BG.json index 1188ab3b..5c186e07 100644 --- a/data/fields/crossing/markings-BG.json +++ b/data/fields/crossing/markings-BG.json @@ -2,6 +2,7 @@ "key": "crossing:markings", "type": "combo", "label": "{crossing/markings}", + "autoSuggestions": false, "stringsCrossReference": "{crossing/markings}", "iconsCrossReference": "{crossing/markings}", "options": [ @@ -15,6 +16,5 @@ "include": [ "BG" ] - }, - "autoSuggestions": false + } } diff --git a/data/fields/crossing/markings-DE-AT-CH.json b/data/fields/crossing/markings-DE-AT-CH.json index 5268a818..c758a852 100644 --- a/data/fields/crossing/markings-DE-AT-CH.json +++ b/data/fields/crossing/markings-DE-AT-CH.json @@ -2,6 +2,9 @@ "key": "crossing:markings", "type": "combo", "label": "{crossing/markings}", + "autoSuggestions": false, + "stringsCrossReference": "{crossing/markings}", + "iconsCrossReference": "{crossing/markings}", "options": [ "zebra", "yes", @@ -10,9 +13,6 @@ "dashes", "surface" ], - "autoSuggestions": false, - "iconsCrossReference": "{crossing/markings}", - "stringsCrossReference": "{crossing/markings}", "locationSet": { "include": [ "DE", diff --git a/data/fields/crossing/markings-PL.json b/data/fields/crossing/markings-PL.json index c33df49f..edc86d25 100644 --- a/data/fields/crossing/markings-PL.json +++ b/data/fields/crossing/markings-PL.json @@ -2,6 +2,9 @@ "key": "crossing:markings", "type": "combo", "label": "{crossing/markings}", + "autoSuggestions": false, + "stringsCrossReference": "{crossing/markings}", + "iconsCrossReference": "{crossing/markings}", "options": [ "zebra", "dots", @@ -9,9 +12,6 @@ "yes", "no" ], - "autoSuggestions": false, - "iconsCrossReference": "{crossing/markings}", - "stringsCrossReference": "{crossing/markings}", "locationSet": { "include": [ "PL" diff --git a/data/fields/crossing/markings_yes-BG.json b/data/fields/crossing/markings_yes-BG.json index 8b81bb2c..9155115d 100644 --- a/data/fields/crossing/markings_yes-BG.json +++ b/data/fields/crossing/markings_yes-BG.json @@ -2,9 +2,10 @@ "key": "crossing:markings", "type": "combo", "label": "{crossing/markings}", + "autoSuggestions": false, + "default": "yes", "stringsCrossReference": "{crossing/markings}", "iconsCrossReference": "{crossing/markings}", - "default": "yes", "options": [ "zebra", "no", @@ -16,6 +17,5 @@ "include": [ "BG" ] - }, - "autoSuggestions": false + } } diff --git a/data/fields/crossing/markings_yes-DE-AT-CH.json b/data/fields/crossing/markings_yes-DE-AT-CH.json index eee9c475..04524b36 100644 --- a/data/fields/crossing/markings_yes-DE-AT-CH.json +++ b/data/fields/crossing/markings_yes-DE-AT-CH.json @@ -2,6 +2,10 @@ "key": "crossing:markings", "type": "combo", "label": "{crossing/markings}", + "autoSuggestions": false, + "default": "yes", + "stringsCrossReference": "{crossing/markings}", + "iconsCrossReference": "{crossing/markings}", "options": [ "zebra", "yes", @@ -10,15 +14,11 @@ "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-PL.json b/data/fields/crossing/markings_yes-PL.json index 71358b53..c10103b0 100644 --- a/data/fields/crossing/markings_yes-PL.json +++ b/data/fields/crossing/markings_yes-PL.json @@ -2,6 +2,10 @@ "key": "crossing:markings", "type": "combo", "label": "{crossing/markings}", + "autoSuggestions": false, + "default": "yes", + "stringsCrossReference": "{crossing/markings}", + "iconsCrossReference": "{crossing/markings}", "options": [ "zebra", "dots", @@ -9,13 +13,9 @@ "yes", "no" ], - "autoSuggestions": false, - "iconsCrossReference": "{crossing/markings}", - "stringsCrossReference": "{crossing/markings}", "locationSet": { "include": [ "PL" ] - }, - "default": "yes" + } } diff --git a/data/fields/crossing/markings_yes.json b/data/fields/crossing/markings_yes.json index c088572f..c0203f6a 100644 --- a/data/fields/crossing/markings_yes.json +++ b/data/fields/crossing/markings_yes.json @@ -2,9 +2,9 @@ "key": "crossing:markings", "type": "combo", "label": "{crossing/markings}", + "default": "yes", "stringsCrossReference": "{crossing/markings}", "iconsCrossReference": "{crossing/markings}", - "default": "yes", "locationSet": { "exclude": [ "BG", From cd56a0db324f57e1c3acf4d435b128cc4fb3df39 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 20:57:58 +0200 Subject: [PATCH 11/27] crossing: Move the `@templates/crossing/markings` to first field position Using the preset I find the markings field to be the most important to change. The `@templates/crossing/defaults` is less important for all situation except for `data/presets/highway/crossing.json`. The main reasons for this is, that only on the base `highway/crossing` the field `crossing` is actually visible. For the more precise presets this field is hidden by some automatic part of the system. --- data/presets/highway/crossing/_marked.json | 2 +- data/presets/highway/crossing/_zebra.json | 2 +- data/presets/highway/crossing/traffic_signals.json | 2 +- data/presets/highway/cycleway/_crossing.json | 2 +- data/presets/highway/cycleway/crossing/_marked.json | 2 +- data/presets/highway/cycleway/crossing/bicycle_foot.json | 2 +- data/presets/highway/cycleway/crossing/traffic_signals.json | 2 +- data/presets/highway/footway/crossing.json | 2 +- data/presets/highway/footway/crossing/_marked.json | 2 +- data/presets/highway/footway/crossing/_zebra.json | 2 +- data/presets/highway/footway/crossing/traffic_signals.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index c0de124d..3452a16b 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -1,8 +1,8 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "crossing_raised" ], "moreFields": [ diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json index 1a4fc281..fcec2f9b 100644 --- a/data/presets/highway/crossing/_zebra.json +++ b/data/presets/highway/crossing/_zebra.json @@ -1,8 +1,8 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "crossing_raised" ], "moreFields": [ diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index be8dd91e..0f7f8ace 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -1,8 +1,8 @@ { "icon": "temaki-railway_signals", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "{@templates/crossing/traffic_signal}", "crossing_raised" ], diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json index 05d4c30f..2e394c85 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/_crossing.json @@ -1,8 +1,8 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "{@templates/crossing/geometry_line}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index 53e42d24..41f43fe8 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -1,8 +1,8 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "{@templates/crossing/geometry_line}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json index 15b6ecb3..e774e60b 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -10,8 +10,8 @@ }, "icon": "temaki-ped_cyclist_crosswalk", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "{@templates/crossing/geometry_line}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index 577d3dfe..b0b3e9ff 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -1,8 +1,8 @@ { "icon": "fas-biking", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "{@templates/crossing/traffic_signal}", "{@templates/crossing/geometry_line}" ], diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json index 9054f4ea..5d82b511 100644 --- a/data/presets/highway/footway/crossing.json +++ b/data/presets/highway/footway/crossing.json @@ -1,7 +1,7 @@ { "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "{@templates/crossing/geometry_line}" ], "moreFields": [ diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json index 6de5d5bb..5312133e 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/data/presets/highway/footway/crossing/_marked.json @@ -1,8 +1,8 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "{@templates/crossing/geometry_line}" ], "moreFields": [ diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index f8ac8526..9e121bb0 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -1,8 +1,8 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "{@templates/crossing/geometry_line}" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index ccaa2bb9..32d9e880 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -1,8 +1,8 @@ { "icon": "temaki-railway_signals", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "{@templates/crossing/traffic_signal}", "{@templates/crossing/geometry_line}" ], From 30a8be932d0a233e2c61f7511bff1c9f1571d9c8 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 17:07:16 +0200 Subject: [PATCH 12/27] crossing: Introduce `highway=path+path=crossing` fields All fields are unsearchable (for now) so we can learn how to name properly. The names are adapted from `presets/highway/cycleway/crossing/bicycle_foot.json`. The terms are removed because the presets are unsearchable. --- data/presets/highway/path/_crossing.json | 24 ++++++++++++++ .../highway/path/crossing/_marked.json | 31 +++++++++++++++++++ .../path/crossing/_traffic_signals.json | 26 ++++++++++++++++ .../highway/path/crossing/_uncontrolled.json | 25 +++++++++++++++ .../highway/path/crossing/_unmarked.json | 30 ++++++++++++++++++ 5 files changed, 136 insertions(+) create mode 100644 data/presets/highway/path/_crossing.json create mode 100644 data/presets/highway/path/crossing/_marked.json create mode 100644 data/presets/highway/path/crossing/_traffic_signals.json create mode 100644 data/presets/highway/path/crossing/_uncontrolled.json create mode 100644 data/presets/highway/path/crossing/_unmarked.json diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json new file mode 100644 index 00000000..d8997267 --- /dev/null +++ b/data/presets/highway/path/_crossing.json @@ -0,0 +1,24 @@ +{ + "icon": "temaki-cyclist_crosswalk", + "fields": [ + "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", + "{@templates/crossing/geometry_line}" + ], + "geometry": [ + "line" + ], + "tags": { + "path": "crossing" + }, + "addTags": { + "highway": "path", + "path": "crossing" + }, + "reference": { + "key": "path", + "value": "crossing" + }, + "searchable": false, + "name": "Cycle & Foot Crossing" +} diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json new file mode 100644 index 00000000..4a029c65 --- /dev/null +++ b/data/presets/highway/path/crossing/_marked.json @@ -0,0 +1,31 @@ +{ + "icon": "temaki-pedestrian_crosswalk", + "fields": [ + "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", + "{@templates/crossing/geometry_line}" + ], + "moreFields": [ + "flashing_lights" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "path", + "path": "crossing", + "crossing": "marked" + }, + "addTags": { + "highway": "path", + "path": "crossing", + "crossing": "marked", + "crossing:markings": "yes" + }, + "reference": { + "key": "crossing", + "value": "marked" + }, + "name": "{highway/path/crossing/uncontrolled}", + "searchable": false +} diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json new file mode 100644 index 00000000..73c8fed6 --- /dev/null +++ b/data/presets/highway/path/crossing/_traffic_signals.json @@ -0,0 +1,26 @@ +{ + "icon": "temaki-railway_signals", + "fields": [ + "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", + "{@templates/crossing/traffic_signal}", + "{@templates/crossing/geometry_line}" + ], + "moreFields": [ + "{@templates/crossing/traffic_signal_more}" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "path", + "path": "crossing", + "crossing": "traffic_signals" + }, + "reference": { + "key": "crossing", + "value": "traffic_signals" + }, + "name": "Crossing Cycle & Foot With Pedestrian Signals", + "searchable": false +} diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json new file mode 100644 index 00000000..69bd33f5 --- /dev/null +++ b/data/presets/highway/path/crossing/_uncontrolled.json @@ -0,0 +1,25 @@ +{ + "icon": "temaki-pedestrian", + "fields": [ + "{@templates/crossing/defaults}", + "{@templates/crossing/markings_yes}", + "{@templates/crossing/geometry_line}" + ], + "moreFields": [ + "flashing_lights" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "path", + "path": "crossing", + "crossing": "uncontrolled" + }, + "reference": { + "key": "crossing", + "value": "uncontrolled" + }, + "name": "Marked Cycle & Foot Crossing", + "searchable": false +} diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json new file mode 100644 index 00000000..516d1ee6 --- /dev/null +++ b/data/presets/highway/path/crossing/_unmarked.json @@ -0,0 +1,30 @@ +{ + "icon": "temaki-pedestrian", + "fields": [ + "{@templates/crossing/defaults}", + "{@templates/crossing/geometry_line}" + ], + "moreFields": [ + "flashing_lights" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "path", + "path": "crossing", + "crossing": "unmarked" + }, + "addTags": { + "highway": "path", + "path": "crossing", + "crossing": "unmarked", + "crossing:markings": "no" + }, + "reference": { + "key": "crossing", + "value": "unmarked" + }, + "name": "Unmarked Cycle & Foot Crossing", + "searchable": false +} From 75d756f2bc74b171857a41b3e5ddd8746e888bbb Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 21:22:26 +0200 Subject: [PATCH 13/27] crossing: New approach with `@templates/crossing/bicycle_relevance` and `@templates/crossing/defaults` The field "crossing" is removed from the `/defaults` fields. - it is only relevant for the geometry line because it is hidden on geometry vertex. - but on geometry line, we want it to be on the first position of fields - the `/defaults` fields however should be positioned below the `markings` which are more relevant for specifying the kind of crossing - the `/defaults` fields now includes `crossing_raised` which was removed from the previous and discontinued `/geomery_line` fields template. The new `@templates/crossing/bicycle_relevance` - is used on all highways that have bicycle relevance which are `highway=path|cycleway` and not on `highway=footway` For all traffic_signal presets, the order of fields is different to give the `/traffic_signal` more prominence. --- ...metry_line.json => bicycle_relevance.json} | 7 ++---- .../presets/@templates/crossing/defaults.json | 4 ++-- .../@templates/crossing/surfacequality.json | 22 +++++++++++++++++++ data/presets/highway/crossing.json | 3 +-- data/presets/highway/crossing/_marked.json | 1 - data/presets/highway/crossing/_zebra.json | 1 - .../highway/crossing/traffic_signals.json | 3 +-- .../highway/crossing/uncontrolled.json | 3 +-- data/presets/highway/crossing/unmarked.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 | 5 +++-- .../cycleway/crossing/uncontrolled.json | 3 ++- .../highway/cycleway/crossing/unmarked.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 | 5 +++-- .../footway/crossing/uncontrolled.json | 5 +++-- .../highway/footway/crossing/unmarked.json | 3 ++- data/presets/highway/path/_crossing.json | 4 +++- .../highway/path/crossing/_marked.json | 4 +++- .../path/crossing/_traffic_signals.json | 6 +++-- .../highway/path/crossing/_uncontrolled.json | 6 +++-- .../highway/path/crossing/_unmarked.json | 4 +++- 26 files changed, 74 insertions(+), 39 deletions(-) rename data/presets/@templates/crossing/{geometry_line.json => bicycle_relevance.json} (68%) create mode 100644 data/presets/@templates/crossing/surfacequality.json diff --git a/data/presets/@templates/crossing/geometry_line.json b/data/presets/@templates/crossing/bicycle_relevance.json similarity index 68% rename from data/presets/@templates/crossing/geometry_line.json rename to data/presets/@templates/crossing/bicycle_relevance.json index 87890b8c..8e193d4d 100644 --- a/data/presets/@templates/crossing/geometry_line.json +++ b/data/presets/@templates/crossing/bicycle_relevance.json @@ -1,16 +1,13 @@ { "fields": [ "oneway", - "surface", - "smoothness", - "crossing_raised", "access" ], "geometry": [ - "point" + "line" ], "tags": { - "@template": "crossing/geometry_line" + "@template": "crossing/bicycle_relevance" }, "searchable": false, "locationSet": { diff --git a/data/presets/@templates/crossing/defaults.json b/data/presets/@templates/crossing/defaults.json index e1701a20..64c4a2e1 100644 --- a/data/presets/@templates/crossing/defaults.json +++ b/data/presets/@templates/crossing/defaults.json @@ -1,8 +1,8 @@ { "fields": [ - "crossing", + "crossing/island", "tactile_paving", - "crossing/island" + "crossing_raised" ], "geometry": [ "point", diff --git a/data/presets/@templates/crossing/surfacequality.json b/data/presets/@templates/crossing/surfacequality.json new file mode 100644 index 00000000..ab10d7cf --- /dev/null +++ b/data/presets/@templates/crossing/surfacequality.json @@ -0,0 +1,22 @@ +{ + "fields": [ + "surface", + "smoothness" + ], + "geometry": [ + "line" + ], + "tags": { + "@template": "crossing/surfacequality" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index 94415e72..b2b99ea5 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -1,8 +1,7 @@ { "fields": [ "{@templates/crossing/defaults}", - "{@templates/crossing/markings}", - "crossing_raised" + "{@templates/crossing/markings}" ], "moreFields": [ "flashing_lights", diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index 3452a16b..d75d0263 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -3,7 +3,6 @@ "fields": [ "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "crossing_raised" ], "moreFields": [ "kerb" diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json index fcec2f9b..800ed2c8 100644 --- a/data/presets/highway/crossing/_zebra.json +++ b/data/presets/highway/crossing/_zebra.json @@ -3,7 +3,6 @@ "fields": [ "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "crossing_raised" ], "moreFields": [ "kerb" diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index 0f7f8ace..c50f6c33 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -1,10 +1,9 @@ { "icon": "temaki-railway_signals", "fields": [ + "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/traffic_signal}", - "crossing_raised" ], "moreFields": [ "kerb", diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index 5582d433..e350fe1f 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/uncontrolled.json @@ -1,9 +1,8 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ - "{@templates/crossing/defaults}", "{@templates/crossing/markings_yes}", - "crossing_raised" + "{@templates/crossing/defaults}" ], "moreFields": [ "kerb" diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json index d3eb170b..65410c6b 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/data/presets/highway/crossing/unmarked.json @@ -1,8 +1,7 @@ { "icon": "temaki-pedestrian", "fields": [ - "{@templates/crossing/defaults}", - "crossing_raised" + "{@templates/crossing/defaults}" ], "moreFields": [ "kerb" diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/_crossing.json index 2e394c85..9c51821c 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/_crossing.json @@ -1,9 +1,10 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index 41f43fe8..b3076003 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -1,9 +1,10 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json index e774e60b..0a708e23 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -10,9 +10,10 @@ }, "icon": "temaki-ped_cyclist_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index b0b3e9ff..4a52ea6e 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -1,10 +1,11 @@ { "icon": "fas-biking", "fields": [ + "crossing", + "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/traffic_signal}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "moreFields": [ "{@templates/crossing/traffic_signal_more}" diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json index b48e7476..ecec949f 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/uncontrolled.json @@ -1,9 +1,10 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ + "crossing", "{@templates/crossing/defaults}", "{@templates/crossing/markings_yes}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index fe523975..1a5edb74 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/unmarked.json @@ -1,8 +1,9 @@ { "icon": "fas-biking", "fields": [ + "crossing", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json index 5d82b511..758f272d 100644 --- a/data/presets/highway/footway/crossing.json +++ b/data/presets/highway/footway/crossing.json @@ -1,8 +1,9 @@ { "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "moreFields": [ "flashing_lights" diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json index 5312133e..e6070d6f 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/data/presets/highway/footway/crossing/_marked.json @@ -1,9 +1,10 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "moreFields": [ "flashing_lights" diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index 9e121bb0..86cf614a 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -1,9 +1,10 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index 32d9e880..24322579 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -1,10 +1,11 @@ { "icon": "temaki-railway_signals", "fields": [ + "crossing", + "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/traffic_signal}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "moreFields": [ "{@templates/crossing/traffic_signal_more}" diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json index 9a5150d6..7d5635c9 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/uncontrolled.json @@ -1,9 +1,10 @@ { "icon": "temaki-pedestrian", "fields": [ - "{@templates/crossing/defaults}", + "crossing", "{@templates/crossing/markings_yes}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/defaults}", + "{@templates/crossing/surfacequality}" ], "moreFields": [ "flashing_lights" diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json index b2e01858..c641a079 100644 --- a/data/presets/highway/footway/crossing/unmarked.json +++ b/data/presets/highway/footway/crossing/unmarked.json @@ -1,8 +1,9 @@ { "icon": "temaki-pedestrian", "fields": [ + "crossing", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}" ], "moreFields": [ "flashing_lights" diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json index d8997267..62228096 100644 --- a/data/presets/highway/path/_crossing.json +++ b/data/presets/highway/path/_crossing.json @@ -1,9 +1,11 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}", + "{@templates/crossing/bicycle_relevance}" ], "geometry": [ "line" diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json index 4a029c65..c0b9ec94 100644 --- a/data/presets/highway/path/crossing/_marked.json +++ b/data/presets/highway/path/crossing/_marked.json @@ -1,9 +1,11 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}", + "{@templates/crossing/bicycle_relevance}" ], "moreFields": [ "flashing_lights" diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json index 73c8fed6..bba994e5 100644 --- a/data/presets/highway/path/crossing/_traffic_signals.json +++ b/data/presets/highway/path/crossing/_traffic_signals.json @@ -1,10 +1,12 @@ { "icon": "temaki-railway_signals", "fields": [ + "crossing", + "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/traffic_signal}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}", + "{@templates/crossing/bicycle_relevance}" ], "moreFields": [ "{@templates/crossing/traffic_signal_more}" diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json index 69bd33f5..1618feda 100644 --- a/data/presets/highway/path/crossing/_uncontrolled.json +++ b/data/presets/highway/path/crossing/_uncontrolled.json @@ -1,9 +1,11 @@ { "icon": "temaki-pedestrian", "fields": [ - "{@templates/crossing/defaults}", + "crossing", "{@templates/crossing/markings_yes}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/defaults}", + "{@templates/crossing/surfacequality}", + "{@templates/crossing/bicycle_relevance}" ], "moreFields": [ "flashing_lights" diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json index 516d1ee6..565112a8 100644 --- a/data/presets/highway/path/crossing/_unmarked.json +++ b/data/presets/highway/path/crossing/_unmarked.json @@ -1,8 +1,10 @@ { "icon": "temaki-pedestrian", "fields": [ + "crossing", "{@templates/crossing/defaults}", - "{@templates/crossing/geometry_line}" + "{@templates/crossing/surfacequality}", + "{@templates/crossing/bicycle_relevance}" ], "moreFields": [ "flashing_lights" From 8ca0db555c47b98648e523397d02a205ab09a653 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 25 Apr 2024 05:00:25 +0200 Subject: [PATCH 14/27] crossing: Fix marking* templates by allowing `line` geometries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The markings templates are not touched by this PR and it does seem to work without this. However, the fields are used on line and point geometries so either the `geometry` field is ignored during build or something else is happening… --- data/presets/@templates/crossing/markings.json | 3 ++- data/presets/@templates/crossing/markings_yes.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/presets/@templates/crossing/markings.json b/data/presets/@templates/crossing/markings.json index 7f988d5b..8a838aef 100644 --- a/data/presets/@templates/crossing/markings.json +++ b/data/presets/@templates/crossing/markings.json @@ -6,7 +6,8 @@ "crossing/markings-PL" ], "geometry": [ - "point" + "point", + "line" ], "tags": { "@template": "crossing/markings" diff --git a/data/presets/@templates/crossing/markings_yes.json b/data/presets/@templates/crossing/markings_yes.json index f0ac114f..4fd724fd 100644 --- a/data/presets/@templates/crossing/markings_yes.json +++ b/data/presets/@templates/crossing/markings_yes.json @@ -6,7 +6,8 @@ "crossing/markings_yes-PL" ], "geometry": [ - "point" + "point", + "line" ], "tags": { "@template": "crossing/markings_yes" From 46ac97189c9f431439c11a73646d2f1f0ead5101 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 25 Apr 2024 05:39:41 +0200 Subject: [PATCH 15/27] 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} | 7 ++++--- 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, 66 insertions(+), 28 deletions(-) rename data/presets/@templates/crossing/{bicycle_relevance.json => bicycle_more.json} (71%) diff --git a/data/presets/@templates/crossing/bicycle_relevance.json b/data/presets/@templates/crossing/bicycle_more.json similarity index 71% rename from data/presets/@templates/crossing/bicycle_relevance.json rename to data/presets/@templates/crossing/bicycle_more.json index 8e193d4d..9de7a5ba 100644 --- a/data/presets/@templates/crossing/bicycle_relevance.json +++ b/data/presets/@templates/crossing/bicycle_more.json @@ -1,13 +1,14 @@ { - "fields": [ + "moreFields": [ "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 9c51821c..0af018bc 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 b3076003..35ec954a 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 0a708e23..e4421eb0 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 4a52ea6e..1989de6b 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 ecec949f..6f1aa18b 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 1a5edb74..6f7aa764 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 758f272d..b45c2f0d 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 e6070d6f..0c1ccaae 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 86cf614a..b475230b 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 24322579..f543d204 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 7d5635c9..c38557ae 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 c641a079..b7a1a8ee 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 62228096..4b1808c4 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 c0b9ec94..72372f99 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 bba994e5..06dcac11 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 1618feda..e8da6fd3 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 565112a8..88c8477a 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": [ From 28638cf6c8a5eaa0918457e38daa35b0c5bda0f6 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 25 Apr 2024 05:42:16 +0200 Subject: [PATCH 16/27] crossing: Apply `flashing_light` to all `footway=crossing` and crossing notes The field `flashing_light` was used on some of those presets. It is now more systematic. I also kept them on the `traffic_signals` presets because those can have additional `flashing_lights` as well. --- data/presets/highway/crossing.json | 4 ++-- data/presets/highway/crossing/_marked.json | 3 ++- data/presets/highway/crossing/_zebra.json | 3 ++- data/presets/highway/crossing/traffic_signals.json | 3 ++- data/presets/highway/crossing/uncontrolled.json | 3 ++- data/presets/highway/crossing/unmarked.json | 3 ++- data/presets/highway/footway/crossing/_zebra.json | 1 + data/presets/highway/footway/crossing/traffic_signals.json | 1 + data/presets/highway/path/_crossing.json | 1 + data/presets/highway/path/crossing/_traffic_signals.json | 1 + 10 files changed, 16 insertions(+), 7 deletions(-) diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index b2b99ea5..468e3e15 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -4,8 +4,8 @@ "{@templates/crossing/markings}" ], "moreFields": [ - "flashing_lights", - "kerb" + "kerb", + "flashing_lights" ], "geometry": [ "vertex" diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index d75d0263..33d46e6d 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -5,7 +5,8 @@ "{@templates/crossing/defaults}", ], "moreFields": [ - "kerb" + "kerb", + "flashing_lights" ], "geometry": [ "vertex" diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json index 800ed2c8..09659f3f 100644 --- a/data/presets/highway/crossing/_zebra.json +++ b/data/presets/highway/crossing/_zebra.json @@ -5,7 +5,8 @@ "{@templates/crossing/defaults}", ], "moreFields": [ - "kerb" + "kerb", + "flashing_lights" ], "geometry": [ "vertex" diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index c50f6c33..5ee9ab22 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -6,8 +6,9 @@ "{@templates/crossing/defaults}", ], "moreFields": [ + "{@templates/crossing/traffic_signal_more}", "kerb", - "{@templates/crossing/traffic_signal_more}" + "flashing_lights" ], "geometry": [ "vertex" diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index e350fe1f..480dc9d4 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/uncontrolled.json @@ -5,7 +5,8 @@ "{@templates/crossing/defaults}" ], "moreFields": [ - "kerb" + "kerb", + "flashing_lights" ], "geometry": [ "vertex" diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json index 65410c6b..dd7dc751 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/data/presets/highway/crossing/unmarked.json @@ -4,7 +4,8 @@ "{@templates/crossing/defaults}" ], "moreFields": [ - "kerb" + "kerb", + "flashing_lights" ], "geometry": [ "vertex" diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index b475230b..f0f284df 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -8,6 +8,7 @@ ], "moreFields": [ "smoothness", + "flashing_lights" ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index f543d204..5e8504ec 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -10,6 +10,7 @@ "moreFields": [ "{@templates/crossing/traffic_signal_more}", "smoothness", + "flashing_lights" ], "geometry": [ "line" diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json index 4b1808c4..84573e12 100644 --- a/data/presets/highway/path/_crossing.json +++ b/data/presets/highway/path/_crossing.json @@ -9,6 +9,7 @@ "moreFields": [ "smoothness", "{@templates/crossing/bicycle_more}", + "flashing_lights" ], "geometry": [ "line" diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json index 06dcac11..514db5ee 100644 --- a/data/presets/highway/path/crossing/_traffic_signals.json +++ b/data/presets/highway/path/crossing/_traffic_signals.json @@ -11,6 +11,7 @@ "{@templates/crossing/traffic_signal_more}", "smoothness", "{@templates/crossing/bicycle_more}", + "flashing_lights" ], "geometry": [ "line" From 118ae02ebe087867b910abcdbd971dc2f8ee0f2a Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 25 Apr 2024 05:43:59 +0200 Subject: [PATCH 17/27] crossing: Extract `tactile_paving` from shared `@template` to node crossings The common practice is to tag this in the `highway=crossing` nodes and on separate `barrier=kerb` nodes but not on the crossing ways. Same as the `kerb` field. --- data/presets/@templates/crossing/defaults.json | 1 - data/presets/highway/crossing.json | 3 ++- data/presets/highway/crossing/_marked.json | 1 + data/presets/highway/crossing/_zebra.json | 1 + data/presets/highway/crossing/traffic_signals.json | 1 + data/presets/highway/crossing/uncontrolled.json | 3 ++- data/presets/highway/crossing/unmarked.json | 3 ++- 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/data/presets/@templates/crossing/defaults.json b/data/presets/@templates/crossing/defaults.json index 64c4a2e1..61bd6fc2 100644 --- a/data/presets/@templates/crossing/defaults.json +++ b/data/presets/@templates/crossing/defaults.json @@ -1,7 +1,6 @@ { "fields": [ "crossing/island", - "tactile_paving", "crossing_raised" ], "geometry": [ diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index 468e3e15..13fac6cc 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -1,7 +1,8 @@ { "fields": [ "{@templates/crossing/defaults}", - "{@templates/crossing/markings}" + "{@templates/crossing/markings}", + "tactile_paving" ], "moreFields": [ "kerb", diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index 33d46e6d..946937ae 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -3,6 +3,7 @@ "fields": [ "{@templates/crossing/markings}", "{@templates/crossing/defaults}", + "tactile_paving" ], "moreFields": [ "kerb", diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json index 09659f3f..afe8422f 100644 --- a/data/presets/highway/crossing/_zebra.json +++ b/data/presets/highway/crossing/_zebra.json @@ -3,6 +3,7 @@ "fields": [ "{@templates/crossing/markings}", "{@templates/crossing/defaults}", + "tactile_paving" ], "moreFields": [ "kerb", diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index 5ee9ab22..7755a95e 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -4,6 +4,7 @@ "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", + "tactile_paving" ], "moreFields": [ "{@templates/crossing/traffic_signal_more}", diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index 480dc9d4..96473df9 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/uncontrolled.json @@ -2,7 +2,8 @@ "icon": "temaki-pedestrian_crosswalk", "fields": [ "{@templates/crossing/markings_yes}", - "{@templates/crossing/defaults}" + "{@templates/crossing/defaults}", + "tactile_paving" ], "moreFields": [ "kerb", diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json index dd7dc751..15676149 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/data/presets/highway/crossing/unmarked.json @@ -1,7 +1,8 @@ { "icon": "temaki-pedestrian", "fields": [ - "{@templates/crossing/defaults}" + "{@templates/crossing/defaults}", + "tactile_paving" ], "moreFields": [ "kerb", From 2cec1313d725834c2cb99681ab5e87442d321ad0 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 25 Apr 2024 04:36:01 +0200 Subject: [PATCH 18/27] crossing: Add readme for crossing presets and fields --- data/presets/highway/crossing/README.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 data/presets/highway/crossing/README.md diff --git a/data/presets/highway/crossing/README.md b/data/presets/highway/crossing/README.md new file mode 100644 index 00000000..565e5b80 --- /dev/null +++ b/data/presets/highway/crossing/README.md @@ -0,0 +1,25 @@ +# About the crossing presets + +## General + +These presets use fields `@templates` to make sure all have a similar structure. +Some presets like `traffic_signals` have additinal fields and use a different field order. +Try to keep the file structure very similar so they can be easily compared. + +## nodes `highway=crossing + crossing=*` + +Crossing nodes are handel by `highway/crossing.json` + `highway/crossing/*.json` (as geometry type `vertex`). + +Crossing nodes and crossing ways have a big overlap. +However, there are a few tags that should _only_ be expected on the crossing node. When crossing ways are present, this also means there are separate ways attached with additional nodes that hald the + +There are places in OSM that follow a different tagging style where only crossing ways are used (without the vertex nodes). Those regions might have other conventions on where to place + +## ways `highway=footway|cycleway|path + *=crossing + crossing=*` + +Crossing way presets are duplicated per highway class: +- `/highway/footway/crossing.json` + `/highway/footway/crossing/*.json` +- `/highway/cycleway/crossing.json` + `/highway/cycleway/crossing/*.json` +- `/highway/path/crossing.json` + `/highway/path/crossing/*.json` + +The crossing presets for `/cycleway*` and `/path*` are considered to be relevant for bike traffic and have additional fields that target bike vs. foot traffic. From 289a57b70084e8d3ee830ba8a84f23e6266bb48c Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 26 Apr 2024 10:55:00 +0200 Subject: [PATCH 19/27] crossing: Add readme docs on the `presets/@templates` --- data/presets/@templates/README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 data/presets/@templates/README.md diff --git a/data/presets/@templates/README.md b/data/presets/@templates/README.md new file mode 100644 index 00000000..414a7a6b --- /dev/null +++ b/data/presets/@templates/README.md @@ -0,0 +1,13 @@ +# About `@templates` + +Presets in `@templats` are a convention for a specific type of presets that are only used from inside other presets. + +The only fields that really matter for these special presets are the `fields`. + +All other properties can be copied from existing presets and ignored. They are default values that are meant to + +## How to use + +Inside another preset, reference the template – or any other preset - like `"{@templates/internet_access}"` in `fields` or `moreFields`. This will "copy" all the listed fields from the file `data/presets/@templates/internet_access.json`. + +You can only "copy" (template) `fields` to (preset) `fields` and (template) `moreFields` to (preset) `moreFields`. From fa267abacf83c2cd1aea23649c29405b53e2d941 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 25 Apr 2024 09:16:59 +0200 Subject: [PATCH 20/27] Fix `npm run lint` by ignoring `*.md` files in `data` Usually prettier can switch automatically to check Markdown and format it. However, this prettier config forces the JSON formatter for all files. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c15c0250..1a51f74a 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "license": "ISC", "main": "build.js", "scripts": { - "lint": "prettier --check data", + "lint": "prettier --check 'data/**/!(*.md)'", "lint:fix": "prettier --write data", "build": "node scripts/build.js", "dist": "node scripts/dist.js", From 8bfaef1542941fe8095f25690ce7b017bb3e26fa Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 25 Apr 2024 09:28:57 +0200 Subject: [PATCH 21/27] Fix "Check file endings" workflow to also allow `.md` files `npm run build` still works, so I don't think this is an issue. This also removes the second run of very similar code in the prettier workflow which I think is probably a legacy redundancy that can just be deleted. x --- .github/workflows/lint.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 7f253218..0a89fbd4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,12 +7,12 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - notJSONs=`find data/ -type f -not -iname "*.json"` - for f in $notJSONs + disallowedFiles=`find data/ -type f -not -iname "*.json" -not -iname "*.md"` + for f in $disallowedFiles do - echo "::error file=$f::File $f is not a .json file." + echo "::error file=$f::File $f is not a .json or .md file." done - if [ ! -z "$notJSONs" ]; then exit 1; fi + if [ ! -z "$disallowedFiles" ]; then exit 1; fi prettier: name: Check for code formatting mistakes @@ -23,7 +23,6 @@ jobs: with: node-version-file: '.nvmrc' - run: npm clean-install - - run: 'for f in `find data/ -type f -not -iname "*.json"`; do echo "::error File $f is not a .json file."; done' - run: npm run lint codespell: @@ -37,4 +36,3 @@ jobs: skip: ./.git,./dist,./data/deprecated.json ignore_words_list: "auxilary,casette,cemetary,chancel,discus,extentions,faiway,generat,goverment,guerilla,guyser,kindergarden,ore,pavillion,sculpter,storys,linz,te" only_warn: 1 - From 6c0174e2088501705682a5bab4f1d77ec8e7ab34 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 26 Apr 2024 09:32:11 +0200 Subject: [PATCH 22/27] crossing: Re-add `crossing` to all fields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes "crossing: New approach with …`@templates/crossing/defaults`". We need the "crossing" field on vertex/node fields as well to allow to quickly change the preset. SQ --- data/presets/highway/crossing.json | 1 + data/presets/highway/crossing/_marked.json | 1 + data/presets/highway/crossing/_zebra.json | 1 + data/presets/highway/crossing/traffic_signals.json | 1 + data/presets/highway/crossing/uncontrolled.json | 1 + data/presets/highway/crossing/unmarked.json | 1 + 6 files changed, 6 insertions(+) diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index 13fac6cc..11b6f668 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -1,5 +1,6 @@ { "fields": [ + "crossing", "{@templates/crossing/defaults}", "{@templates/crossing/markings}", "tactile_paving" diff --git a/data/presets/highway/crossing/_marked.json b/data/presets/highway/crossing/_marked.json index 946937ae..fda27416 100644 --- a/data/presets/highway/crossing/_marked.json +++ b/data/presets/highway/crossing/_marked.json @@ -1,6 +1,7 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", "tactile_paving" diff --git a/data/presets/highway/crossing/_zebra.json b/data/presets/highway/crossing/_zebra.json index afe8422f..ed71daa0 100644 --- a/data/presets/highway/crossing/_zebra.json +++ b/data/presets/highway/crossing/_zebra.json @@ -1,6 +1,7 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", "tactile_paving" diff --git a/data/presets/highway/crossing/traffic_signals.json b/data/presets/highway/crossing/traffic_signals.json index 7755a95e..a241c4ff 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/traffic_signals.json @@ -1,6 +1,7 @@ { "icon": "temaki-railway_signals", "fields": [ + "crossing", "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/uncontrolled.json index 96473df9..370987fe 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/uncontrolled.json @@ -1,6 +1,7 @@ { "icon": "temaki-pedestrian_crosswalk", "fields": [ + "crossing", "{@templates/crossing/markings_yes}", "{@templates/crossing/defaults}", "tactile_paving" diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/unmarked.json index 15676149..e8499ff6 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/data/presets/highway/crossing/unmarked.json @@ -1,6 +1,7 @@ { "icon": "temaki-pedestrian", "fields": [ + "crossing", "{@templates/crossing/defaults}", "tactile_paving" ], From b1ab6e35cfc839f31e07a09517f484e191e48b54 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 26 Apr 2024 11:45:47 +0200 Subject: [PATCH 23/27] 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 00000000..28de4263 --- /dev/null +++ b/data/presets/@templates/crossing/geometry_way_more.json @@ -0,0 +1,22 @@ +{ + "moreFields": [ + "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 0af018bc..a15ee458 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 35ec954a..0ebea5fe 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 e4421eb0..e4a6a6a6 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 1989de6b..f40fd257 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 6f1aa18b..5a8c7006 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 6f7aa764..3d93b802 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 b45c2f0d..78513071 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 0c1ccaae..599ee331 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 f0f284df..7ac1a29d 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 5e8504ec..28807d16 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 c38557ae..828bb345 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 b7a1a8ee..bf004627 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 84573e12..a6e412fb 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 72372f99..cb2d398e 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 514db5ee..4ff6d51f 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 e8da6fd3..3dc03f42 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 88c8477a..f904a086 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" ], From 4381d3ac4550df43121740e63b5de8bfae01ebb0 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 26 Apr 2024 13:19:45 +0200 Subject: [PATCH 24/27] crossing: Fix fields order for highway/crossing --- data/presets/highway/crossing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index 11b6f668..64dbc548 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -1,8 +1,8 @@ { "fields": [ "crossing", - "{@templates/crossing/defaults}", "{@templates/crossing/markings}", + "{@templates/crossing/defaults}", "tactile_paving" ], "moreFields": [ From 14e30fa5bb1d49652f3cec75df7edf523371d455 Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Wed, 22 May 2024 17:59:15 +0200 Subject: [PATCH 25/27] fix typo, minor rewording --- data/presets/@templates/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/presets/@templates/README.md b/data/presets/@templates/README.md index 414a7a6b..92db8e55 100644 --- a/data/presets/@templates/README.md +++ b/data/presets/@templates/README.md @@ -1,10 +1,10 @@ # About `@templates` -Presets in `@templats` are a convention for a specific type of presets that are only used from inside other presets. +Presets in `@templates` are a convention for a _virtual_ presets that are only used from inside other presets. -The only fields that really matter for these special presets are the `fields`. +The only property that really matter for these special presets are the `fields`. -All other properties can be copied from existing presets and ignored. They are default values that are meant to +All other properties can be copied from existing template presets and ignored. They are default values that are meant to match all cases where they might be referenced. ## How to use From ffef8769aaa8fe6cc6e92e8cd28897ca798156cc Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Wed, 22 May 2024 18:04:05 +0200 Subject: [PATCH 26/27] fix typos, finish sentences --- data/presets/highway/crossing/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/presets/highway/crossing/README.md b/data/presets/highway/crossing/README.md index 565e5b80..7a04daf1 100644 --- a/data/presets/highway/crossing/README.md +++ b/data/presets/highway/crossing/README.md @@ -3,17 +3,17 @@ ## General These presets use fields `@templates` to make sure all have a similar structure. -Some presets like `traffic_signals` have additinal fields and use a different field order. +Some presets like `traffic_signals` have additional fields and use a different field order. Try to keep the file structure very similar so they can be easily compared. ## nodes `highway=crossing + crossing=*` -Crossing nodes are handel by `highway/crossing.json` + `highway/crossing/*.json` (as geometry type `vertex`). +Crossing nodes are handled by `highway/crossing.json` and `highway/crossing/*.json` (as geometry type `vertex`). Crossing nodes and crossing ways have a big overlap. -However, there are a few tags that should _only_ be expected on the crossing node. When crossing ways are present, this also means there are separate ways attached with additional nodes that hald the +However, there are a few tags that should _only_ be expected on the crossing node. When crossing ways are present, this also means there are separate ways attached with additional nodes that may hold these additional tags. -There are places in OSM that follow a different tagging style where only crossing ways are used (without the vertex nodes). Those regions might have other conventions on where to place +There are places in OSM that follow a different tagging style where only crossing ways are used (without the vertex nodes). Those regions might use other conventions on where to place each tag. ## ways `highway=footway|cycleway|path + *=crossing + crossing=*` From b2ad5362e07c413cea7a608d87749bdcf1a86012 Mon Sep 17 00:00:00 2001 From: Tobias Date: Tue, 3 Sep 2024 14:09:28 +0200 Subject: [PATCH 27/27] Crossings: Improve wording for `name` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Kyℓe Hensel --- data/presets/highway/path/crossing/_traffic_signals.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json index 4ff6d51f..de04e3df 100644 --- a/data/presets/highway/path/crossing/_traffic_signals.json +++ b/data/presets/highway/path/crossing/_traffic_signals.json @@ -25,6 +25,6 @@ "key": "crossing", "value": "traffic_signals" }, - "name": "Crossing Cycle & Foot With Pedestrian Signals", + "name": "Cycle & Foot Crossing With Pedestrian Signals", "searchable": false }