CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-20 07:25:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6284 from Bonkles/id-5869

Browse Source 
Improve validation for disconnected highways #5869
This commit is contained in:
Bryan Housel
2019-05-05 22:17:12 -04:00
committed by GitHub
parent 4d7bc54eb4 ec01933d84
commit 77801a3ecd
4 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/validations/disconnected_way.js
+45 -3
View File
@@ -12,13 +12,20 @@ export function validationDisconnectedWay() {
function isTaggedAsHighway(entity) {
return osmRoutableHighwayTagValues[entity.tags.highway];
}
function isNewRoad(entityId) {
return entityId[0] === 'w' && entityId[1] === '-';
}
var validation = function checkDisconnectedWay(entity, context) {
var graph = context.graph();
if (!isTaggedAsHighway(entity)) return [];
if (!isDisconnectedWay(entity) && !isDisconnectedMultipolygon(entity)) return [];
if (!isDisconnectedWay(entity) && !isDisconnectedMultipolygon(entity)
&& !isNewRoadUnreachableFromExistingRoads(entity, graph)) {
return [];
}
var entityLabel = utilDisplayLabel(entity, context);
var fixes = [];
@@ -79,7 +86,14 @@ export function validationDisconnectedWay() {
return [new validationIssue({
type: type,
severity: 'warning',
message: t('issues.disconnected_way.highway.message', { highway: entityLabel }),
message: (isNewRoad(entity.id)
? t('issues.disconnected_way.highway.message_new_road', { highway: entityLabel })
: t('issues.disconnected_way.highway.message', { highway: entityLabel })
),
tooltip: (isNewRoad(entity.id)
? t('issues.disconnected_way.highway.reference_new_road')
: t('issues.disconnected_way.highway.reference')
),
reference: showReference,
entityIds: [entity.id],
fixes: fixes
@@ -138,6 +152,34 @@ export function validationDisconnectedWay() {
}
// check if entity is a new road that cannot eventually connect to any
// existing roads
function isNewRoadUnreachableFromExistingRoads(entity) {
if (!isNewRoad(entity.id) || !isTaggedAsHighway(entity)) return false;
var visitedWids = new Set();
return !connectToExistingRoadOrEntrance(entity, visitedWids);
}
function connectToExistingRoadOrEntrance(way, visitedWids) {
visitedWids.add(way.id);
for (var i = 0; i < way.nodes.length; i++) {
var vertex = graph.entity(way.nodes[i]);
if (vertex.tags.entrance && vertex.tags.entrance !== 'no') return true;
var parentWays = graph.parentWays(vertex);
for (var j = 0; j < parentWays.length; j++) {
var parentWay = parentWays[j];
if (visitedWids.has(parentWay.id)) continue;
if (isTaggedAsHighway(parentWay) && !isNewRoad(parentWay.id)) return true;
if (connectToExistingRoadOrEntrance(parentWay, visitedWids)) return true;
}
}
return false;
}
function isDisconnectedMultipolygon(entity) {
if (entity.type !== 'relation' || !entity.isMultipolygon()) return false;