Make tile loading count no longer depend on source count

This commit is contained in:
Andreas Hocevar
2016-02-05 09:38:16 +01:00
parent 57c5632de2
commit 3f36e0967f
4 changed files with 0 additions and 8 deletions

View File

@@ -7008,7 +7008,6 @@ olx.view.FitOptions.prototype.maxZoom;
* size: ol.Size, * size: ol.Size,
* skippedFeatureUids: Object.<string, boolean>, * skippedFeatureUids: Object.<string, boolean>,
* tileQueue: ol.TileQueue, * tileQueue: ol.TileQueue,
* tileSourceCount: number,
* time: number, * time: number,
* usedTiles: Object.<string, Object.<string, ol.TileRange>>, * usedTiles: Object.<string, Object.<string, ol.TileRange>>,
* viewState: olx.ViewState, * viewState: olx.ViewState,

View File

@@ -1016,7 +1016,6 @@ ol.Map.prototype.handlePostRender = function() {
if (!tileQueue.isEmpty()) { if (!tileQueue.isEmpty()) {
var maxTotalLoading = 16; var maxTotalLoading = 16;
var maxNewLoads = maxTotalLoading; var maxNewLoads = maxTotalLoading;
var tileSourceCount = 0;
if (frameState) { if (frameState) {
var hints = frameState.viewHints; var hints = frameState.viewHints;
if (hints[ol.ViewHint.ANIMATING]) { if (hints[ol.ViewHint.ANIMATING]) {
@@ -1027,10 +1026,7 @@ ol.Map.prototype.handlePostRender = function() {
maxTotalLoading = this.loadTilesWhileInteracting_ ? 8 : 0; maxTotalLoading = this.loadTilesWhileInteracting_ ? 8 : 0;
maxNewLoads = 2; maxNewLoads = 2;
} }
tileSourceCount = frameState.tileSourceCount;
} }
maxTotalLoading *= tileSourceCount;
maxNewLoads *= tileSourceCount;
if (tileQueue.getTilesLoading() < maxTotalLoading) { if (tileQueue.getTilesLoading() < maxTotalLoading) {
tileQueue.reprioritize(); // FIXME only call if view has changed tileQueue.reprioritize(); // FIXME only call if view has changed
tileQueue.loadMoreTiles(maxTotalLoading, maxNewLoads); tileQueue.loadMoreTiles(maxTotalLoading, maxNewLoads);
@@ -1332,7 +1328,6 @@ ol.Map.prototype.renderFrame_ = function(time) {
size: size, size: size,
skippedFeatureUids: this.skippedFeatureUids_, skippedFeatureUids: this.skippedFeatureUids_,
tileQueue: this.tileQueue_, tileQueue: this.tileQueue_,
tileSourceCount: 0,
time: time, time: time,
usedTiles: {}, usedTiles: {},
viewState: viewState, viewState: viewState,

View File

@@ -298,7 +298,6 @@ ol.renderer.Layer.prototype.manageTilePyramid = function(
var tileSourceKey = goog.getUid(tileSource).toString(); var tileSourceKey = goog.getUid(tileSource).toString();
if (!(tileSourceKey in frameState.wantedTiles)) { if (!(tileSourceKey in frameState.wantedTiles)) {
frameState.wantedTiles[tileSourceKey] = {}; frameState.wantedTiles[tileSourceKey] = {};
++frameState.tileSourceCount;
} }
var wantedTiles = frameState.wantedTiles[tileSourceKey]; var wantedTiles = frameState.wantedTiles[tileSourceKey];
var tileQueue = frameState.tileQueue; var tileQueue = frameState.tileQueue;

View File

@@ -122,7 +122,6 @@ ol.source.Raster = function(options) {
size: [0, 0], size: [0, 0],
skippedFeatureUids: {}, skippedFeatureUids: {},
tileQueue: this.tileQueue_, tileQueue: this.tileQueue_,
tileSourceCount: 0,
time: Date.now(), time: Date.now(),
usedTiles: {}, usedTiles: {},
viewState: /** @type {olx.ViewState} */ ({ viewState: /** @type {olx.ViewState} */ ({