ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changing extent structure back to single array: [minX, minY, maxX, maxY]

Browse Source 
This means we'll have to have a new structure and new methods for 3D envelopes.
This commit is contained in:
Tim Schaub
2013-09-15 00:15:24 -06:00
parent de0e8aeced
commit e806f51b3d
63 changed files with 379 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
test/spec/ol/structs/rtree.test.js
View File

@@ -11,11 +11,11 @@ describe('ol.structs.RTree', function() {
while (i > 0) {
var min = [Math.random() * 10000, Math.random() * 10000];
var max = [min[0] + Math.random() * 500, min[1] + Math.random() * 500];
var bounds = [min, max];
var bounds = [min[0], min[1], max[0], max[1]];
rTree.insert(bounds, 'JUST A TEST OBJECT!_' + i);
i--;
}
expect(goog.object.getCount(rTree.search([[0, 0], [10600, 10600]])))
expect(goog.object.getCount(rTree.search([0, 0, 10600, 10600])))
.to.be(1000);
});
it('can insert 1k more objects', function() {
@@ -23,11 +23,11 @@ describe('ol.structs.RTree', function() {
while (i > 0) {
var min = [Math.random() * 10000, Math.random() * 10000];
var max = [min[0] + Math.random() * 500, min[1] + Math.random() * 500];
var bounds = [min, max];
var bounds = [min[0], min[1], max[0], max[1]];
rTree.insert(bounds, 'JUST A TEST OBJECT!_' + i);
i--;
}
expect(goog.object.getCount(rTree.search([[0, 0], [10600, 10600]])))
expect(goog.object.getCount(rTree.search([0, 0, 10600, 10600])))
.to.be(2000);
});
});
@@ -40,7 +40,7 @@ describe('ol.structs.RTree', function() {
var min = [-(Math.random() * 10000 + 501),
-(Math.random() * 10000 + 501)];
var max = [min[0] + Math.random() * 500, min[1] + Math.random() * 500];
var bounds = [min, max];
var bounds = [min[0], min[1], max[0], max[1]];
len += rTree.search(bounds).length;
i--;
}
@@ -52,7 +52,7 @@ describe('ol.structs.RTree', function() {
while (i > 0) {
var min = [Math.random() * 10000, Math.random() * 10000];
var max = [min[0] + Math.random() * 500, min[1] + Math.random() * 500];
var bounds = [min, max];
var bounds = [min[0], min[1], max[0], max[1]];
len += rTree.search(bounds).length;
i--;
}
@@ -63,12 +63,12 @@ describe('ol.structs.RTree', function() {
describe('deletion', function() {
var len = 0;
it('can delete half the RTree', function() {
var bounds = [[5000, 0], [10500, 10500]];
var bounds = [5000, 0, 10500, 10500];
len += rTree.remove(bounds).length;
expect(len).to.not.be(0);
});
it('can delete the other half of the RTree', function() {
var bounds = [[0, 0], [5000, 10500]];
var bounds = [0, 0, 5000, 10500];
len += rTree.remove(bounds).length;
expect(len).to.be(2000);
});
@@ -77,42 +77,42 @@ describe('ol.structs.RTree', function() {
describe('result plausibility and structure', function() {
it('filters by rectangle', function() {
rTree.insert([[0, 0], [1, 1]], 1);
rTree.insert([[1, 1], [4, 4]], 2);
rTree.insert([[2, 2], [3, 3]], 3);
rTree.insert([[-5, -5], [-4, -4]], 4);
rTree.insert([[-4, -4], [-1, -1]], 5);
rTree.insert([[-3, -3], [-2, -2]], 6);
rTree.insert([0, 0, 1, 1], 1);
rTree.insert([1, 1, 4, 4], 2);
rTree.insert([2, 2, 3, 3], 3);
rTree.insert([-5, -5, -4, -4], 4);
rTree.insert([-4, -4, -1, -1], 5);
rTree.insert([-3, -3, -2, -2], 6);
var result;
result = goog.object.getValues(rTree.search([[2, 2], [3, 3]]));
result = goog.object.getValues(rTree.search([2, 2, 3, 3]));
expect(result).to.contain(2);
expect(result).to.contain(3);
expect(result.length).to.be(2);
result = goog.object.getValues(rTree.search([[-1, -1], [2, 2]]));
result = goog.object.getValues(rTree.search([-1, -1, 2, 2]));
expect(result).to.contain(1);
expect(result).to.contain(2);
expect(result).to.contain(3);
expect(result).to.contain(5);
expect(result.length).to.be(4);
expect(goog.object.getCount(rTree.search([[5, 5], [6, 6]]))).to.be(0);
expect(goog.object.getCount(rTree.search([5, 5, 6, 6]))).to.be(0);
});
it('filters by type', function() {
rTree.insert([[2, 2], [3, 3]], 7, 'type1');
rTree.insert([2, 2, 3, 3], 7, 'type1');
var result;
result = rTree.search([[1, 2], [4, 4]], 'type1');
result = rTree.search([1, 2, 4, 4], 'type1');
expect(result).to.contain(7);
expect(result.length).to.be(1);
result = rTree.search([[1, 2], [4, 4]]);
result = rTree.search([1, 2, 4, 4]);
expect(result.length).to.be(3);
});
it('can return objects instead of arrays', function() {
var obj = {foo: 'bar'};
rTree.insert([[5, 5], [5, 5]], obj);
var result = rTree.searchReturningObject([[4, 4], [6, 6]]);
rTree.insert([5, 5, 5, 5], obj);
var result = rTree.searchReturningObject([4, 4, 6, 6]);
expect(result[goog.getUid(obj)]).to.equal(obj);
});