CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-14 09:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't flag roads connected only to ferry routes as disconnected (close #6287)

Browse Source 
Use common routable highway tag list for disconnected way check
This commit is contained in:
Quincy Morgan
2019-05-02 14:49:27 -07:00
parent 6a0e157b99
commit ba9fd58fa9
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/validations/disconnected_way.js
View File

@@ -2,23 +2,15 @@ import { t } from '../util/locale';
import { modeDrawLine } from '../modes/draw_line';
import { operationDelete } from '../operations/delete';
import { utilDisplayLabel } from '../util';
import { osmRoutableHighwayTagValues } from '../osm/tags';
import { validationIssue, validationIssueFix } from '../core/validation';
export function validationDisconnectedWay() {
var type = 'disconnected_way';
var highways = {
residential: true, service: true, track: true, unclassified: true, footway: true,
path: true, tertiary: true, secondary: true, primary: true, living_street: true,
cycleway: true, trunk: true, steps: true, motorway: true, motorway_link: true,
pedestrian: true, trunk_link: true, primary_link: true, secondary_link: true,
road: true, tertiary_link: true, bridleway: true, raceway: true, corridor: true,
bus_guideway: true
};
function isTaggedAsHighway(entity) {
return highways[entity.tags.highway];
return osmRoutableHighwayTagValues[entity.tags.highway];
}
@@ -115,13 +107,18 @@ export function validationDisconnectedWay() {
return !parents.some(function(parentWay) {
if (parentWay === way) return false; // ignore the way we're testing
// count connections to ferry routes as connected
if (parentWay.tags.route === 'ferry') return true;
if (isTaggedAsHighway(parentWay)) return true;
return graph.parentMultipolygons(parentWay).some(function(parentRelation) {
return graph.parentRelations(parentWay).some(function(parentRelation) {
// ignore the relation we're testing, if any
if (relation && parentRelation === relation) return false;
return isTaggedAsHighway(parentRelation);
if (parentRelation.tags.type === 'route' &&
parentRelation.tags.route === 'ferry') return true;
return parentRelation.isMultipolygon() && isTaggedAsHighway(parentRelation);
});
});
}