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

Don't flag almost junctions for points endpoints that also occur earlier in the way

Browse Source
This commit is contained in:
Quincy Morgan
2019-02-19 09:16:32 -05:00
parent 2481298cf0
commit b43796a4c7
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/validations/almost_junction.js
+22 -4
View File
@@ -31,18 +31,36 @@ export function validationAlmostJunction() {
return node.tags.noexit && node.tags.noexit === 'yes';
}
function isExtendableCandidate(node, way, graph) {
if (isNoexit(node) || graph.parentWays(node).length !== 1) {
return false;
}
var occurences = 0;
for (var index in way.nodes) {
if (way.nodes[index] === node.id) {
occurences += 1;
if (occurences > 1) {
return false;
}
}
}
return true;
}
function findConnectableEndNodesByExtension(way, graph, tree) {
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);
if (nidFirst === nidLast) return results;
var testNodes;
if (!isNoexit(nodeFirst) && graph.parentWays(nodeFirst).length === 1) {
if (isExtendableCandidate(nodeFirst, way, graph)) {
var connNearFirst = canConnectByExtend(way, 0, graph, tree);
if (connNearFirst !== null) {
testNodes = _cloneDeep(graph.childNodes(way));
@@ -59,7 +77,7 @@ export function validationAlmostJunction() {
}
}
if (!isNoexit(nodeLast) && graph.parentWays(nodeLast).length === 1) {
if (isExtendableCandidate(nodeLast, way, graph)) {
var connNearLast = canConnectByExtend(way, way.nodes.length - 1, graph, tree);
if (connNearLast !== null) {
testNodes = _cloneDeep(graph.childNodes(way));