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

Fix issue with deleting a member from a relation with a duplicate entity but different roles (close #6504)

Browse Source
This commit is contained in:
Quincy Morgan
2019-06-11 09:08:44 -04:00
parent e82beb8ef9
commit aa7bf74a7f
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/core/graph.js
View File

@@ -226,25 +226,30 @@ coreGraph.prototype = {
}
} else if (type === 'relation') { // Update parentRels
// diff only on the IDs since the same entity can be a member multiple times with different roles
var oldentityMemberIDs = oldentity ? oldentity.members.map(function(m) { return m.id; }) : [];
var entityMemberIDs = entity ? entity.members.map(function(m) { return m.id; }) : [];
if (oldentity && entity) {
removed = utilArrayDifference(oldentity.members, entity.members);
added = utilArrayDifference(entity.members, oldentity.members);
removed = utilArrayDifference(oldentityMemberIDs, entityMemberIDs);
added = utilArrayDifference(entityMemberIDs, oldentityMemberIDs);
} else if (oldentity) {
removed = oldentity.members;
removed = oldentityMemberIDs;
added = [];
} else if (entity) {
removed = [];
added = entity.members;
added = entityMemberIDs;
}
for (i = 0; i < removed.length; i++) {
// make a copy of prototype property, store as own property, and update..
parentRels[removed[i].id] = new Set(parentRels[removed[i].id]);
parentRels[removed[i].id].delete(oldentity.id);
parentRels[removed[i]] = new Set(parentRels[removed[i]]);
parentRels[removed[i]].delete(oldentity.id);
}
for (i = 0; i < added.length; i++) {
// make a copy of prototype property, store as own property, and update..
parentRels[added[i].id] = new Set(parentRels[added[i].id]);
parentRels[added[i].id].add(entity.id);
parentRels[added[i]] = new Set(parentRels[added[i]]);
parentRels[added[i]].add(entity.id);
}
}
},