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

Merge pull request #1980 from tyrasd/patch-fix-delete-after-action

Browse Source 
don't load parent into tree repeatedly when multiple childs are changed
This commit is contained in:
John Firebaugh
2013-11-19 09:48:06 -08:00
parent eb700e1b7f 2cf4c20a47
commit 862248e49e
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,14 +22,14 @@ iD.Tree = function(head) {
head.parentWays(entity).forEach(function(parent) {
if (rectangles[parent.id]) {
rtree.remove(rectangles[parent.id]);
insertions.push(entityRectangle(parent));
insertions.push(parent);
}
});
head.parentRelations(entity).forEach(function(parent) {
if (rectangles[parent.id]) {
rtree.remove(rectangles[parent.id]);
insertions.push(entityRectangle(parent));
insertions.push(parent);
}
updateParents(parent, insertions);
});
@@ -44,10 +44,11 @@ iD.Tree = function(head) {
if (head.entities.hasOwnProperty(entity.id) || rectangles[entity.id])
return;
insertions.push(entityRectangle(entity));
insertions.push(entity);
updateParents(entity, insertions);
});
insertions = _.unique(insertions).map(entityRectangle);
rtree.load(insertions);
return tree;
@@ -67,14 +68,15 @@ iD.Tree = function(head) {
diff.modified().forEach(function(entity) {
rtree.remove(rectangles[entity.id]);
insertions.push(entityRectangle(entity));
insertions.push(entity);
updateParents(entity, insertions);
});
diff.created().forEach(function(entity) {
insertions.push(entityRectangle(entity));
insertions.push(entity);
});
insertions = _.unique(insertions).map(entityRectangle);
rtree.load(insertions);
}

20
test/spec/core/tree.js
View File

@@ -118,6 +118,26 @@ describe("iD.Tree", function() {
expect(tree.intersects(extent, graph)).to.eql([n1]);
});
it("don't include parent way multiple times when multiple child nodes are moved", function() {
// checks against the following regression: https://github.com/systemed/iD/issues/1978
var graph = iD.Graph(),
tree = iD.Tree(graph),
n1 = iD.Node({id: 'n1', loc: [1, 1]}),
n2 = iD.Node({id: 'n2', loc: [3, 3]}),
way = iD.Way({nodes: ['n1', 'n2']}),
extent = iD.geo.Extent([0, 0], [4, 4]);
graph = graph.replace(n1).replace(n2).replace(way);
expect(tree.intersects(extent, graph)).to.eql([n1, n2, way]);
graph = graph.replace(n1.move([1.1,1.1])).replace(n2.move([2.1,2.1]));
expect(
_.pluck(tree.intersects(extent, graph),'id').sort()
).to.eql(
_.pluck([n1, n2, way],'id').sort()
);
});
it("doesn't include removed entities", function() {
var graph = iD.Graph(),
tree = iD.Tree(graph),