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

Exclude current way when checking if childnode is used

Browse Source
This commit is contained in:
Bryan Housel
2015-03-02 22:47:13 -05:00
parent e3139e250e
commit 38f833d19c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/merge_remote_changes.js
+5 -4
View File
@@ -64,9 +64,10 @@ iD.actions.MergeRemoteChanges = function(id, localGraph, remoteGraph, formatUser
function mergeChildren(target, children, updates, graph) {
function isUsed(node) {
function isUsed(node, target) {
var parentWays = _.pluck(graph.parentWays(node), 'id');
return node.hasInterestingTags() ||
graph.parentWays(node).length > 0 ||
_.without(parentWays, target.id).length > 0 ||
graph.parentRelations(node).length > 0;
}
@@ -76,9 +77,9 @@ iD.actions.MergeRemoteChanges = function(id, localGraph, remoteGraph, formatUser
var id = children[i],
node = graph.hasEntity(id);
// remove unused childNodes.
// remove unused childNodes..
if (target.nodes.indexOf(id) === -1) {
if (node && !isUsed(node)) {
if (node && !isUsed(node, target)) {
updates.removeIds.push(id);
}
continue;