From 0e12d16c37965620bd2f3d03899d2ffe1ab8b0af Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Thu, 4 Apr 2013 23:49:21 +0200 Subject: [PATCH] Move configuration of maximum tiles loading into map.js --- src/ol/map.js | 10 +++++++++- src/ol/tilequeue.js | 7 +++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/ol/map.js b/src/ol/map.js index ca1d36b2e3..9508938a21 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -77,6 +77,12 @@ ol.ENABLE_DOM = true; ol.ENABLE_WEBGL = true; +/** + * @define {number} Maximum number of simultaneously loading tiles. + */ +ol.MAXIMUM_TILES_LOADING = 8; + + /** * @define {number} Maximum new tile loads per frame. */ @@ -279,7 +285,9 @@ ol.Map = function(mapOptions) { * @private * @type {ol.TileQueue} */ - this.tileQueue_ = new ol.TileQueue(goog.bind(this.getTilePriority, this), + this.tileQueue_ = new ol.TileQueue( + ol.MAXIMUM_TILES_LOADING, + goog.bind(this.getTilePriority, this), goog.bind(this.handleTileChange_, this)); goog.events.listen(this, ol.Object.getChangedEventType(ol.MapProperty.VIEW), diff --git a/src/ol/tilequeue.js b/src/ol/tilequeue.js index 43c25f85cb..94274ca6d7 100644 --- a/src/ol/tilequeue.js +++ b/src/ol/tilequeue.js @@ -18,12 +18,15 @@ ol.TilePriorityFunction; /** * @constructor * @extends {ol.structs.PriorityQueue} + * @param {number} maxTilesLoading Maximum number of simultaneously loading + * tiles. * @param {ol.TilePriorityFunction} tilePriorityFunction * Tile priority function. * @param {Function} tileChangeCallback * Function called on each tile change event. */ -ol.TileQueue = function(tilePriorityFunction, tileChangeCallback) { +ol.TileQueue = + function(maxTilesLoading, tilePriorityFunction, tileChangeCallback) { goog.base( this, @@ -52,7 +55,7 @@ ol.TileQueue = function(tilePriorityFunction, tileChangeCallback) { * @private * @type {number} */ - this.maxTilesLoading_ = 8; + this.maxTilesLoading_ = maxTilesLoading; /** * @private