From aa70030a434a5f7a6cc81803a497afcf7c2d5843 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 11 Nov 2013 18:05:05 +0100 Subject: [PATCH] Move containsCoordinate to ol.geom.Geometry --- src/ol/geom/geometry.js | 18 ++++++++++++++++++ src/ol/geom/multipolygon.js | 13 +------------ src/ol/geom/polygon.js | 13 +------------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/ol/geom/geometry.js b/src/ol/geom/geometry.js index 4c21a53864..59a6045ff5 100644 --- a/src/ol/geom/geometry.js +++ b/src/ol/geom/geometry.js @@ -5,6 +5,7 @@ goog.provide('ol.geom.Geometry'); goog.require('goog.asserts'); goog.require('goog.events.EventTarget'); goog.require('goog.events.EventType'); +goog.require('goog.functions'); goog.require('ol.extent'); @@ -81,6 +82,23 @@ ol.geom.Geometry = function() { goog.inherits(ol.geom.Geometry, goog.events.EventTarget); +/** + * @param {ol.Coordinate} coordinate Coordinate. + * @return {boolean} Contains coordinate. + */ +ol.geom.Geometry.prototype.containsCoordinate = function(coordinate) { + return this.containsXY(coordinate[0], coordinate[1]); +}; + + +/** + * @param {number} x X. + * @param {number} y Y. + * @return {boolean} Contains (x, y). + */ +ol.geom.Geometry.prototype.containsXY = goog.functions.FALSE; + + /** * FIXME empty description for jsdoc */ diff --git a/src/ol/geom/multipolygon.js b/src/ol/geom/multipolygon.js index b25b9de53b..856bb32a8b 100644 --- a/src/ol/geom/multipolygon.js +++ b/src/ol/geom/multipolygon.js @@ -27,18 +27,7 @@ goog.inherits(ol.geom.MultiPolygon, ol.geom.Geometry); /** - * @param {ol.Coordinate} coordinate Coordinate. - * @return {boolean} Contains coordinate. - */ -ol.geom.MultiPolygon.prototype.containsCoordinate = function(coordinate) { - return this.containsXY(coordinate[0], coordinate[1]); -}; - - -/** - * @param {number} x X. - * @param {number} y Y. - * @return {boolean} Contains (x, y). + * @inheritDoc */ ol.geom.MultiPolygon.prototype.containsXY = function(x, y) { return ol.geom.flatLinearRingssContainsXY( diff --git a/src/ol/geom/polygon.js b/src/ol/geom/polygon.js index 20f9d3aa62..025f676b6f 100644 --- a/src/ol/geom/polygon.js +++ b/src/ol/geom/polygon.js @@ -27,18 +27,7 @@ goog.inherits(ol.geom.Polygon, ol.geom.Geometry); /** - * @param {ol.Coordinate} coordinate Coordinate. - * @return {boolean} Contains coordinate. - */ -ol.geom.Polygon.prototype.containsCoordinate = function(coordinate) { - return this.containsXY(coordinate[0], coordinate[1]); -}; - - -/** - * @param {number} x X. - * @param {number} y Y. - * @return {boolean} Contains. + * @inheritDoc */ ol.geom.Polygon.prototype.containsXY = function(x, y) { return ol.geom.flatLinearRingsContainsXY(