From 8c665c0bb17b68ed1b426d2598a57ea4d2b74a93 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 24 Feb 2014 21:25:43 +0100 Subject: [PATCH] Move preload property default value into ol.renderer.Layer#manageTilePyramid --- src/ol/layer/tilelayer.js | 9 +++------ src/ol/renderer/layerrenderer.js | 6 +++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js index bb5c62e4cb..bc1868072e 100644 --- a/src/ol/layer/tilelayer.js +++ b/src/ol/layer/tilelayer.js @@ -20,22 +20,19 @@ ol.layer.TileProperty = { * @todo observable preload {number} the level to preload tiles up to */ ol.layer.Tile = function(options) { - goog.base(this, options); - this.setPreload( - goog.isDef(options.preload) ? options.preload : 0); - }; goog.inherits(ol.layer.Tile, ol.layer.Layer); /** - * @return {number} Preload. + * @return {number|undefined} Preload. * @todo stability experimental */ ol.layer.Tile.prototype.getPreload = function() { - return /** @type {number} */ (this.get(ol.layer.TileProperty.PRELOAD)); + return /** @type {number|undefined} */ ( + this.get(ol.layer.TileProperty.PRELOAD)); }; goog.exportProperty( ol.layer.Tile.prototype, diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js index 09dc1199ae..cdfcb001d2 100644 --- a/src/ol/renderer/layerrenderer.js +++ b/src/ol/renderer/layerrenderer.js @@ -249,7 +249,8 @@ ol.renderer.Layer.prototype.snapCenterToPixel = * @param {ol.proj.Projection} projection Projection. * @param {ol.Extent} extent Extent. * @param {number} currentZ Current Z. - * @param {number} preload Load low resolution tiles up to 'preload' levels. + * @param {number|undefined} preload Load low resolution tiles up to 'preload' + * levels. * @param {function(this: T, ol.Tile)=} opt_tileCallback Tile callback. * @param {T=} opt_this Object to use as `this` in `opt_tileCallback`. * @protected @@ -266,6 +267,9 @@ ol.renderer.Layer.prototype.manageTilePyramid = function( var tileQueue = frameState.tileQueue; var minZoom = tileGrid.getMinZoom(); var tile, tileRange, tileResolution, x, y, z; + if (!goog.isDef(preload)) { + preload = 0; + } for (z = currentZ; z >= minZoom; --z) { tileRange = tileGrid.getTileRangeForExtentAndZ(extent, z); tileResolution = tileGrid.getResolution(z);