From ca69d967b76f342533109458afc215b0cd4ffa2b Mon Sep 17 00:00:00 2001 From: arch0345 Date: Thu, 12 Oct 2023 23:28:34 -0700 Subject: [PATCH 1/2] Refactor crossing presets --- ...fic_signals.json => _traffic_signals.json} | 8 +--- .../{uncontrolled.json => _uncontrolled.json} | 10 +--- .../{unmarked.json => _unmarked.json} | 8 +--- .../crossing.json} | 3 ++ .../bicycle_foot/crossing/_marked.json | 46 +++++++++++++++++++ .../crossing/_traffic_signals.json | 45 ++++++++++++++++++ .../bicycle_foot/crossing/_uncontrolled.json | 46 +++++++++++++++++++ .../bicycle_foot/crossing/_unmarked.json | 45 ++++++++++++++++++ .../{_crossing.json => crossing.json} | 8 +++- .../highway/cycleway/crossing/_marked.json | 3 ++ ...fic_signals.json => _traffic_signals.json} | 7 +-- .../{uncontrolled.json => _uncontrolled.json} | 11 ++--- .../{unmarked.json => _unmarked.json} | 7 +-- ...fic_signals.json => _traffic_signals.json} | 7 +-- .../{uncontrolled.json => _uncontrolled.json} | 10 +--- .../{unmarked.json => _unmarked.json} | 8 +--- data/presets/highway/path/crossing.json | 28 +++++++++++ .../highway/path/crossing/_marked.json | 36 +++++++++++++++ .../path/crossing/_traffic_signals.json | 32 +++++++++++++ .../highway/path/crossing/_uncontrolled.json | 30 ++++++++++++ .../highway/path/crossing/_unmarked.json | 32 +++++++++++++ 21 files changed, 369 insertions(+), 61 deletions(-) rename data/presets/highway/crossing/{traffic_signals.json => _traffic_signals.json} (78%) rename data/presets/highway/crossing/{uncontrolled.json => _uncontrolled.json} (67%) rename data/presets/highway/crossing/{unmarked.json => _unmarked.json} (75%) rename data/presets/highway/cycleway/{crossing/bicycle_foot.json => bicycle_foot/crossing.json} (95%) create mode 100644 data/presets/highway/cycleway/bicycle_foot/crossing/_marked.json create mode 100644 data/presets/highway/cycleway/bicycle_foot/crossing/_traffic_signals.json create mode 100644 data/presets/highway/cycleway/bicycle_foot/crossing/_uncontrolled.json create mode 100644 data/presets/highway/cycleway/bicycle_foot/crossing/_unmarked.json rename data/presets/highway/cycleway/{_crossing.json => crossing.json} (76%) rename data/presets/highway/cycleway/crossing/{traffic_signals.json => _traffic_signals.json} (83%) rename data/presets/highway/cycleway/crossing/{uncontrolled.json => _uncontrolled.json} (78%) rename data/presets/highway/cycleway/crossing/{unmarked.json => _unmarked.json} (82%) rename data/presets/highway/footway/crossing/{traffic_signals.json => _traffic_signals.json} (82%) rename data/presets/highway/footway/crossing/{uncontrolled.json => _uncontrolled.json} (72%) rename data/presets/highway/footway/crossing/{unmarked.json => _unmarked.json} (79%) 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/crossing/traffic_signals.json b/data/presets/highway/crossing/_traffic_signals.json similarity index 78% rename from data/presets/highway/crossing/traffic_signals.json rename to data/presets/highway/crossing/_traffic_signals.json index 1a278a84b..5192b7a8a 100644 --- a/data/presets/highway/crossing/traffic_signals.json +++ b/data/presets/highway/crossing/_traffic_signals.json @@ -28,11 +28,5 @@ "value": "traffic_signals" }, "name": "Crossing With Pedestrian Signals", - "terms": [ - "bicycle crossing (lights)", - "crosswalk (lights)", - "pedestrian crossing (lights)", - "pedestrian traffic lights", - "pedestrian traffic signals" - ] + "searchable": false } diff --git a/data/presets/highway/crossing/uncontrolled.json b/data/presets/highway/crossing/_uncontrolled.json similarity index 67% rename from data/presets/highway/crossing/uncontrolled.json rename to data/presets/highway/crossing/_uncontrolled.json index 3a538b03e..f71db2c0f 100644 --- a/data/presets/highway/crossing/uncontrolled.json +++ b/data/presets/highway/crossing/_uncontrolled.json @@ -18,12 +18,6 @@ "key": "crossing", "value": "uncontrolled" }, - "terms": [ - "marked foot path crossing", - "marked crosswalk", - "marked pedestrian crosswalk", - "zebra crossing", - "crosswalk" - ], - "name": "Marked Crossing" + "name": "Marked Crossing", + "searchable": false } diff --git a/data/presets/highway/crossing/unmarked.json b/data/presets/highway/crossing/_unmarked.json similarity index 75% rename from data/presets/highway/crossing/unmarked.json rename to data/presets/highway/crossing/_unmarked.json index 151625eb9..4af279ae7 100644 --- a/data/presets/highway/crossing/unmarked.json +++ b/data/presets/highway/crossing/_unmarked.json @@ -22,10 +22,6 @@ "key": "crossing", "value": "unmarked" }, - "terms": [ - "unmarked crosswalk", - "unmarked foot path crossing", - "unmarked pedestrian crossing" - ], - "name": "Unmarked Crossing" + "name": "Unmarked Crossing", + "searchable": false } diff --git a/data/presets/highway/cycleway/crossing/bicycle_foot.json b/data/presets/highway/cycleway/bicycle_foot/crossing.json similarity index 95% rename from data/presets/highway/cycleway/crossing/bicycle_foot.json rename to data/presets/highway/cycleway/bicycle_foot/crossing.json index 6aed22938..308fcbfa9 100644 --- a/data/presets/highway/cycleway/crossing/bicycle_foot.json +++ b/data/presets/highway/cycleway/bicycle_foot/crossing.json @@ -17,6 +17,9 @@ "crossing_raised", "access" ], + "moreFields": [ + "segregated" + ], "geometry": [ "line" ], diff --git a/data/presets/highway/cycleway/bicycle_foot/crossing/_marked.json b/data/presets/highway/cycleway/bicycle_foot/crossing/_marked.json new file mode 100644 index 000000000..3e24fcb91 --- /dev/null +++ b/data/presets/highway/cycleway/bicycle_foot/crossing/_marked.json @@ -0,0 +1,46 @@ +{ + "locationSet": { + "exclude": [ + "fr", + "lt", + "pl" + ] + }, + "icon": "temaki-ped_cyclist_crosswalk", + "fields": [ + "crossing", + "surface", + "smoothness", + "tactile_paving", + "crossing/island", + "{@templates/crossing/markings}", + "crossing_raised", + "access" + ], + "moreFields": [ + "flashing_lights", + "segregated" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "cycleway", + "cycleway": "crossing", + "foot": "designated", + "crossing": "marked" + }, + "addTags": { + "highway": "cycleway", + "cycleway": "crossing", + "crossing": "marked", + "foot": "designated", + "bicycle": "designated" + }, + "reference": { + "key": "crossing", + "value": "marked" + }, + "name": "{highway/cycleway/bicycle_foot/crossing/uncontrolled}", + "searchable": false +} diff --git a/data/presets/highway/cycleway/bicycle_foot/crossing/_traffic_signals.json b/data/presets/highway/cycleway/bicycle_foot/crossing/_traffic_signals.json new file mode 100644 index 000000000..6e3b667e5 --- /dev/null +++ b/data/presets/highway/cycleway/bicycle_foot/crossing/_traffic_signals.json @@ -0,0 +1,45 @@ +{ + "locationSet": { + "exclude": [ + "fr", + "lt", + "pl" + ] + }, + "icon": "temaki-ped_cyclist_crosswalk", + "fields": [ + "crossing", + "surface", + "smoothness", + "tactile_paving", + "crossing/island", + "{@templates/crossing/markings}", + "crossing_raised", + "access" + ], + "moreFields": [ + "segregated" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "cycleway", + "cycleway": "crossing", + "foot": "designated", + "crossing": "traffic_signals" + }, + "addTags": { + "highway": "cycleway", + "cycleway": "crossing", + "crossing": "traffic_signals", + "foot": "designated", + "bicycle": "designated" + }, + "reference": { + "key": "crossing", + "value": "traffic_signals" + }, + "name": "Cycle & Foot Crossing With Traffic Signals", + "searchable": false +} diff --git a/data/presets/highway/cycleway/bicycle_foot/crossing/_uncontrolled.json b/data/presets/highway/cycleway/bicycle_foot/crossing/_uncontrolled.json new file mode 100644 index 000000000..b78481b0f --- /dev/null +++ b/data/presets/highway/cycleway/bicycle_foot/crossing/_uncontrolled.json @@ -0,0 +1,46 @@ +{ + "locationSet": { + "exclude": [ + "fr", + "lt", + "pl" + ] + }, + "icon": "temaki-ped_cyclist_crosswalk", + "fields": [ + "crossing", + "surface", + "smoothness", + "tactile_paving", + "crossing/island", + "{@templates/crossing/markings}", + "crossing_raised", + "access" + ], + "moreFields": [ + "flashing_lights", + "segregated" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "cycleway", + "cycleway": "crossing", + "foot": "designated", + "crossing": "uncontrolled" + }, + "addTags": { + "highway": "cycleway", + "cycleway": "crossing", + "crossing": "uncontrolled", + "foot": "designated", + "bicycle": "designated" + }, + "reference": { + "key": "crossing", + "value": "uncontrolled" + }, + "name": "Marked Cycle & Foot Crossing", + "searchable": false +} diff --git a/data/presets/highway/cycleway/bicycle_foot/crossing/_unmarked.json b/data/presets/highway/cycleway/bicycle_foot/crossing/_unmarked.json new file mode 100644 index 000000000..6f4cfd53a --- /dev/null +++ b/data/presets/highway/cycleway/bicycle_foot/crossing/_unmarked.json @@ -0,0 +1,45 @@ +{ + "locationSet": { + "exclude": [ + "fr", + "lt", + "pl" + ] + }, + "icon": "temaki-ped_cyclist_crosswalk", + "fields": [ + "crossing", + "surface", + "smoothness", + "tactile_paving", + "crossing/island", + "{@templates/crossing/markings}", + "crossing_raised", + "access" + ], + "moreFields": [ + "segregated" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "cycleway", + "cycleway": "crossing", + "foot": "designated", + "crossing": "unmarked" + }, + "addTags": { + "highway": "cycleway", + "cycleway": "crossing", + "crossing": "unmarked", + "foot": "designated", + "bicycle": "designated" + }, + "reference": { + "key": "crossing", + "value": "unmarked" + }, + "name": "Unmarked Cycle & Foot Crossing", + "searchable": false +} diff --git a/data/presets/highway/cycleway/_crossing.json b/data/presets/highway/cycleway/crossing.json similarity index 76% rename from data/presets/highway/cycleway/_crossing.json rename to data/presets/highway/cycleway/crossing.json index 55c0cd072..5c4ef4b85 100644 --- a/data/presets/highway/cycleway/_crossing.json +++ b/data/presets/highway/cycleway/crossing.json @@ -22,7 +22,13 @@ "key": "cycleway", "value": "crossing" }, - "searchable": false, + "terms": [ + "cycle crosswalk", + "cycle path crossing", + "cycleway crossing", + "bicycle crossing", + "bike crossing" + ], "matchScore": 0.95, "name": "Cycle Crossing" } diff --git a/data/presets/highway/cycleway/crossing/_marked.json b/data/presets/highway/cycleway/crossing/_marked.json index 352a0f20e..8654c5ed4 100644 --- a/data/presets/highway/cycleway/crossing/_marked.json +++ b/data/presets/highway/cycleway/crossing/_marked.json @@ -9,6 +9,9 @@ "crossing_raised", "access" ], + "moreFields": [ + "flashing_lights" + ], "geometry": [ "line" ], diff --git a/data/presets/highway/cycleway/crossing/traffic_signals.json b/data/presets/highway/cycleway/crossing/_traffic_signals.json similarity index 83% rename from data/presets/highway/cycleway/crossing/traffic_signals.json rename to data/presets/highway/cycleway/crossing/_traffic_signals.json index feee3cc88..f7c2f6dfb 100644 --- a/data/presets/highway/cycleway/crossing/traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/_traffic_signals.json @@ -27,12 +27,7 @@ "key": "crossing", "value": "traffic_signals" }, - "terms": [ - "bicycle crossing", - "bike crossing", - "cycle path crossing", - "cycleway crossing" - ], + "searchable": false, "matchScore": 0.95, "name": "Cycle Crossing With Traffic Signals" } diff --git a/data/presets/highway/cycleway/crossing/uncontrolled.json b/data/presets/highway/cycleway/crossing/_uncontrolled.json similarity index 78% rename from data/presets/highway/cycleway/crossing/uncontrolled.json rename to data/presets/highway/cycleway/crossing/_uncontrolled.json index 2501d8fba..75d99c25c 100644 --- a/data/presets/highway/cycleway/crossing/uncontrolled.json +++ b/data/presets/highway/cycleway/crossing/_uncontrolled.json @@ -10,6 +10,9 @@ "crossing_raised", "access" ], + "moreFields": [ + "flashing_lights" + ], "geometry": [ "line" ], @@ -22,13 +25,7 @@ "key": "crossing", "value": "uncontrolled" }, - "terms": [ - "cycle crosswalk", - "cycle path crossing", - "cycleway crossing", - "bicycle crossing", - "bike crossing" - ], + "searchable": false, "matchScore": 0.95, "name": "Marked Cycle Crossing" } diff --git a/data/presets/highway/cycleway/crossing/unmarked.json b/data/presets/highway/cycleway/crossing/_unmarked.json similarity index 82% rename from data/presets/highway/cycleway/crossing/unmarked.json rename to data/presets/highway/cycleway/crossing/_unmarked.json index a008c3eec..d90b1e7c1 100644 --- a/data/presets/highway/cycleway/crossing/unmarked.json +++ b/data/presets/highway/cycleway/crossing/_unmarked.json @@ -26,12 +26,7 @@ "key": "crossing", "value": "unmarked" }, - "terms": [ - "bike crossing", - "bicycle crossing", - "cycle path crossing", - "cycleway crossing" - ], + "searchable": false, "matchScore": 0.95, "name": "Unmarked Cycle Crossing" } diff --git a/data/presets/highway/footway/crossing/traffic_signals.json b/data/presets/highway/footway/crossing/_traffic_signals.json similarity index 82% rename from data/presets/highway/footway/crossing/traffic_signals.json rename to data/presets/highway/footway/crossing/_traffic_signals.json index bf2a19843..0ab985410 100644 --- a/data/presets/highway/footway/crossing/traffic_signals.json +++ b/data/presets/highway/footway/crossing/_traffic_signals.json @@ -30,10 +30,5 @@ "value": "traffic_signals" }, "name": "Crossing With Pedestrian Signals", - "terms": [ - "crosswalk (lights)", - "pedestrian traffic lights", - "pedestrian traffic signals", - "pedestrian crossing (lights)" - ] + "searchable": false } diff --git a/data/presets/highway/footway/crossing/uncontrolled.json b/data/presets/highway/footway/crossing/_uncontrolled.json similarity index 72% rename from data/presets/highway/footway/crossing/uncontrolled.json rename to data/presets/highway/footway/crossing/_uncontrolled.json index 04b25e34c..9e0948702 100644 --- a/data/presets/highway/footway/crossing/uncontrolled.json +++ b/data/presets/highway/footway/crossing/_uncontrolled.json @@ -24,12 +24,6 @@ "key": "crossing", "value": "uncontrolled" }, - "terms": [ - "marked foot path crossing", - "marked crosswalk", - "marked pedestrian crosswalk", - "zebra crossing", - "crosswalk" - ], - "name": "Marked Crossing" + "name": "Marked Crossing", + "searchable": false } diff --git a/data/presets/highway/footway/crossing/unmarked.json b/data/presets/highway/footway/crossing/_unmarked.json similarity index 79% rename from data/presets/highway/footway/crossing/unmarked.json rename to data/presets/highway/footway/crossing/_unmarked.json index c9ca15624..464df617e 100644 --- a/data/presets/highway/footway/crossing/unmarked.json +++ b/data/presets/highway/footway/crossing/_unmarked.json @@ -29,10 +29,6 @@ "key": "crossing", "value": "unmarked" }, - "terms": [ - "unmarked crosswalk", - "unmarked foot path crossing", - "unmarked pedestrian crossing" - ], - "name": "Unmarked Crossing" + "name": "Unmarked Crossing", + "searchable": false } diff --git a/data/presets/highway/path/crossing.json b/data/presets/highway/path/crossing.json new file mode 100644 index 000000000..c7e6bf52a --- /dev/null +++ b/data/presets/highway/path/crossing.json @@ -0,0 +1,28 @@ +{ + "icon": "temaki-ped_cyclist_crosswalk", + "fields": [ + "crossing", + "surface", + "tactile_paving", + "crossing/island", + "{@templates/crossing/markings}", + "access" + ], + "geometry": [ + "line" + ], + "tags": { + "path": "crossing" + }, + "addTags": { + "highway": "path", + "path": "crossing" + }, + "reference": { + "key": "path", + "value": "crossing" + }, + "searchable": false, + "matchScore": 0.95, + "name": "Path 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..71a7fc76e --- /dev/null +++ b/data/presets/highway/path/crossing/_marked.json @@ -0,0 +1,36 @@ +{ + "icon": "temaki-ped_cyclist_crosswalk", + "fields": [ + "crossing", + "surface", + "tactile_paving", + "crossing/island", + "{@templates/crossing/markings}", + "crossing_raised", + "access" + ], + "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" + }, + "matchScore": 0.95, + "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..f0bed8673 --- /dev/null +++ b/data/presets/highway/path/crossing/_traffic_signals.json @@ -0,0 +1,32 @@ +{ + "icon": "temaki-ped_cyclist_crosswalk", + "fields": [ + "crossing", + "surface", + "crossing/island", + "{@templates/crossing/markings}", + "crossing_raised", + "button_operated", + "traffic_signals/sound", + "traffic_signals/vibration", + "access" + ], + "moreFields": [ + "tactile_paving" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "cycleway", + "cycleway": "path", + "path": "traffic_signals" + }, + "reference": { + "key": "crossing", + "value": "traffic_signals" + }, + "searchable": false, + "matchScore": 0.95, + "name": "Path Crossing With Traffic Signals" +} diff --git a/data/presets/highway/path/crossing/_uncontrolled.json b/data/presets/highway/path/crossing/_uncontrolled.json new file mode 100644 index 000000000..f6e662bda --- /dev/null +++ b/data/presets/highway/path/crossing/_uncontrolled.json @@ -0,0 +1,30 @@ +{ + "icon": "temaki-ped_cyclist_crosswalk", + "fields": [ + "crossing", + "surface", + "tactile_paving", + "crossing/island", + "{@templates/crossing/markings_yes}", + "crossing_raised", + "access" + ], + "moreFields": [ + "flashing_lights" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "path", + "path": "crossing", + "crossing": "uncontrolled" + }, + "reference": { + "key": "crossing", + "value": "uncontrolled" + }, + "searchable": false, + "matchScore": 0.95, + "name": "Marked Path Crossing" +} diff --git a/data/presets/highway/path/crossing/_unmarked.json b/data/presets/highway/path/crossing/_unmarked.json new file mode 100644 index 000000000..07a393135 --- /dev/null +++ b/data/presets/highway/path/crossing/_unmarked.json @@ -0,0 +1,32 @@ +{ + "icon": "temaki-ped_cyclist_crosswalk", + "fields": [ + "crossing", + "surface", + "tactile_paving", + "crossing/island", + "crossing_raised", + "access" + ], + "geometry": [ + "line" + ], + "tags": { + "highway": "path", + "path": "crossing", + "crossing": "unmarked" + }, + "addTags": { + "highway": "path", + "path": "crossing", + "crossing": "unmarked", + "crossing:markings": "no" + }, + "reference": { + "key": "crossing", + "value": "unmarked" + }, + "searchable": false, + "matchScore": 0.95, + "name": "Unmarked Path Crossing" +} From 1a398f924f6e6b7ca99c68dafe012627914d689f Mon Sep 17 00:00:00 2001 From: arch0345 Date: Mon, 29 Jan 2024 19:38:01 -0800 Subject: [PATCH 2/2] Add field for `crossing:signals` --- data/fields/crossing/signals.json | 5 +++++ data/presets/highway/crossing.json | 2 +- data/presets/highway/crossing/_traffic_signals.json | 5 +++++ data/presets/highway/cycleway/bicycle_foot/crossing.json | 2 +- .../cycleway/bicycle_foot/crossing/_traffic_signals.json | 1 + data/presets/highway/cycleway/crossing.json | 2 +- .../presets/highway/cycleway/crossing/_traffic_signals.json | 6 ++++++ data/presets/highway/footway/crossing.json | 2 +- data/presets/highway/footway/crossing/_traffic_signals.json | 6 ++++++ data/presets/highway/path/crossing.json | 2 +- 10 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 data/fields/crossing/signals.json diff --git a/data/fields/crossing/signals.json b/data/fields/crossing/signals.json new file mode 100644 index 000000000..773ab850e --- /dev/null +++ b/data/fields/crossing/signals.json @@ -0,0 +1,5 @@ +{ + "key": "crossing:signals", + "type": "check", + "label": "Crosswalk Signals" +} diff --git a/data/presets/highway/crossing.json b/data/presets/highway/crossing.json index b6446121a..c2ae894e9 100644 --- a/data/presets/highway/crossing.json +++ b/data/presets/highway/crossing.json @@ -1,9 +1,9 @@ { "fields": [ - "crossing", "tactile_paving", "crossing/island", "{@templates/crossing/markings}", + "crossing/signals", "crossing_raised" ], "moreFields": [ diff --git a/data/presets/highway/crossing/_traffic_signals.json b/data/presets/highway/crossing/_traffic_signals.json index 5192b7a8a..7f4420cb6 100644 --- a/data/presets/highway/crossing/_traffic_signals.json +++ b/data/presets/highway/crossing/_traffic_signals.json @@ -23,6 +23,11 @@ "highway": "crossing", "crossing": "traffic_signals" }, + "addTags": { + "highway": "crossing", + "crossing": "traffic_signals", + "crossing:signals": "yes" + }, "reference": { "key": "crossing", "value": "traffic_signals" diff --git a/data/presets/highway/cycleway/bicycle_foot/crossing.json b/data/presets/highway/cycleway/bicycle_foot/crossing.json index 308fcbfa9..e9388bd87 100644 --- a/data/presets/highway/cycleway/bicycle_foot/crossing.json +++ b/data/presets/highway/cycleway/bicycle_foot/crossing.json @@ -8,12 +8,12 @@ }, "icon": "temaki-ped_cyclist_crosswalk", "fields": [ - "crossing", "surface", "smoothness", "tactile_paving", "crossing/island", "{@templates/crossing/markings}", + "crossing/signals", "crossing_raised", "access" ], diff --git a/data/presets/highway/cycleway/bicycle_foot/crossing/_traffic_signals.json b/data/presets/highway/cycleway/bicycle_foot/crossing/_traffic_signals.json index 6e3b667e5..acb7e5f19 100644 --- a/data/presets/highway/cycleway/bicycle_foot/crossing/_traffic_signals.json +++ b/data/presets/highway/cycleway/bicycle_foot/crossing/_traffic_signals.json @@ -33,6 +33,7 @@ "highway": "cycleway", "cycleway": "crossing", "crossing": "traffic_signals", + "crossing:signals": "yes", "foot": "designated", "bicycle": "designated" }, diff --git a/data/presets/highway/cycleway/crossing.json b/data/presets/highway/cycleway/crossing.json index 5c4ef4b85..641485415 100644 --- a/data/presets/highway/cycleway/crossing.json +++ b/data/presets/highway/cycleway/crossing.json @@ -1,11 +1,11 @@ { "icon": "temaki-cyclist_crosswalk", "fields": [ - "crossing", "surface", "tactile_paving", "crossing/island", "{@templates/crossing/markings}", + "crossing/signals", "access" ], "geometry": [ diff --git a/data/presets/highway/cycleway/crossing/_traffic_signals.json b/data/presets/highway/cycleway/crossing/_traffic_signals.json index f7c2f6dfb..2a288f638 100644 --- a/data/presets/highway/cycleway/crossing/_traffic_signals.json +++ b/data/presets/highway/cycleway/crossing/_traffic_signals.json @@ -23,6 +23,12 @@ "cycleway": "crossing", "crossing": "traffic_signals" }, + "addTags": { + "highway": "cycleway", + "cycleway": "path", + "path": "traffic_signals", + "crossing:signals": "yes" + }, "reference": { "key": "crossing", "value": "traffic_signals" diff --git a/data/presets/highway/footway/crossing.json b/data/presets/highway/footway/crossing.json index f8f2d6d16..92b767404 100644 --- a/data/presets/highway/footway/crossing.json +++ b/data/presets/highway/footway/crossing.json @@ -1,10 +1,10 @@ { "fields": [ - "crossing", "surface", "tactile_paving", "crossing/island", "{@templates/crossing/markings}", + "crossing/signals", "crossing_raised", "access" ], diff --git a/data/presets/highway/footway/crossing/_traffic_signals.json b/data/presets/highway/footway/crossing/_traffic_signals.json index 0ab985410..375f49f27 100644 --- a/data/presets/highway/footway/crossing/_traffic_signals.json +++ b/data/presets/highway/footway/crossing/_traffic_signals.json @@ -25,6 +25,12 @@ "footway": "crossing", "crossing": "traffic_signals" }, + "addTags": { + "highway": "footway", + "footway": "crossing", + "crossing": "traffic_signals", + "crossing:signals": "yes" + }, "reference": { "key": "crossing", "value": "traffic_signals" diff --git a/data/presets/highway/path/crossing.json b/data/presets/highway/path/crossing.json index c7e6bf52a..5aaed5d54 100644 --- a/data/presets/highway/path/crossing.json +++ b/data/presets/highway/path/crossing.json @@ -1,11 +1,11 @@ { "icon": "temaki-ped_cyclist_crosswalk", "fields": [ - "crossing", "surface", "tactile_paving", "crossing/island", "{@templates/crossing/markings}", + "crossing/signals", "access" ], "geometry": [