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.

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

Add deleteInRange, clear, filter #62

Merged
merged 9 commits into from
Oct 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 38 additions & 1 deletion quadtree.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ class Point {
}

class Rectangle {
constructor(x, y, w, h) {
constructor(x, y, w, h, data) {
this.x = x;
this.y = y;
this.w = w;
this.h = h;

this.left = x - w / 2;
this.right = x + w / 2;
this.top = y - h / 2;
Expand Down Expand Up @@ -182,6 +183,18 @@ class QuadTree {
}
}

clear() {
this.points = [];

if (this.divided) {
this.divided = false;
delete this.northwest;
delete this.northeast;
delete this.southwest;
delete this.southeast;
}
}

static create() {
if (arguments.length === 0) {
if (typeof width === "undefined") {
Expand Down Expand Up @@ -370,6 +383,18 @@ class QuadTree {
return found;
}

deleteInRange(range) {
if (this.divided) {
this.northwest.deleteInRange(range);
this.northeast.deleteInRange(range);
this.southwest.deleteInRange(range);
this.southeast.deleteInRange(range);
}

// Delete points with range
this.points = this.points.filter(point => !range.contains(point));
}

closest(searchPoint, maxCount = 1, maxDistance = Infinity) {
if (typeof searchPoint === "undefined") {
throw TypeError("Method 'closest' needs a point");
Expand Down Expand Up @@ -429,6 +454,18 @@ class QuadTree {
}
}

filter(fn) {
let filtered = new QuadTree(this.boundary, this.capacity);

this.forEach((point) => {
if (fn(point)) {
filtered.insert(point);
}
});

return filtered;
}

merge(other, capacity) {
let left = Math.min(this.boundary.left, other.boundary.left);
let right = Math.max(this.boundary.right, other.boundary.right);
Expand Down
88 changes: 88 additions & 0 deletions test/quadtree.delete.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
const { expect } = require("chai");
const { QuadTree, Point, Rectangle, Circle } = require("../quadtree");

describe("QuadTree.deleteInRange", () => {
let qt;

beforeEach(() => {
qt = new QuadTree(new Rectangle(0, 0, 200, 200), 4);
qt.insert(new Point(-100, 10));
qt.insert(new Point( 0, 10));
qt.insert(new Point( 100, 10));
});

it("delete within a Rectangle", () => {
qt.deleteInRange(new Rectangle(25, 0, 100, 100)); // delete one
expect(qt.length).to.equal(2);
});
it("delete nothing outside Rectangle", () => {
qt.deleteInRange(new Rectangle(25, 100, 1, 1));
expect(qt.length).to.equal(3);
});

it("delete within a Circle", () => {
qt.deleteInRange(new Circle(0, 0, 50, 50)); // delete one
expect(qt.length).to.equal(2);
});
it("delete nothing outside Circle", () => {
qt.deleteInRange(new Circle(25, 100, 1, 1));
expect(qt.length).to.equal(3);
});
});

describe("QuadTree.filter", () => {
beforeEach(() => {
qt = new QuadTree(new Rectangle(0, 0, 200, 200), 2);
qt.insert(new Point(-100, 10));
qt.insert(new Point( 0, 10));
qt.insert(new Point( 100, 10));
});

it("will filter all", () => {
const filtered = qt.filter((point) => false);
expect(filtered.length).to.equal(0);
});
it("will filter none", () => {
const filtered = qt.filter((point) => true);
expect(filtered.length).to.equal(3);
});
it("will filter some", () => {
const filtered = qt.filter((point) => point.x === 0);
expect(filtered.length).to.equal(1);
});

it("does not alter the original", () => {
const original = qt.toJSON();
qt.filter((point) => point.x === 0);
expect(qt.toJSON()).to.deep.equal(original);
});
});

describe("QuadTree.clear", () => {
let qt;

beforeEach(() => {
qt = new QuadTree(new Rectangle(0, 0, 200, 200), 2);
qt.insert(new Point(-100, 10));
qt.insert(new Point( 0, 10));
qt.insert(new Point( 100, 10));
});

it("clears points", () => {
expect(qt.length).to.equal(3);
qt.clear();
expect(qt.length).to.equal(0);
});

it("resets division", () => {
expect(qt.divided).to.be.true;
qt.clear();
expect(qt.divided).to.be.false;
});

it("keeps working after clear", () => {
qt.clear();
qt.insert(new Point(10, 10));
expect(qt.length).to.equal(1);
});
});