CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-14 07:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust tree for force-rebased entities

Browse Source 
Previously, entities that already existed in the rtree prior to the rebase
option would end up duplicated in the tree afterward.

Fixes #2637
This commit is contained in:
John Firebaugh
2015-05-09 14:38:41 -07:00
parent 1a3e2c0ebf
commit f8a68c879f
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/id/core/tree.js
View File

@@ -45,9 +45,17 @@ iD.Tree = function(head) {
for (var i = 0; i < entities.length; i++) {
var entity = entities[i];
if (!entity.visible || (!force && (head.entities.hasOwnProperty(entity.id) || rectangles[entity.id])))
if (!entity.visible)
continue;
if (head.entities.hasOwnProperty(entity.id) || rectangles[entity.id]) {
if (!force) {
continue;
} else if (rectangles[entity.id]) {
rtree.remove(rectangles[entity.id]);
}
}
insertions[entity.id] = entity;
updateParents(entity, insertions, {});
}