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

Add comments and TODOs

Browse Source
This commit is contained in:
ahocevar
2018-11-28 21:38:05 +01:00
parent fbf98a44ea
commit 1d243a7f37
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ol/VectorImageTile.js
View File

@@ -144,7 +144,6 @@ class VectorImageTile extends Tile {
*/ */
disposeInternal() { disposeInternal() {
this.setState(TileState.ABORT); this.setState(TileState.ABORT);
for (let i = 0, ii = this.tileKeys.length; i < ii; ++i) { for (let i = 0, ii = this.tileKeys.length; i < ii; ++i) {
const sourceTileKey = this.tileKeys[i]; const sourceTileKey = this.tileKeys[i];
const sourceTile = this.getTile(sourceTileKey); const sourceTile = this.getTile(sourceTileKey);

11
src/ol/renderer/canvas/VectorTileLayer.js
View File

@@ -170,6 +170,8 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
unlistenByKey(this.tileChangeKeys_[uid]); unlistenByKey(this.tileChangeKeys_[uid]);
delete this.tileChangeKeys_[uid]; delete this.tileChangeKeys_[uid];
if (tile.sourceTilesLoaded) { if (tile.sourceTilesLoaded) {
// Create render instructions immediately when all source tiles are available.
//TODO Make sure no canvas operations are involved in instruction creation.
this.updateExecutorGroup_(tile, pixelRatio, projection); this.updateExecutorGroup_(tile, pixelRatio, projection);
//FIXME This should be done by the tile, and VectorImage tiles should be layer specific //FIXME This should be done by the tile, and VectorImage tiles should be layer specific
tile.setState(TileState.LOADED); tile.setState(TileState.LOADED);
@@ -182,6 +184,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
if (tile.hasContext(this.getLayer())) { if (tile.hasContext(this.getLayer())) {
this.renderTileImage_(tile, pixelRatio, projection); this.renderTileImage_(tile, pixelRatio, projection);
} else { } else {
// Render new tile images after existing tiles have been drawn to the target canvas.
this.tilesWithoutImage_.push(tile); this.tilesWithoutImage_.push(tile);
} }
} }
@@ -517,13 +520,21 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer {
canvas.style.opacity = opacity; canvas.style.opacity = opacity;
} }
// Now that we have rendered the tiles we have already, let's prepare new tiles for the
// next frame
this.renderMissingTileImages_(hifi, frameState); this.renderMissingTileImages_(hifi, frameState);
return this.container_; return this.container_;
} }
/**
* @param {boolean} hifi We have time to render a high fidelity map image.
* @param {import('../../PluggableMap.js').FrameState} frameState Frame state.
*/
renderMissingTileImages_(hifi, frameState) { renderMissingTileImages_(hifi, frameState) {
if (hifi) { if (hifi) {
// Do not spend more than 100 ms in this render frame, to avoid delays when the user starts
// interacting again with the map.
while (this.tilesWithoutImage_.length && Date.now() - frameState.time < 100) { while (this.tilesWithoutImage_.length && Date.now() - frameState.time < 100) {
const tile = this.tilesWithoutImage_.pop(); const tile = this.tilesWithoutImage_.pop();
frameState.animate = true; frameState.animate = true;