From 41175a475f6341f5656bfc1e953a72f42ce81fba Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 17 Jul 2012 15:51:13 +0200 Subject: [PATCH] Add ol.Rectangle.intersects --- src/ol/rectangle.js | 13 ++++++++++++ src/ol/rectangle_test.js | 43 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/src/ol/rectangle.js b/src/ol/rectangle.js index 404850af0a..4c665acc0a 100644 --- a/src/ol/rectangle.js +++ b/src/ol/rectangle.js @@ -40,6 +40,19 @@ ol.Rectangle = function(minX, minY, maxX, maxY) { }; +/** + * @param {ol.Rectangle} rectangle1 Rectangle. + * @param {ol.Rectangle} rectangle2 Rectangle. + * @return {boolean} Intersects. + */ +ol.Rectangle.intersects = function(rectangle1, rectangle2) { + return rectangle1.minX <= rectangle2.maxX && + rectangle1.maxX >= rectangle2.minX && + rectangle1.minY <= rectangle2.maxY && + rectangle1.maxY >= rectangle2.minY; +}; + + /** * @return {ol.Rectangle} Clone. */ diff --git a/src/ol/rectangle_test.js b/src/ol/rectangle_test.js index 5e6135c9fd..c33771736b 100644 --- a/src/ol/rectangle_test.js +++ b/src/ol/rectangle_test.js @@ -56,3 +56,46 @@ function testContainsNegative() { assertFalse(rectangle.contains(new goog.math.Coordinate(4, 4))); assertFalse(rectangle.contains(new goog.math.Coordinate(4, 5))); } + + +function testIntersects() { + + var rectangle1 = new ol.Rectangle(50, 50, 100, 100); + + function assertIntersects(rectangle2) { + assertTrue(rectangle1 + ' expected to intersect ' + rectangle2, + ol.Rectangle.intersects(rectangle1, rectangle2)); + } + function assertNotIntersects(rectangle2) { + assertFalse(rectangle1 + ' expected to not intersect ' + rectangle2, + ol.Rectangle.intersects(rectangle1, rectangle2)); + } + + assertIntersects(rectangle1); + assertIntersects(new ol.Rectangle(20, 20, 80, 80)); + assertIntersects(new ol.Rectangle(20, 50, 80, 100)); + assertIntersects(new ol.Rectangle(20, 80, 80, 120)); + assertIntersects(new ol.Rectangle(50, 20, 100, 80)); + assertIntersects(new ol.Rectangle(50, 80, 100, 120)); + assertIntersects(new ol.Rectangle(80, 20, 120, 80)); + assertIntersects(new ol.Rectangle(80, 50, 120, 100)); + assertIntersects(new ol.Rectangle(80, 80, 120, 120)); + assertIntersects(new ol.Rectangle(20, 20, 120, 120)); + assertIntersects(new ol.Rectangle(70, 70, 80, 80)); + assertNotIntersects(new ol.Rectangle(10, 10, 30, 30)); + assertNotIntersects(new ol.Rectangle(30, 10, 70, 30)); + assertNotIntersects(new ol.Rectangle(50, 10, 100, 30)); + assertNotIntersects(new ol.Rectangle(80, 10, 120, 30)); + assertNotIntersects(new ol.Rectangle(120, 10, 140, 30)); + assertNotIntersects(new ol.Rectangle(10, 30, 30, 70)); + assertNotIntersects(new ol.Rectangle(120, 30, 140, 70)); + assertNotIntersects(new ol.Rectangle(10, 50, 30, 100)); + assertNotIntersects(new ol.Rectangle(120, 50, 140, 100)); + assertNotIntersects(new ol.Rectangle(10, 80, 30, 120)); + assertNotIntersects(new ol.Rectangle(120, 80, 140, 120)); + assertNotIntersects(new ol.Rectangle(10, 120, 30, 140)); + assertNotIntersects(new ol.Rectangle(30, 120, 70, 140)); + assertNotIntersects(new ol.Rectangle(50, 120, 100, 140)); + assertNotIntersects(new ol.Rectangle(80, 120, 120, 140)); + assertNotIntersects(new ol.Rectangle(120, 120, 140, 140)); +}