From 02eb4d0235a968645e9f24618606536c2adb55e9 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 24 Apr 2024 16:02:19 +0200 Subject: [PATCH 01/38] 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 cd054db53..c01970271 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/38] 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 e98be5da5..c6ee1fc44 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 a008c3eec..7aabc7635 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/38] 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 feee3cc88..38e3c7cbb 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/38] 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 000000000..e1701a20f --- /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 f22e4dfbe..83c958ac4 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 c01970271..fea7b491c 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 53690f057..66a3d12de 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 1a278a84b..653304608 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 3a538b03e..3a3fe154b 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 151625eb9..2988c0a72 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 55c0cd072..825e9b25a 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 352a0f20e..1a1054f70 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 c6ee1fc44..1904f44d8 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 38e3c7cbb..a04bfeea3 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 2501d8fba..ebf26335b 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 7aabc7635..1f98202ca 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 f8f2d6d16..1685344e0 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 0fad13965..290faf2b9 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 502f7d326..5694bbf72 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 bf2a19843..839b9700f 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 04b25e34c..d10da93c5 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 c9ca15624..a4af00311 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/38] 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 000000000..87890b8c1 --- /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 653304608..3caaf7d8b 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 825e9b25a..05d4c30f6 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 1a1054f70..53e42d249 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 1904f44d8..15b6ecb32 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 a04bfeea3..01325c922 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 ebf26335b..b48e7476b 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 1f98202ca..fe523975f 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 1685344e0..9054f4eae 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 290faf2b9..6de5d5bb8 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 5694bbf72..f8ac85260 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 839b9700f..6114cfa6b 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 d10da93c5..9a5150d61 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 a4af00311..b2e018585 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/38] 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 000000000..9fba2425d --- /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 3caaf7d8b..af126ca2f 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 01325c922..cd7efaf24 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 6114cfa6b..c672d2d3a 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/38] 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 000000000..7d4f5ab85 --- /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 af126ca2f..be8dd91ee 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 cd7efaf24..577d3dfe6 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 c672d2d3a..ccaa2bb98 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/38] 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 83c958ac4..94415e726 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/38] 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 fea7b491c..c0de124d3 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 66a3d12de..1a4fc281f 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 3a3fe154b..5582d4330 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 2988c0a72..d3eb170bb 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/38] 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 1188ab3b6..5c186e070 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 5268a8186..c758a8524 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 c33df49f0..edc86d253 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 8b81bb2c8..9155115dc 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 eee9c475d..04524b36b 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 71358b53d..c10103b09 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 c088572f4..c0203f6ae 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/38] 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 c0de124d3..3452a16b6 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 1a4fc281f..fcec2f9b1 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 be8dd91ee..0f7f8acec 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 05d4c30f6..2e394c859 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 53e42d249..41f43fe8c 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 15b6ecb32..e774e60b4 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 577d3dfe6..b0b3e9ff0 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 9054f4eae..5d82b5111 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 6de5d5bb8..5312133e9 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 f8ac85260..9e121bb0c 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 ccaa2bb98..32d9e8803 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/38] 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 000000000..d89972671 --- /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 000000000..4a029c659 --- /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 000000000..73c8fed64 --- /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 000000000..69bd33f5c --- /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 000000000..516d1ee66 --- /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/38] 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 87890b8c1..8e193d4d5 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 e1701a20f..64c4a2e18 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 000000000..ab10d7cf6 --- /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 94415e726..b2b99ea5f 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 3452a16b6..d75d02630 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 fcec2f9b1..800ed2c8c 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 0f7f8acec..c50f6c331 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 5582d4330..e350fe1f1 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 d3eb170bb..65410c6bd 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 2e394c859..9c51821c3 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 41f43fe8c..b3076003f 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 e774e60b4..0a708e235 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 b0b3e9ff0..4a52ea6ef 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 b48e7476b..ecec949f5 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 fe523975f..1a5edb746 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 5d82b5111..758f272d3 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 5312133e9..e6070d6f9 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 9e121bb0c..86cf614ad 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 32d9e8803..243225791 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 9a5150d61..7d5635c91 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 b2e018585..c641a079a 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 d89972671..622280966 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 4a029c659..c0b9ec949 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 73c8fed64..bba994e5f 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 69bd33f5c..1618feda9 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 516d1ee66..565112a89 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/38] 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 7f988d5b4..8a838aef5 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 f0ac114f3..4fd724fde 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/38] 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 8e193d4d5..9de7a5ba9 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 9c51821c3..0af018bc6 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/_crossing.json @@ -4,7 +4,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index b3076003f..35ec954a1 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -4,7 +4,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json index 0a708e235..e4421eb0a 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -13,7 +13,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index 4a52ea6ef..1989de6ba 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -5,10 +5,12 @@ "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ - "{@templates/crossing/traffic_signal_more}" + "{@templates/crossing/traffic_signal_more}", + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json index ecec949f5..6f1aa18b6 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/uncontrolled.json @@ -4,7 +4,11 @@ "crossing", "{@templates/crossing/defaults}", "{@templates/crossing/markings_yes}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index 1a5edb746..6f7aa7645 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/unmarked.json @@ -3,7 +3,11 @@ "fields": [ "crossing", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}" ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json index 758f272d3..b45c2f0d4 100644 --- a/data/presets/highway/footway/crossing.json +++ b/data/presets/highway/footway/crossing.json @@ -3,9 +3,10 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ + "smoothness", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json index e6070d6f9..0c1ccaae6 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/data/presets/highway/footway/crossing/_marked.json @@ -4,9 +4,10 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ + "smoothness", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index 86cf614ad..b475230bf 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -4,7 +4,10 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" + ], + "moreFields": [ + "smoothness", ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index 243225791..f543d2045 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -5,10 +5,11 @@ "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ - "{@templates/crossing/traffic_signal_more}" + "{@templates/crossing/traffic_signal_more}", + "smoothness", ], "geometry": [ "line" diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json index 7d5635c91..c38557ae9 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/uncontrolled.json @@ -4,9 +4,10 @@ "crossing", "{@templates/crossing/markings_yes}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ + "smoothness", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json index c641a079a..b7a1a8ee9 100644 --- a/data/presets/highway/footway/crossing/unmarked.json +++ b/data/presets/highway/footway/crossing/unmarked.json @@ -3,9 +3,10 @@ "fields": [ "crossing", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}" + "surface" ], "moreFields": [ + "smoothness", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json index 622280966..4b1808c44 100644 --- a/data/presets/highway/path/_crossing.json +++ b/data/presets/highway/path/_crossing.json @@ -4,8 +4,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" + ], + "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}", ], "geometry": [ "line" diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json index c0b9ec949..72372f99c 100644 --- a/data/presets/highway/path/crossing/_marked.json +++ b/data/presets/highway/path/crossing/_marked.json @@ -4,10 +4,11 @@ "crossing", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" ], "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json index bba994e5f..06dcac11f 100644 --- a/data/presets/highway/path/crossing/_traffic_signals.json +++ b/data/presets/highway/path/crossing/_traffic_signals.json @@ -5,11 +5,12 @@ "{@templates/crossing/traffic_signal}", "{@templates/crossing/markings}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" ], "moreFields": [ - "{@templates/crossing/traffic_signal_more}" + "{@templates/crossing/traffic_signal_more}", + "smoothness", + "{@templates/crossing/bicycle_more}", ], "geometry": [ "line" diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json index 1618feda9..e8da6fd3c 100644 --- a/data/presets/highway/path/crossing/_uncontrolled.json +++ b/data/presets/highway/path/crossing/_uncontrolled.json @@ -4,10 +4,11 @@ "crossing", "{@templates/crossing/markings_yes}", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" ], "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json index 565112a89..88c8477a8 100644 --- a/data/presets/highway/path/crossing/_unmarked.json +++ b/data/presets/highway/path/crossing/_unmarked.json @@ -3,10 +3,11 @@ "fields": [ "crossing", "{@templates/crossing/defaults}", - "{@templates/crossing/surfacequality}", - "{@templates/crossing/bicycle_relevance}" + "surface" ], "moreFields": [ + "smoothness", + "{@templates/crossing/bicycle_more}", "flashing_lights" ], "geometry": [ From 28638cf6c8a5eaa0918457e38daa35b0c5bda0f6 Mon Sep 17 00:00:00 2001 From: Tobias Date: Thu, 25 Apr 2024 05:42:16 +0200 Subject: [PATCH 16/38] 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 b2b99ea5f..468e3e15f 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 d75d02630..33d46e6dc 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 800ed2c8c..09659f3f5 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 c50f6c331..5ee9ab22c 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 e350fe1f1..480dc9d4e 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 65410c6bd..dd7dc7513 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 b475230bf..f0f284dfa 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 f543d2045..5e8504ec5 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 4b1808c44..84573e127 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 06dcac11f..514db5ee0 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/38] 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 64c4a2e18..61bd6fc25 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 468e3e15f..13fac6ccd 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 33d46e6dc..946937ae1 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 09659f3f5..afe8422f0 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 5ee9ab22c..7755a95e3 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 480dc9d4e..96473df9c 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 dd7dc7513..15676149f 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/38] 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 000000000..565e5b803 --- /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/38] 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 000000000..414a7a6b5 --- /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/38] 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 c15c0250d..1a51f74a7 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/38] 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 7f2532187..0a89fbd42 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/38] 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 13fac6ccd..11b6f668d 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 946937ae1..fda274169 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 afe8422f0..ed71daa09 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 7755a95e3..a241c4ffe 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 96473df9c..370987fea 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 15676149f..e8499ff67 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/38] crossing: Add `lit` to all crossing "way" geometry presets via new `@template/geometry_way_more` The "lit" value was present on some of the presets before and is common to be applied to all kind of ways. --- .../crossing/geometry_way_more.json | 22 +++++++++++++++++++ data/presets/highway/cycleway/_crossing.json | 2 +- .../highway/cycleway/crossing/_marked.json | 2 +- .../cycleway/crossing/bicycle_foot.json | 2 +- .../cycleway/crossing/traffic_signals.json | 2 +- .../cycleway/crossing/uncontrolled.json | 2 +- .../highway/cycleway/crossing/unmarked.json | 2 +- data/presets/highway/footway/crossing.json | 2 +- .../highway/footway/crossing/_marked.json | 2 +- .../highway/footway/crossing/_zebra.json | 2 +- .../footway/crossing/traffic_signals.json | 2 +- .../footway/crossing/uncontrolled.json | 2 +- .../highway/footway/crossing/unmarked.json | 2 +- data/presets/highway/path/_crossing.json | 2 +- .../highway/path/crossing/_marked.json | 2 +- .../path/crossing/_traffic_signals.json | 2 +- .../highway/path/crossing/_uncontrolled.json | 2 +- .../highway/path/crossing/_unmarked.json | 2 +- 18 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 data/presets/@templates/crossing/geometry_way_more.json diff --git a/data/presets/@templates/crossing/geometry_way_more.json b/data/presets/@templates/crossing/geometry_way_more.json new file mode 100644 index 000000000..28de42633 --- /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 0af018bc6..a15ee458a 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/_crossing.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index 35ec954a1..0ebea5fef 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/crossing/bicycle_foot.json index e4421eb0a..e4a6a6a6b 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/crossing/bicycle_foot.json @@ -16,7 +16,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/traffic_signals.json index 1989de6ba..f40fd2571 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/traffic_signals.json @@ -9,7 +9,7 @@ ], "moreFields": [ "{@templates/crossing/traffic_signal_more}", - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/uncontrolled.json index 6f1aa18b6..5a8c70066 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/uncontrolled.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/unmarked.json index 6f7aa7645..3d93b8025 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/unmarked.json @@ -6,7 +6,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json index b45c2f0d4..78513071d 100644 --- a/data/presets/highway/footway/crossing.json +++ b/data/presets/highway/footway/crossing.json @@ -6,7 +6,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/_marked.json b/data/presets/highway/footway/crossing/_marked.json index 0c1ccaae6..599ee3314 100644 --- a/data/presets/highway/footway/crossing/_marked.json +++ b/data/presets/highway/footway/crossing/_marked.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/_zebra.json b/data/presets/highway/footway/crossing/_zebra.json index f0f284dfa..7ac1a29df 100644 --- a/data/presets/highway/footway/crossing/_zebra.json +++ b/data/presets/highway/footway/crossing/_zebra.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/traffic_signals.json index 5e8504ec5..28807d162 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/traffic_signals.json @@ -9,7 +9,7 @@ ], "moreFields": [ "{@templates/crossing/traffic_signal_more}", - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/uncontrolled.json index c38557ae9..828bb345b 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/uncontrolled.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/unmarked.json index b7a1a8ee9..bf0046273 100644 --- a/data/presets/highway/footway/crossing/unmarked.json +++ b/data/presets/highway/footway/crossing/unmarked.json @@ -6,7 +6,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "flashing_lights" ], "geometry": [ diff --git a/data/presets/highway/path/_crossing.json b/data/presets/highway/path/_crossing.json index 84573e127..a6e412fb8 100644 --- a/data/presets/highway/path/_crossing.json +++ b/data/presets/highway/path/_crossing.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ], diff --git a/data/presets/highway/path/crossing/_marked.json b/data/presets/highway/path/crossing/_marked.json index 72372f99c..cb2d398ed 100644 --- a/data/presets/highway/path/crossing/_marked.json +++ b/data/presets/highway/path/crossing/_marked.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ], diff --git a/data/presets/highway/path/crossing/_traffic_signals.json b/data/presets/highway/path/crossing/_traffic_signals.json index 514db5ee0..4ff6d51fa 100644 --- a/data/presets/highway/path/crossing/_traffic_signals.json +++ b/data/presets/highway/path/crossing/_traffic_signals.json @@ -9,7 +9,7 @@ ], "moreFields": [ "{@templates/crossing/traffic_signal_more}", - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ], diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json index e8da6fd3c..3dc03f42a 100644 --- a/data/presets/highway/path/crossing/_uncontrolled.json +++ b/data/presets/highway/path/crossing/_uncontrolled.json @@ -7,7 +7,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ], diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json index 88c8477a8..f904a086e 100644 --- a/data/presets/highway/path/crossing/_unmarked.json +++ b/data/presets/highway/path/crossing/_unmarked.json @@ -6,7 +6,7 @@ "surface" ], "moreFields": [ - "smoothness", + "{@templates/crossing/geometry_way_more}", "{@templates/crossing/bicycle_more}", "flashing_lights" ], From 4381d3ac4550df43121740e63b5de8bfae01ebb0 Mon Sep 17 00:00:00 2001 From: Tobias Date: Fri, 26 Apr 2024 13:19:45 +0200 Subject: [PATCH 24/38] 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 11b6f668d..64dbc548a 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/38] 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 414a7a6b5..92db8e55c 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/38] 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 565e5b803..7a04daf1a 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 1c476a2146efb3d8019cef866ddefebb98abc407 Mon Sep 17 00:00:00 2001 From: Tobias Date: Sat, 8 Jun 2024 08:21:13 +0200 Subject: [PATCH 27/38] Docs: Add section on info-i to CONTRIBUTING.md --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 595c64144..b7ed4e383 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,6 +49,13 @@ To make a change, update the corresponding file within the `data` folder: The `p Icons from different sources (_icon sets_) can be used in the tagging schema. Head over to the [dedicated page](https://github.com/ideditor/schema-builder/blob/main/ICONS.md#icons) about how to use them. +### Info-`i` + +iD and other tools provide users with a way to learn more about the main tag of a preset. It is important to provide good information in this information panel. Here are a few notes on how to do this: +- Does your tag have a Wikidata entry? Click the small pencil icon next to the text to open the Wikidata item on the OSM wiki. Improve this wording if needed. If the Wikidata item is missing, [learn more about how to add it in "Current methods for creating new items"](https://wiki.openstreetmap.org/wiki/Data_items#Item_creation_process). +- Does your tag have a Wiki page with a good image? +- Your preset might need [a `reference` property](https://github.com/ideditor/schema-builder?tab=readme-ov-file#reference) to force the system to use a specific tag for the information section. + ### Code Style The input files are JSON files which use 4-space indentation. You can use the `npm run lint` command to check whether your files match the expected code style and run `npm run lint:fix` to reformat them if they don't do so. From b4be589b48d6a189ca855303ef863e3196352050 Mon Sep 17 00:00:00 2001 From: Tobias Date: Mon, 10 Jun 2024 07:19:24 +0200 Subject: [PATCH 28/38] Docs: Add inline image --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b7ed4e383..c56c88187 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,6 +51,8 @@ Icons from different sources (_icon sets_) can be used in the tagging schema. He ### Info-`i` +![Screenshot of a preset in iD with the information details open.](https://github.com/openstreetmap/id-tagging-schema/assets/111561/13549318-cd7c-4dd1-9948-7a2d84662f04) + iD and other tools provide users with a way to learn more about the main tag of a preset. It is important to provide good information in this information panel. Here are a few notes on how to do this: - Does your tag have a Wikidata entry? Click the small pencil icon next to the text to open the Wikidata item on the OSM wiki. Improve this wording if needed. If the Wikidata item is missing, [learn more about how to add it in "Current methods for creating new items"](https://wiki.openstreetmap.org/wiki/Data_items#Item_creation_process). - Does your tag have a Wiki page with a good image? From b2ad5362e07c413cea7a608d87749bdcf1a86012 Mon Sep 17 00:00:00 2001 From: Tobias Date: Tue, 3 Sep 2024 14:09:28 +0200 Subject: [PATCH 29/38] 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 4ff6d51fa..de04e3df6 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 } From 339ae5bd55f0c0e8063fb21641eab3ad85b3fa85 Mon Sep 17 00:00:00 2001 From: archpdx Date: Thu, 24 Oct 2024 02:29:47 -0700 Subject: [PATCH 30/38] `amenity/theatre/type/amphi`: Use American English (#1366) --- data/presets/amenity/theatre/type/amphi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/presets/amenity/theatre/type/amphi.json b/data/presets/amenity/theatre/type/amphi.json index d1d6b1709..6494081ef 100644 --- a/data/presets/amenity/theatre/type/amphi.json +++ b/data/presets/amenity/theatre/type/amphi.json @@ -20,5 +20,5 @@ "amenity": "theatre", "theatre:type": "amphi" }, - "name": "Amphitheatre" + "name": "Amphitheater" } From 135ad24d0d1b92496d1cf7a6e5a358ea50ccdd7f Mon Sep 17 00:00:00 2001 From: tiuck Date: Sat, 2 Nov 2024 11:43:53 +0100 Subject: [PATCH 31/38] Update vending.json, added e-cigarettes (#1371) --- data/fields/vending.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/fields/vending.json b/data/fields/vending.json index 216319db8..4a06525e0 100644 --- a/data/fields/vending.json +++ b/data/fields/vending.json @@ -10,6 +10,7 @@ "coffee": "Coffee", "condoms": "Condoms", "drinks": "Drinks", + "e-cigarettes": "E-Cigarettes", "eggs": "Eggs", "electronics": "Electronics", "elongated_coin": "Souvenir Coins", From de5bd05da2076616432f2281e2c4d15b6af2f55f Mon Sep 17 00:00:00 2001 From: tiuck Date: Sat, 2 Nov 2024 15:04:56 +0100 Subject: [PATCH 32/38] Specify values for tactile_map tag, add deprecations for map_type=tactile* (#1373) --- data/deprecated.json | 8 ++++++++ data/fields/map_type.json | 12 +++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/data/deprecated.json b/data/deprecated.json index b4a4206e5..e473bb735 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -1134,6 +1134,14 @@ "old": {"man_made": "winery"}, "replace": {"craft": "winery"} }, + { + "old": {"map_type": "tactile_map", "information": "map"}, + "replace": {"information": "tactile_map"} + }, + { + "old": {"map_type": "tactile_model", "information": "map"}, + "replace": {"information": "tactile_model"} + }, { "old": {"maxage": "*"}, "replace": {"max_age": "$1"} diff --git a/data/fields/map_type.json b/data/fields/map_type.json index 4341ed6b5..86176d26c 100644 --- a/data/fields/map_type.json +++ b/data/fields/map_type.json @@ -1,5 +1,15 @@ { "key": "map_type", "type": "typeCombo", - "label": "Type" + "label": "Type", + "strings": { + "options": { + "topo": "Topographical Map", + "street": "Road Map", + "scheme": "Schematic Map", + "toposcope": "Toposcope" + } + }, + "autoSuggestions": false, + "customValues": false } From e0c7efdb21d641c021fb98bcef08aa909a7afc43 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Sun, 3 Nov 2024 05:20:40 +0100 Subject: [PATCH 33/38] Docs: Fix link (#1375) --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a915fd2ae..85908a486 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -58,7 +58,7 @@ Follow these steps to test your PR yourself and make it a lot easier and faster ### Wording From 8bc37a85f8d368a4135031d041899551e86d334a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=E2=84=93e=20Hensel?= Date: Sun, 3 Nov 2024 16:13:43 +1100 Subject: [PATCH 34/38] Add search terms to several presets (#1370) --- data/presets/amenity/boat_rental.json | 3 +++ data/presets/amenity/motorcycle_parking.json | 3 +++ data/presets/amenity/telephone.json | 3 +++ data/presets/barrier/height_restrictor.json | 1 + data/presets/barrier/motorcycle_barrier.json | 3 +++ data/presets/emergency/life_ring.json | 1 + data/presets/emergency/phone.json | 5 +++++ data/presets/landuse/aquaculture.json | 2 ++ data/presets/man_made/storage_tank.json | 1 + data/presets/man_made/watermill.json | 2 ++ data/presets/public_transport/platform/train.json | 1 + data/presets/shop/motorcycle.json | 3 ++- data/presets/shop/motorcycle_repair.json | 1 + data/presets/tourism/theme_park.json | 4 ++++ data/presets/tourism/viewpoint.json | 3 +++ 15 files changed, 35 insertions(+), 1 deletion(-) diff --git a/data/presets/amenity/boat_rental.json b/data/presets/amenity/boat_rental.json index 589093e2c..4af7d57d3 100644 --- a/data/presets/amenity/boat_rental.json +++ b/data/presets/amenity/boat_rental.json @@ -21,5 +21,8 @@ "tags": { "amenity": "boat_rental" }, + "terms": [ + "boat hire" + ], "name": "Boat Rental" } diff --git a/data/presets/amenity/motorcycle_parking.json b/data/presets/amenity/motorcycle_parking.json index fd5085525..d087eed1f 100644 --- a/data/presets/amenity/motorcycle_parking.json +++ b/data/presets/amenity/motorcycle_parking.json @@ -14,5 +14,8 @@ "tags": { "amenity": "motorcycle_parking" }, + "terms": [ + "motorbike parking" + ], "name": "Motorcycle Parking" } diff --git a/data/presets/amenity/telephone.json b/data/presets/amenity/telephone.json index 996dcf1e0..0d9454b8c 100644 --- a/data/presets/amenity/telephone.json +++ b/data/presets/amenity/telephone.json @@ -27,6 +27,9 @@ "amenity": "telephone" }, "terms": [ + "payphone", + "pay phone", + "phone booth", "phone" ], "name": "Telephone" diff --git a/data/presets/barrier/height_restrictor.json b/data/presets/barrier/height_restrictor.json index fe71548eb..c539e825b 100644 --- a/data/presets/barrier/height_restrictor.json +++ b/data/presets/barrier/height_restrictor.json @@ -16,6 +16,7 @@ "height barrier", "height restriction barrier", "maxheight", + "max height", "maximum height measurer" ], "name": "Height Restrictor" diff --git a/data/presets/barrier/motorcycle_barrier.json b/data/presets/barrier/motorcycle_barrier.json index 09ffe28fc..f3d879c4b 100644 --- a/data/presets/barrier/motorcycle_barrier.json +++ b/data/presets/barrier/motorcycle_barrier.json @@ -12,5 +12,8 @@ "tags": { "barrier": "motorcycle_barrier" }, + "terms": [ + "motorbike barrier" + ], "name": "Motorcycle Barrier" } diff --git a/data/presets/emergency/life_ring.json b/data/presets/emergency/life_ring.json index 80bdaaa73..21119ad75 100644 --- a/data/presets/emergency/life_ring.json +++ b/data/presets/emergency/life_ring.json @@ -9,6 +9,7 @@ "vertex" ], "terms": [ + "lifering", "life buoy", "kisby ring", "kisbie ring", diff --git a/data/presets/emergency/phone.json b/data/presets/emergency/phone.json index efea67f53..c951b3fa8 100644 --- a/data/presets/emergency/phone.json +++ b/data/presets/emergency/phone.json @@ -17,5 +17,10 @@ "tags": { "emergency": "phone" }, + "terms": [ + "sos", + "help", + "call point" + ], "name": "Emergency Phone" } diff --git a/data/presets/landuse/aquaculture.json b/data/presets/landuse/aquaculture.json index 9e367b3e6..82b5c1eb0 100644 --- a/data/presets/landuse/aquaculture.json +++ b/data/presets/landuse/aquaculture.json @@ -17,11 +17,13 @@ }, "terms": [ "fish farm", + "marine farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", + "mussel farm", "mariculture", "algaculture" ], diff --git a/data/presets/man_made/storage_tank.json b/data/presets/man_made/storage_tank.json index 2458e6412..f7679806f 100644 --- a/data/presets/man_made/storage_tank.json +++ b/data/presets/man_made/storage_tank.json @@ -21,6 +21,7 @@ "water", "oil", "gas", + "fuel", "petrol" ], "tags": { diff --git a/data/presets/man_made/watermill.json b/data/presets/man_made/watermill.json index 68236b5a6..f0d14c94e 100644 --- a/data/presets/man_made/watermill.json +++ b/data/presets/man_made/watermill.json @@ -15,6 +15,8 @@ "area" ], "terms": [ + "waterwheel", + "water wheel", "water", "wheel", "mill" diff --git a/data/presets/public_transport/platform/train.json b/data/presets/public_transport/platform/train.json index accba652e..9f407f526 100644 --- a/data/presets/public_transport/platform/train.json +++ b/data/presets/public_transport/platform/train.json @@ -28,6 +28,7 @@ "public transit", "public transportation", "rail", + "railway platform", "track", "train", "transit", diff --git a/data/presets/shop/motorcycle.json b/data/presets/shop/motorcycle.json index f7b90705a..10e9a4234 100644 --- a/data/presets/shop/motorcycle.json +++ b/data/presets/shop/motorcycle.json @@ -10,7 +10,8 @@ "area" ], "terms": [ - "bike" + "bike", + "motorbike" ], "tags": { "shop": "motorcycle" diff --git a/data/presets/shop/motorcycle_repair.json b/data/presets/shop/motorcycle_repair.json index 582c70605..c60b348c8 100644 --- a/data/presets/shop/motorcycle_repair.json +++ b/data/presets/shop/motorcycle_repair.json @@ -13,6 +13,7 @@ "bike", "garage", "motorcycle", + "motorbike", "repair", "service" ], diff --git a/data/presets/tourism/theme_park.json b/data/presets/tourism/theme_park.json index b9604332c..8f7890470 100644 --- a/data/presets/tourism/theme_park.json +++ b/data/presets/tourism/theme_park.json @@ -20,5 +20,9 @@ "tags": { "tourism": "theme_park" }, + "terms": [ + "amusement park", + "fun park" + ], "name": "Theme Park" } diff --git a/data/presets/tourism/viewpoint.json b/data/presets/tourism/viewpoint.json index df2e3aecd..caec6c2e1 100644 --- a/data/presets/tourism/viewpoint.json +++ b/data/presets/tourism/viewpoint.json @@ -14,5 +14,8 @@ "tags": { "tourism": "viewpoint" }, + "terms": [ + "lookout" + ], "name": "Viewpoint" } From bfa675f4b51c459f68675a9fefee0d7e9581ff7a Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Sun, 3 Nov 2024 07:13:50 +0100 Subject: [PATCH 35/38] `shop=pastry`: Add "cookies" as a term (#1368) --- data/presets/shop/pastry.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/presets/shop/pastry.json b/data/presets/shop/pastry.json index b7ddf8d42..9ff5aae71 100644 --- a/data/presets/shop/pastry.json +++ b/data/presets/shop/pastry.json @@ -10,7 +10,8 @@ "terms": [ "patisserie", "cake shop", - "cakery" + "cakery", + "cookies" ], "moreFields": [ "fhrs/id-GB" From c1989accfe0cd2d8fcae911e4363cfab12e130c0 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 13 Nov 2024 12:44:22 +0100 Subject: [PATCH 36/38] Add presets for `meadow=meadow_orchard`, `orchard=meadow_orchard` (#1218) --- .../landuse/meadow_orchard/meadow.json | 37 +++++++++++++++++++ .../landuse/meadow_orchard/orchard.json | 37 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 data/presets/landuse/meadow_orchard/meadow.json create mode 100644 data/presets/landuse/meadow_orchard/orchard.json diff --git a/data/presets/landuse/meadow_orchard/meadow.json b/data/presets/landuse/meadow_orchard/meadow.json new file mode 100644 index 000000000..ee4fb8aec --- /dev/null +++ b/data/presets/landuse/meadow_orchard/meadow.json @@ -0,0 +1,37 @@ +{ + "icon": "maki-park", + "fields": [ + "name", + "operator", + "trees" + ], + "moreFields": [ + "{@templates/contact}", + "address", + "species/wikidata", + "surface", + "description" + ], + "geometry": [ + "area" + ], + "tags": { + "landuse": "meadow", + "meadow": "meadow_orchard" + }, + "reference": { + "key": "meadow", + "value": "meadow_orchard" + }, + "terms": [ + "fruit", + "maedow" + ], + "name": "Meadow With Fruit Trees", + "matchScore": 0.9, + "locationSet": { + "include": [ + "Q46" + ] + } +} diff --git a/data/presets/landuse/meadow_orchard/orchard.json b/data/presets/landuse/meadow_orchard/orchard.json new file mode 100644 index 000000000..28cd0667e --- /dev/null +++ b/data/presets/landuse/meadow_orchard/orchard.json @@ -0,0 +1,37 @@ +{ + "icon": "maki-park", + "fields": [ + "name", + "operator", + "trees" + ], + "moreFields": [ + "{@templates/contact}", + "address", + "species/wikidata", + "surface", + "description" + ], + "geometry": [ + "area" + ], + "tags": { + "landuse": "orchard", + "orchard": "meadow_orchard" + }, + "reference": { + "key": "orchard", + "value": "meadow_orchard" + }, + "terms": [ + "fruit", + "maedow" + ], + "name": "Orchard Planted in a Meadow", + "matchScore": 0.9, + "locationSet": { + "include": [ + "Q46" + ] + } +} From 777d53ecbe364b2bba3eefca15acbd7003644df0 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 13 Nov 2024 12:52:55 +0100 Subject: [PATCH 37/38] Guidelines: Clarify rules for deprecations (#1309) Clarify when a deprecation should be considered based on tag volume --- GUIDELINES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GUIDELINES.md b/GUIDELINES.md index dd16a6f55..f14777b79 100644 --- a/GUIDELINES.md +++ b/GUIDELINES.md @@ -42,6 +42,8 @@ In both cases, _indicators for consensus_ are: - There is a significant drop in usage compared to previous numbers, with a negative trend ([visible in the graph](https://taghistory.raifer.tech/)). - Usage of the deprecated tag remains stagnant for a longer period (about a year). +In addition, the deprecated tag must have reasonably high usage to be considered. Low usage tags should be addressed through other cleanup methods, such as a MapRoulette project or similar initiatives. + ## 2. Design the Preset The user interface must be clear, concise, and easy to use, leaving no room for misunderstandings. From 5292df7b5149d5bacedb29f1bc1d2839fd8ca075 Mon Sep 17 00:00:00 2001 From: Tobias Date: Wed, 13 Nov 2024 12:53:54 +0100 Subject: [PATCH 38/38] Docs/Guidelines: Improve "Purpose" section (#1318) --- GUIDELINES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUIDELINES.md b/GUIDELINES.md index f14777b79..5a52ee9ee 100644 --- a/GUIDELINES.md +++ b/GUIDELINES.md @@ -15,7 +15,7 @@ Consider the following: - 📋 **Established Documentation**: The tagging schema will only consider tags that are well-documented on the OSM wiki. The documentation should be clear and unambiguous. - 🏷️ **Established Tags Only**: No new or unestablished tags should be part of presets. Establishing tags must remain a community-driven process, not dictated by software implementation. - ✅ **Proposal or Accepted**: A tag is considered established when it has completed the [proposal process](https://wiki.openstreetmap.org/wiki/Proposal_process) or is otherwise accepted by the OSM community. Factors include the tag's duration and frequency of use, whether its usage is increasing over time and its usage by mainstream data consumers. -- 🤷 **Useful Purpose**: Especially for less established tags, presets and fields should have a practical application. OSM allows for the collection of a wide variety of data, but not all of it is useful. For example, the brightness of street lamps might be documented, but it doesn't necessarily warrant a preset or field. +- 🤷 **Notable Purpose**: Especially for less established tags, presets and fields should have a practical application. OSM allows for the collection of a wide variety of data, some of it for niche purposes. For example, the brightness of street lamps might be documented, but it doesn't necessarily warrant a preset or field. - 🕓 **Effort vs. Impact**: Consider whether the effort required is justified by the impact the preset or field will have. Assess how many elements this new type will apply to. This is particularly important if you do not plan to contribute the code changes yourself through a pull request (PR). ### User Experience