ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #409 from elemoine/tilequeue

Browse Source 
Tile renderers needn't listen for tile change
This commit is contained in:
Éric Lemoine
2013-03-22 09:17:46 -07:00
parent f4dea053af 1d575309da
commit a12d10e912
6 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/renderer/canvas/canvastilelayerrenderer.js
View File

@@ -167,8 +167,6 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
this.updateWantedTiles(frameState.wantedTiles, tileSource, tileCoord);
tileCenter = tileGrid.getTileCoordCenter(tileCoord);
frameState.tileQueue.enqueue(tile, tileSourceKey, tileCenter);
} else if (tileState == ol.TileState.LOADING) {
this.listenToTileChange(tile);
} else if (tileState == ol.TileState.LOADED ||
tileState == ol.TileState.EMPTY) {
tilesToDrawByZ[z][tileCoord.toString()] = tile;

2
src/ol/renderer/dom/domtilelayerrenderer.js
View File

@@ -124,8 +124,6 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
this.updateWantedTiles(frameState.wantedTiles, tileSource, tileCoord);
tileCenter = tileGrid.getTileCoordCenter(tileCoord);
frameState.tileQueue.enqueue(tile, tileSourceKey, tileCenter);
} else if (tileState == ol.TileState.LOADING) {
this.listenToTileChange(tile);
} else if (tileState == ol.TileState.LOADED) {
tilesToDrawByZ[z][tileCoord.toString()] = tile;
continue;

22
src/ol/renderer/layerrenderer.js
View File

@@ -41,12 +41,6 @@ ol.renderer.Layer = function(mapRenderer, layer) {
*/
this.layer_ = layer;
/**
* @protected
* @type {Object.<string, boolean>}
*/
this.observedTileKeys = {};
goog.events.listen(this.layer_,
ol.Object.getChangedEventType(ol.layer.LayerProperty.BRIGHTNESS),
this.handleLayerBrightnessChange, false, this);
@@ -181,22 +175,6 @@ ol.renderer.Layer.prototype.handleTileChange_ = function(event) {
if (tile.getState() === ol.TileState.LOADED) {
this.getMap().requestRenderFrame();
}
delete this.observedTileKeys[tile.getKey()];
};
/**
* Listen once to tileKey, le change event.
* @param {ol.Tile} tile Tile.
* @protected
*/
ol.renderer.Layer.prototype.listenToTileChange = function(tile) {
var tileKey = tile.getKey();
if (!(tileKey in this.observedTileKeys)) {
this.observedTileKeys[tileKey] = true;
goog.events.listenOnce(tile, goog.events.EventType.CHANGE,
this.handleTileChange_, false, this);
}
};

2
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -398,8 +398,6 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
this.updateWantedTiles(frameState.wantedTiles, tileSource, tileCoord);
tileCenter = tileGrid.getTileCoordCenter(tileCoord);
frameState.tileQueue.enqueue(tile, tileSourceKey, tileCenter);
} else if (tileState == ol.TileState.LOADING) {
this.listenToTileChange(tile);
} else if (tileState == ol.TileState.LOADED) {
if (mapRenderer.isTileTextureLoaded(tile)) {
tilesToDrawByZ[z][tileCoord.toString()] = tile;