From 0da8b0ae7f7e19e95eb13de8d706b90fb6abb7b7 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 16 Apr 2013 13:21:27 +0200 Subject: [PATCH] Don't inherit ol.PixelBounds from ol.Rectangle --- src/ol/pixelbounds.js | 30 +++++++++++++++++++++++------- src/ol/tilegrid/tilegrid.js | 4 ++-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/ol/pixelbounds.js b/src/ol/pixelbounds.js index 42a63f3b91..54f941edef 100644 --- a/src/ol/pixelbounds.js +++ b/src/ol/pixelbounds.js @@ -1,18 +1,34 @@ goog.provide('ol.PixelBounds'); -goog.require('ol.Rectangle'); - /** * @constructor - * @extends {ol.Rectangle} * @param {number} minX Minimum X. - * @param {number} minY Minimum Y. * @param {number} maxX Maximum X. + * @param {number} minY Minimum Y. * @param {number} maxY Maximum Y. */ -ol.PixelBounds = function(minX, minY, maxX, maxY) { - goog.base(this, minX, minY, maxX, maxY); +ol.PixelBounds = function(minX, maxX, minY, maxY) { + + /** + * @type {number} + */ + this.minX = minX; + + /** + * @type {number} + */ + this.maxX = maxX; + + /** + * @type {number} + */ + this.minY = minY; + + /** + * @type {number} + */ + this.maxY = maxY; + }; -goog.inherits(ol.PixelBounds, ol.Rectangle); diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index ccf19ee22b..c5d04837d0 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -150,10 +150,10 @@ ol.tilegrid.TileGrid.prototype.getPixelBoundsForTileCoordAndResolution = var tileWidth = tileSize.width / scale; var tileHeight = tileSize.height / scale; var minX = Math.round(tileCoord.x * tileWidth); - var minY = Math.round(tileCoord.y * tileHeight); var maxX = Math.round((tileCoord.x + 1) * tileWidth); + var minY = Math.round(tileCoord.y * tileHeight); var maxY = Math.round((tileCoord.y + 1) * tileHeight); - return new ol.PixelBounds(minX, minY, maxX, maxY); + return new ol.PixelBounds(minX, maxX, minY, maxY); };