From 65ceb9264e6df5505e42401e19be0fe4ad063368 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Thu, 15 Nov 2018 13:49:16 +0100 Subject: [PATCH] Remove accidently committed changes --- src/ol/VectorImageTile.js | 9 +-------- src/ol/renderer/canvas/VectorTileLayer.js | 18 +++++------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/ol/VectorImageTile.js b/src/ol/VectorImageTile.js index ac5fbd68bf..eaa36142c9 100644 --- a/src/ol/VectorImageTile.js +++ b/src/ol/VectorImageTile.js @@ -72,12 +72,6 @@ class VectorImageTile extends Tile { */ this.sourceTiles_ = sourceTiles; - /** - * @private - * @type {boolean} - */ - this.sourceTilesLoaded = false; - /** * Keys of source tiles used by this tile. Use with {@link #getTile}. * @type {Array} @@ -318,8 +312,7 @@ class VectorImageTile extends Tile { if (loaded == this.tileKeys.length) { this.loadListenerKeys_.forEach(unlistenByKey); this.loadListenerKeys_.length = 0; - this.sourceTilesLoaded = true; - this.changed(); + this.setState(TileState.LOADED); } else { this.setState(empty == this.tileKeys.length ? TileState.EMPTY : TileState.ERROR); } diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index 94cbd6ea28..b288731e14 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -108,12 +108,6 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { */ this.renderedLayerRevision_; - /** - * @private - * @type {Array.} - */ - this.tilesToRender_ = []; - /** * @private * @type {import("../../transform.js").Transform} @@ -140,13 +134,11 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { */ getTile(z, x, y, pixelRatio, projection) { const tile = super.getTile(z, x, y, pixelRatio, projection); - if (tile.getState() === TileState.IDLE) { - const key = listen(tile, EventType.CHANGE, function() { - if (tile.getState() === TileState.LOADING && tile.sourceTilesLoaded) { - this.tilesToRender_.push(tile); - unlistenByKey(key); - } - }.bind(this)); + if (tile.getState() === TileState.LOADED) { + this.createReplayGroup_(/** @type {import("../../VectorImageTile.js").default} */ (tile), pixelRatio, projection); + if (this.context) { + this.renderTileImage_(/** @type {import("../../VectorImageTile.js").default} */ (tile), pixelRatio, projection); + } } return tile; }