CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-23 16:49:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reduce duplicate code in almost junction validation

Browse Source
This commit is contained in:
Quincy Morgan
2019-04-03 15:44:45 -07:00
parent cbae090f08
commit 6641f62685
1 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/validations/almost_junction.js
+22 -39
View File
@@ -49,49 +49,32 @@ export function validationAlmostJunction() {
var results = [];
if (way.isClosed()) return results;
var nidFirst = way.nodes[0];
var nidLast = way.nodes[way.nodes.length - 1];
var nodeFirst = graph.entity(nidFirst);
var nodeLast = graph.entity(nidLast);
var testNodes, index;
var testNodes;
var endpointIndicies = [0, way.nodes.length - 1];
endpointIndicies.forEach(function(nodeIndex) {
if (isExtendableCandidate(nodeFirst, way, graph)) {
var connNearFirst = canConnectByExtend(way, 0, graph, tree);
if (connNearFirst) {
testNodes = graph.childNodes(way).slice(); // shallow copy
index = 0; // first
testNodes[index] = testNodes[index].move(connNearFirst.cross_loc);
var nodeID = way.nodes[nodeIndex];
var node = graph.entity(nodeID);
// don't flag issue if connecting the ways would cause self-intersection
if (!geoHasSelfIntersections(testNodes, nodeFirst.id)) {
results.push({
node: nodeFirst,
wid: connNearFirst.wid,
edge: connNearFirst.edge,
cross_loc: connNearFirst.cross_loc
});
}
}
}
if (!isExtendableCandidate(node, way, graph)) return;
if (isExtendableCandidate(nodeLast, way, graph)) {
var connNearLast = canConnectByExtend(way, way.nodes.length - 1, graph, tree);
if (connNearLast) {
testNodes = graph.childNodes(way).slice(); // shallow copy
index = testNodes.length - 1; // last
testNodes[index] = testNodes[index].move(connNearLast.cross_loc);
var connectionInfo = canConnectByExtend(way, nodeIndex, graph, tree);
if (!connectionInfo) return;
testNodes = graph.childNodes(way).slice(); // shallow copy
testNodes[nodeIndex] = testNodes[nodeIndex].move(connectionInfo.cross_loc);
// don't flag issue if connecting the ways would cause self-intersection
if (geoHasSelfIntersections(testNodes, nodeID)) return;
results.push({
node: node,
wid: connectionInfo.wid,
edge: connectionInfo.edge,
cross_loc: connectionInfo.cross_loc
});
});
// don't flag issue if connecting the ways would cause self-intersection
if (!geoHasSelfIntersections(testNodes, nodeLast.id)) {
results.push({
node: nodeLast,
wid: connNearLast.wid,
edge: connNearLast.edge,
cross_loc: connNearLast.cross_loc
});
}
}
}
return results;
}