From 5c0498a95806470097fc88de2e55d1be1b16139d Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sat, 28 Jul 2012 23:19:14 +0200 Subject: [PATCH] Use public methods where available --- src/ol/dom/tilelayerrenderer.js | 41 ++++++++++++++------------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/src/ol/dom/tilelayerrenderer.js b/src/ol/dom/tilelayerrenderer.js index 234e3a830f..fdb783c41d 100644 --- a/src/ol/dom/tilelayerrenderer.js +++ b/src/ol/dom/tilelayerrenderer.js @@ -35,6 +35,15 @@ ol.dom.TileLayerRenderer = function(map, tileLayer, target) { goog.inherits(ol.dom.TileLayerRenderer, ol.dom.LayerRenderer); +/** + * @override + * @return {ol.TileLayer} Layer. + */ +ol.dom.TileLayerRenderer.prototype.getLayer = function() { + return /** @type {ol.TileLayer} */ goog.base(this, 'getLayer'); +}; + + /** * @inheritDoc */ @@ -47,7 +56,8 @@ ol.dom.TileLayerRenderer.prototype.render = function() { var center = /** @type {ol.Coordinate} */ map.getCenter(); var resolution = /** @type {number} */ map.getResolution(); - var tileStore = this.getTileStore_(); + var tileLayer = this.getLayer(); + var tileStore = tileLayer.getStore(); var tileGrid = tileStore.getTileGrid(); if (resolution != this.renderedResolution_) { @@ -106,7 +116,9 @@ ol.dom.TileLayerRenderer.prototype.render = function() { * @return {ol.Coordinate} Offset. */ ol.dom.TileLayerRenderer.prototype.getTileOffset_ = function(z, resolution) { - var tileGrid = this.getTileGrid_(); + var tileLayer = this.getLayer(); + var tileStore = tileLayer.getStore(); + var tileGrid = tileStore.getTileGrid(); var tileOrigin = tileGrid.getOrigin(z); var offset = new ol.Coordinate( Math.round((this.origin.x - tileOrigin.x) / resolution), @@ -133,7 +145,9 @@ ol.dom.TileLayerRenderer.prototype.getTileBounds_ = function( center.x + (resolution * halfSize.width), center.y - (resolution * halfSize.height)); var extent = ol.Extent.boundingExtent(leftTop, rightBottom); - var tileGrid = this.getTileGrid_(); + var tileLayer = this.getLayer(); + var tileStore = tileLayer.getStore(); + var tileGrid = tileStore.getTileGrid(); return tileGrid.getTileBoundsForExtentAndResolution(extent, resolution); }; @@ -161,24 +175,3 @@ ol.dom.TileLayerRenderer.prototype.removeInvisibleTiles_ = function( } } }; - - -/** - * Get the tile grid. - * @private - * @return {ol.TileGrid} Tile grid. - */ -ol.dom.TileLayerRenderer.prototype.getTileGrid_ = function() { - return this.getTileStore_().getTileGrid(); -}; - - -/** - * Get the tile store. - * @private - * @return {ol.TileStore} Tile store. - */ -ol.dom.TileLayerRenderer.prototype.getTileStore_ = function() { - var tileLayer = /** @type {ol.TileLayer} */ this.getLayer(); - return tileLayer.getStore(); -};