Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor crossing presets #1044

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Refactor crossing presets #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca69d96
Refactor crossing presets
arch0345 Oct 13, 2023
1a398f9
Add field for `crossing:signals`
arch0345 Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions data/fields/crossing/signals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"key": "crossing:signals",
"type": "check",
"label": "Crosswalk Signals"
}
2 changes: 1 addition & 1 deletion data/presets/highway/crossing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"fields": [
"crossing",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing/signals",
"crossing_raised"
],
"moreFields": [
Expand Down
13 changes: 6 additions & 7 deletions ...ets/highway/crossing/traffic_signals.json → ...ts/highway/crossing/_traffic_signals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,15 @@
"highway": "crossing",
"crossing": "traffic_signals"
},
"addTags": {
"highway": "crossing",
"crossing": "traffic_signals",
"crossing:signals": "yes"
},
"reference": {
"key": "crossing",
"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
}
10 changes: 2 additions & 8 deletions ...resets/highway/crossing/uncontrolled.json → ...esets/highway/crossing/_uncontrolled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
8 changes: 2 additions & 6 deletions data/presets/highway/crossing/unmarked.json → data/presets/highway/crossing/_unmarked.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
5 changes: 4 additions & 1 deletion ...ghway/cycleway/crossing/bicycle_foot.json → ...ghway/cycleway/bicycle_foot/crossing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@
},
"icon": "temaki-ped_cyclist_crosswalk",
"fields": [
"crossing",
"surface",
"smoothness",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing/signals",
"crossing_raised",
"access"
],
"moreFields": [
"segregated"
],
"geometry": [
"line"
],
Expand Down
46 changes: 46 additions & 0 deletions data/presets/highway/cycleway/bicycle_foot/crossing/_marked.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
46 changes: 46 additions & 0 deletions data/presets/highway/cycleway/bicycle_foot/crossing/_traffic_signals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
"segregated"
],
"geometry": [
"line"
],
"tags": {
"highway": "cycleway",
"cycleway": "crossing",
"foot": "designated",
"crossing": "traffic_signals"
},
"addTags": {
"highway": "cycleway",
"cycleway": "crossing",
"crossing": "traffic_signals",
"crossing:signals": "yes",
"foot": "designated",
"bicycle": "designated"
},
"reference": {
"key": "crossing",
"value": "traffic_signals"
},
"name": "Cycle & Foot Crossing With Traffic Signals",
"searchable": false
}
46 changes: 46 additions & 0 deletions data/presets/highway/cycleway/bicycle_foot/crossing/_uncontrolled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
45 changes: 45 additions & 0 deletions data/presets/highway/cycleway/bicycle_foot/crossing/_unmarked.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
10 changes: 8 additions & 2 deletions data/presets/highway/cycleway/_crossing.json → data/presets/highway/cycleway/crossing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"icon": "temaki-cyclist_crosswalk",
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing/signals",
"access"
],
"geometry": [
Expand All @@ -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"
}
3 changes: 3 additions & 0 deletions data/presets/highway/cycleway/crossing/_marked.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"crossing_raised",
"access"
],
"moreFields": [
"flashing_lights"
],
"geometry": [
"line"
],
Expand Down
13 changes: 7 additions & 6 deletions ...ay/cycleway/crossing/traffic_signals.json → ...y/cycleway/crossing/_traffic_signals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,17 @@
"cycleway": "crossing",
"crossing": "traffic_signals"
},
"addTags": {
"highway": "cycleway",
"cycleway": "path",
"path": "traffic_signals",
"crossing:signals": "yes"
},
"reference": {
"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"
}
11 changes: 4 additions & 7 deletions ...ghway/cycleway/crossing/uncontrolled.json → ...hway/cycleway/crossing/_uncontrolled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"crossing_raised",
"access"
],
"moreFields": [
"flashing_lights"
],
"geometry": [
"line"
],
Expand All @@ -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"
}
7 changes: 1 addition & 6 deletions ...s/highway/cycleway/crossing/unmarked.json → .../highway/cycleway/crossing/_unmarked.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion data/presets/highway/footway/crossing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"fields": [
"crossing",
"surface",
"tactile_paving",
"crossing/island",
"{@templates/crossing/markings}",
"crossing/signals",
"crossing_raised",
"access"
],
Expand Down