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

Fix bug where end nodes being on top of each other gave false positive

Browse Source
This commit is contained in:
J Guthrie
2019-01-22 14:29:45 +00:00
parent 631ace27d5
commit 6a3a0251d0
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/actions/join.js
View File

@@ -1,9 +1,10 @@
import _extend from 'lodash-es/extend';
import _groupBy from 'lodash-es/groupBy';
import _intersection from 'lodash-es/intersection';
import { actionDeleteWay } from './delete_way';
import { osmIsInterestingTag, osmJoinWays } from '../osm';
import { geoPathHasIntersections } from '../geo';
import { geoPathIntersections } from '../geo';
// Join ways at the end node they share.
@@ -81,7 +82,14 @@ export function actionJoin(ids) {
var path2 = graph.childNodes(graph.entity(ids[1])).map(function(e) {
return e.loc;
});
if (geoPathHasIntersections(path1, path2)) return 'paths_intersect';
var intersections = geoPathIntersections(path1, path2);
// Check if intersections are just nodes lying on top of each other/the line,
// as opposed to crossing it
if (_intersection(
joined[0].nodes.map(function(n) { return n.loc.toString(); }),
intersections.map(function(n) { return n.toString(); })
).length != intersections.length) return 'paths_intersect';
}
}