-
Notifications
You must be signed in to change notification settings - Fork 163
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.
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
refactor crossing presets to use approved "crossing:markings" tag: add field for the new tag, change "Marked Crosswalk" presets to use "crossing=uncontrolled" tag and add preset for "Cycle Crossing With Traffic Signals" #590
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
80c5df1
refactor crossing presets to use (new) `crossing:markings` tag
tyrasd 4d12a23
fix spelling of marked crosswalk preset
tyrasd 8e895ea
use term "traffic signals" consistently
tyrasd 84ddd8e
run build
tyrasd 3f9bebd
show crossing field on all crossing presets
tyrasd 417def7
improve naming consistency
tyrasd 95480a0
add preset for `footway=traffic_island` tag, closes #633
tyrasd 2fa3f83
npm run build
tyrasd 506fe2b
Merge branch 'main' into crossing_markings
tyrasd ef116af
add documented options for the crossing:markings tag
tyrasd a7037f9
add translatable strings for crossing:markings values
tyrasd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,17 @@ | ||
| { | ||
| "key": "crossing", | ||
| "type": "combo", | ||
| "label": "Type" | ||
| "label": "Type", | ||
| "options": [ | ||
| "traffic_signals", | ||
| "uncontrolled", | ||
| "unmarked" | ||
| ], | ||
| "strings": { | ||
| "options": { | ||
| "traffic_signals": "Crossing With Traffic Signals", | ||
| "uncontrolled": "Only Road Markings", | ||
| "unmarked": "No Road Markings or Traffic Signals" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "key": "crossing:markings", | ||
| "type": "combo", | ||
| "label": "Crossing Markings", | ||
| "strings": { | ||
| "options": { | ||
| "zebra": "Longitudinal Bars", | ||
| "lines": "Transverse Lines", | ||
| "no": "Unmarked", | ||
| "ladder": "Ladder With Longitudinal Bars", | ||
| "dots": "Dotted Transverse Lines", | ||
| "dashes": "Dashed Transverse Lines", | ||
| "yes": "Marked Somehow", | ||
| "surface": "Surface Treatment Only", | ||
| "ladder:skewed": "Ladder With Diagonal Bars", | ||
| "pictograms": "Painted Pictograms", | ||
| "lines:paired": "Double Transverse Lines", | ||
| "zebra:double": "Triple-Four", | ||
| "zebra:paired": "Paired Longitudinal Bars", | ||
| "zebra:bicolour": "Longitudinal Bars With Alternating Colors", | ||
| "ladder:paired": "Ladder With Paired Longitudinal Bars" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "icon": "temaki-cyclist_crosswalk", | ||
| "fields": [ | ||
| "crossing", | ||
| "surface", | ||
| "tactile_paving", | ||
| "crossing/island", | ||
| "crossing/markings", | ||
| "crossing_raised", | ||
| "access" | ||
| ], | ||
| "geometry": [ | ||
| "line" | ||
| ], | ||
| "tags": { | ||
| "highway": "cycleway", | ||
| "cycleway": "crossing", | ||
| "crossing": "marked" | ||
| }, | ||
| "reference": { | ||
| "key": "crossing", | ||
| "value": "marked" | ||
| }, | ||
| "matchScore": 0.95, | ||
| "name": "Marked Cycle Crossing", | ||
| "searchable": false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
data/presets/highway/cycleway/crossing/traffic_signals.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "icon": "fas-biking", | ||
| "fields": [ | ||
| "crossing", | ||
| "surface", | ||
| "tactile_paving", | ||
| "crossing/island", | ||
| "crossing_raised", | ||
| "button_operated", | ||
| "traffic_signals/sound", | ||
| "traffic_signals/vibration", | ||
| "access" | ||
| ], | ||
| "geometry": [ | ||
| "line" | ||
| ], | ||
| "tags": { | ||
| "highway": "cycleway", | ||
| "cycleway": "crossing", | ||
| "crossing": "traffic_signals" | ||
| }, | ||
| "reference": { | ||
| "key": "crossing", | ||
| "value": "traffic_signals" | ||
| }, | ||
| "terms": [ | ||
| "cycle path crossing", | ||
| "cycleway crossing", | ||
| "bicycle crossing", | ||
| "bike crossing" | ||
| ], | ||
| "matchScore": 0.95, | ||
| "name": "Cycle Crossing With Traffic Signals" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "icon": "temaki-pedestrian_crosswalk", | ||
| "fields": [ | ||
| "crossing", | ||
| "surface", | ||
| "tactile_paving", | ||
| "crossing/island", | ||
| "crossing/markings", | ||
| "crossing_raised", | ||
| "access" | ||
| ], | ||
| "moreFields": [ | ||
| "flashing_lights" | ||
| ], | ||
| "geometry": [ | ||
| "line" | ||
| ], | ||
| "tags": { | ||
| "highway": "footway", | ||
| "footway": "crossing", | ||
| "crossing": "marked" | ||
| }, | ||
| "reference": { | ||
| "key": "crossing", | ||
| "value": "marked" | ||
| }, | ||
| "name": "Marked Crossing", | ||
| "searchable": false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
uncontrolledisn’t just “marked”, it’s “marked without traffic signals”.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, but we also need to keep a balance between keeping the preset names short and including every detail of a preset in its name. I thought that the presence of the dedicated preset for crossings with traffic signals makes it clear enough that the "marked crosswalk" preset is not meant for situations where there is a traffic light. There's also the ℹ️ icon which shows this additional detail for the preset. Last but not least, the name "Marked Crosswalk" worked well in the past for the tag
crossing=markedwhich also implied the absence of traffic signals.Maybe you have a better name for this preset (I'd rather avoid naming it Uncontrolled Crosswalk 😉 )?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think “Marked Crosswalk” is passable as long as there’s a field that can transform it into
crossing=traffic_signals. It looks like you’ve left the Type field in place for this preset, which helps somewhat. Currently, the field isn’t as usable to non-English speakers, but providing localizable option strings is also fraught: several of the most common values mean the same thing – or don’t mean the same thing at all, depending on who you ask – and each has its ardent defenders.