From fad873d44c4ac739de791e859aa8c2411c6cc98b Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 17 Jul 2012 23:49:47 +0200 Subject: [PATCH] Refine getSize in terms of getWidth and getHeight --- src/ol/rectangle.js | 18 +++++++++++++++++- src/ol/tilebounds.js | 16 ++++++++++++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/ol/rectangle.js b/src/ol/rectangle.js index f537b57f70..5c51090971 100644 --- a/src/ol/rectangle.js +++ b/src/ol/rectangle.js @@ -81,9 +81,25 @@ ol.Rectangle.prototype.getCenter = function() { }; +/** + * @return {number} Height. + */ +ol.Rectangle.prototype.getHeight = function() { + return this.maxY - this.minY; +}; + + /** * @return {goog.math.Size} Size. */ ol.Rectangle.prototype.getSize = function() { - return new goog.math.Size(this.maxX - this.minX, this.maxY - this.minY); + return new goog.math.Size(this.getWidth(), this.getHeight()); +}; + + +/** + * @return {number} Width. + */ +ol.Rectangle.prototype.getWidth = function() { + return this.maxX - this.minX; }; diff --git a/src/ol/tilebounds.js b/src/ol/tilebounds.js index 9638de67c9..58e1383064 100644 --- a/src/ol/tilebounds.js +++ b/src/ol/tilebounds.js @@ -76,9 +76,17 @@ ol.TileBounds.prototype.forEachTileCoord = function(z, f, opt_obj) { /** * @override - * @return {goog.math.Size} Size. + * @return {number} Height. */ -ol.TileBounds.prototype.getSize = function() { - return new goog.math.Size( - this.maxX - this.minX + 1, this.maxY - this.minY + 1); +ol.TileBounds.prototype.getHeight = function() { + return this.maxY - this.minY + 1; +}; + + +/** + * @override + * @return {number} Width. + */ +ol.TileBounds.prototype.getWidth = function() { + return this.maxX - this.minX + 1; };