replace RTree with RBush

This commit is contained in:
Vladimir Agafonkin
2013-07-21 17:20:14 +03:00
parent 5cc4d034b8
commit 454eecae8f
8 changed files with 535 additions and 744 deletions
+1 -1
View File
@@ -31,7 +31,7 @@
<script src='../js/lib/d3.value.js'></script>
<script src='../js/lib/d3-compat.js'></script>
<script src='../js/lib/bootstrap-tooltip.js'></script>
<script src='../js/lib/rtree.js'></script>
<script src='../js/lib/rbush.js'></script>
<script src='../js/lib/togeojson.js'></script>
<script src='../js/lib/osmauth.js'></script>
+2 -2
View File
@@ -32,7 +32,7 @@ describe("iD.Tree", function() {
expect(tree.intersects(iD.geo.Extent([0, 0], [1, 1]), g)).to.eql([]);
var node = iD.Node({id: 'n', loc: [0.5, 0.5]});
g = tree.graph().replace(node);
expect(tree.intersects(iD.geo.Extent([0, 0], [1, 1]), g)).to.eql([way, node]);
expect(tree.intersects(iD.geo.Extent([0, 0], [1, 1]), g)).to.eql([node, way]);
});
it("includes entities that used to have missing children, after rebase added them", function() {
@@ -43,7 +43,7 @@ describe("iD.Tree", function() {
var node = iD.Node({id: 'n', loc: [0.5, 0.5]});
base.rebase({ 'n': node });
tree.rebase(['n']);
expect(tree.intersects(iD.geo.Extent([0, 0], [1, 1]), g)).to.eql([way, node]);
expect(tree.intersects(iD.geo.Extent([0, 0], [1, 1]), g)).to.eql([node, way]);
});
it("includes entities within extent, excludes those without", function() {