Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Encourage override of toBBox, compareMinX, compareMinY for CSP issues #14

Merged
merged 1 commit into from
Nov 21, 2013
Merged

Encourage override of toBBox, compareMinX, compareMinY for CSP issues #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions rbush.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ function rbush(maxEntries, format) {
this._maxEntries = Math.max(4, maxEntries || 9);
this._minEntries = Math.max(2, Math.ceil(this._maxEntries * 0.4));

this._initFormat(format);
if (format) {
this._initFormat(format);
}

this.clear();
}
Expand All @@ -35,7 +37,7 @@ rbush.prototype = {
while (node) {
for (i = 0, len = node.children.length; i < len; i++) {
child = node.children[i];
childBBox = node.leaf ? this._toBBox(child) : child.bbox;
childBBox = node.leaf ? this.toBBox(child) : child.bbox;

if (this._intersects(bbox, childBBox)) {
(node.leaf ? result : nodesToSearch).push(child);
Expand Down Expand Up @@ -105,7 +107,7 @@ rbush.prototype = {
if (!item) { return this; }

var node = this.data,
bbox = this._toBBox(item),
bbox = this.toBBox(item),
path = [],
indexes = [],
i, parent, index, goingUp;
Expand Down Expand Up @@ -152,6 +154,12 @@ rbush.prototype = {
return this;
},

toBBox: function (item) { return item; },

compareMinX: function (a, b) { return a[0] - b[0]; },

compareMinY: function (a, b) { return a[1] - b[1]; },

toJSON: function () { return this.data; },

fromJSON: function (data) {
Expand Down Expand Up @@ -182,7 +190,7 @@ rbush.prototype = {
// target number of root entries to maximize storage utilization
M = Math.ceil(N / Math.pow(M, height - 1));

items.sort(this._compareMinX);
items.sort(this.compareMinX);
}

// TODO eliminate recursion?
Expand All @@ -194,7 +202,7 @@ rbush.prototype = {

var N1 = Math.ceil(N / M) * Math.ceil(Math.sqrt(M)),
N2 = Math.ceil(N / M),
compare = level % 2 === 1 ? this._compareMinX : this._compareMinY,
compare = level % 2 === 1 ? this.compareMinX : this.compareMinY,
i, j, slice, sliceLen, childNode;

// split the items into M mostly square tiles
Expand Down Expand Up @@ -252,7 +260,7 @@ rbush.prototype = {

_insert: function (item, level, isNode, root) {

var bbox = isNode ? item.bbox : this._toBBox(item),
var bbox = isNode ? item.bbox : this.toBBox(item),
insertPath = [];

// find the best node for accommodating the item, saving all nodes along the path too
Expand Down Expand Up @@ -348,8 +356,8 @@ rbush.prototype = {
// sorts node children by the best axis for split
_chooseSplitAxis: function (node, m, M) {

var compareMinX = node.leaf ? this._compareMinX : this._compareNodeMinX,
compareMinY = node.leaf ? this._compareMinY : this._compareNodeMinY,
var compareMinX = node.leaf ? this.compareMinX : this._compareNodeMinX,
compareMinY = node.leaf ? this.compareMinY : this._compareNodeMinY,
xMargin = this._allDistMargin(node, m, M, compareMinX),
yMargin = this._allDistMargin(node, m, M, compareMinY);

Expand All @@ -373,13 +381,13 @@ rbush.prototype = {

for (i = m; i < M - m; i++) {
child = node.children[i];
this._extend(leftBBox, node.leaf ? this._toBBox(child) : child.bbox);
this._extend(leftBBox, node.leaf ? this.toBBox(child) : child.bbox);
margin += this._margin(leftBBox);
}

for (i = M - m - 1; i >= 0; i--) {
child = node.children[i];
this._extend(rightBBox, node.leaf ? this._toBBox(child) : child.bbox);
this._extend(rightBBox, node.leaf ? this.toBBox(child) : child.bbox);
margin += this._margin(rightBBox);
}

Expand All @@ -392,7 +400,7 @@ rbush.prototype = {

for (var i = k, child; i < p; i++) {
child = node.children[i];
this._extend(bbox, node.leaf ? this._toBBox(child) : child.bbox);
this._extend(bbox, node.leaf ? this.toBBox(child) : child.bbox);
}

return bbox;
Expand All @@ -404,7 +412,7 @@ rbush.prototype = {

for (var i = 0, len = node.children.length, child; i < len; i++) {
child = node.children[i];
this._extend(node.bbox, node.leaf ? this._toBBox(child) : child.bbox);
this._extend(node.bbox, node.leaf ? this.toBBox(child) : child.bbox);
}
},

Expand Down Expand Up @@ -471,7 +479,6 @@ rbush.prototype = {

_initFormat: function (format) {
// data format (minX, minY, maxX, maxY accessors)
format = format || ['[0]', '[1]', '[2]', '[3]'];

// uses eval-type function compilation instead of just accepting a toBBox function
// because the algorithms are very sensitive to sorting functions performance,
Expand All @@ -481,10 +488,10 @@ rbush.prototype = {

var compareArr = ['return a', ' - b', ';'];

this._compareMinX = new Function('a', 'b', compareArr.join(format[0]));
this._compareMinY = new Function('a', 'b', compareArr.join(format[1]));
this.compareMinX = new Function('a', 'b', compareArr.join(format[0]));
this.compareMinY = new Function('a', 'b', compareArr.join(format[1]));

this._toBBox = new Function('a', 'return [a' + format.join(', a') + '];');
this.toBBox = new Function('a', 'return [a' + format.join(', a') + '];');
}
};

Expand Down
59 changes: 58 additions & 1 deletion test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,64 @@ describe('rbush', function () {
it('accepts a format argument to customize the data format', function () {

var tree = rbush(4, ['.minLng', '.minLat', '.maxLng', '.maxLat']);
assert.deepEqual(tree._toBBox({minLng: 1, minLat: 2, maxLng: 3, maxLat: 4}), [1, 2, 3, 4]);
assert.deepEqual(tree.toBBox({minLng: 1, minLat: 2, maxLng: 3, maxLat: 4}), [1, 2, 3, 4]);
});
});

describe('override toBBox, compareMinX, compareMinY', function () {
it('allows custom data structures to be transformed', function () {

var tree = rbush(4);
tree.toBBox = function (item) {
return [item.minLng, item.minLat, item.maxLng, item.maxLat];
};
tree.compareMinX = function (a, b) {
return a.minLng - b.minLng;
};
tree.compareMinY = function (a, b) {
return a.minLat - b.minLat;
};

var data = [
{minLng: -115, minLat: 45, maxLng: -105, maxLat: 55},
{minLng: 105, minLat: 45, maxLng: 115, maxLat: 55},
{minLng: 105, minLat: -55, maxLng: 115, maxLat: -45},
{minLng: -115, minLat: -55, maxLng: -105, maxLat: -45}
];

tree.load(data);

function byLngLat (a, b) {
return a.minLng - b.minLng || a.minLat - b.minLat;
}

assert.deepEqual(tree.search([-180, -90, 180, 90]).sort(byLngLat), [
{minLng: -115, minLat: 45, maxLng: -105, maxLat: 55},
{minLng: 105, minLat: 45, maxLng: 115, maxLat: 55},
{minLng: 105, minLat: -55, maxLng: 115, maxLat: -45},
{minLng: -115, minLat: -55, maxLng: -105, maxLat: -45}
].sort(byLngLat));

assert.deepEqual(tree.search([-180, -90, 0, 90]).sort(byLngLat), [
{minLng: -115, minLat: 45, maxLng: -105, maxLat: 55},
{minLng: -115, minLat: -55, maxLng: -105, maxLat: -45}
].sort(byLngLat));

assert.deepEqual(tree.search([0, -90, 180, 90]).sort(byLngLat), [
{minLng: 105, minLat: 45, maxLng: 115, maxLat: 55},
{minLng: 105, minLat: -55, maxLng: 115, maxLat: -45}
].sort(byLngLat));

assert.deepEqual(tree.search([-180, 0, 180, 90]).sort(byLngLat), [
{minLng: -115, minLat: 45, maxLng: -105, maxLat: 55},
{minLng: 105, minLat: 45, maxLng: 115, maxLat: 55}
].sort(byLngLat));

assert.deepEqual(tree.search([-180, -90, 180, 0]).sort(byLngLat), [
{minLng: 105, minLat: -55, maxLng: 115, maxLat: -45},
{minLng: -115, minLat: -55, maxLng: -105, maxLat: -45}
].sort(byLngLat));

});
});

Expand Down
2 changes: 1 addition & 1 deletion viz/viz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function search(e) {
}

function remove() {
data.sort(tree._compareMinX);
data.sort(tree.compareMinX);
console.time('remove 10000');
for (var i = 0; i < 10000; i++) {
tree.remove(data[i]);
Expand Down