Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion modules/validations/crossing_ways.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,14 @@ export function validationCrossingWays(context) {
return {};
}
if (['marked', 'unmarked', 'traffic_signals', 'uncontrolled'].indexOf(pathFeature.tags.crossing) !== -1) {
// if the path is a crossing, match the crossing type and markings
// if the path is a crossing, match the crossing type and details
var tags = { highway: 'crossing', crossing: pathFeature.tags.crossing };
if ('crossing:markings' in pathFeature.tags) {
tags['crossing:markings'] = pathFeature.tags['crossing:markings'];
}
if ('crossing:island' in pathFeature.tags) {
tags['crossing:island'] = pathFeature.tags['crossing:island'];
}
return tags;
}
// don't add a `crossing` subtag to ambiguous crossings
Expand Down
9 changes: 7 additions & 2 deletions test/spec/validations/crossing_ways.js
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,13 @@ describe('iD.validations.crossing_ways', function () {
verifySingleCrossingIssue(validate(), { highway: 'crossing', crossing: 'marked', 'crossing:markings': 'zebra' });
});

it('does not copy `crossing` and `crossing:markings` if the `crossing` tag has an unknown value', function() {
createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway', crossing: 'zebra', 'crossing:markings': 'zebra' });
it('copies over `crossing:island`', function() {
createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway', crossing: 'marked', 'crossing:island': 'yes' });
verifySingleCrossingIssue(validate(), { highway: 'crossing', crossing: 'marked', 'crossing:island': 'yes' });
});

it('does not copy `crossing`, `crossing:markings`, and `crossing:island` if the `crossing` tag has an unknown value', function() {
createWaysWithOneCrossingPoint({ highway: 'residential' }, { highway: 'footway', crossing: 'zebra', 'crossing:markings': 'zebra', 'crossing:island': 'yes' });
verifySingleCrossingIssue(validate(), { highway: 'crossing' });
});

Expand Down