From d2f60a70d172b43931f95ec137c59e5b7784690b Mon Sep 17 00:00:00 2001 From: ahocevar Date: Wed, 20 Mar 2019 22:28:09 +0100 Subject: [PATCH] Recreate instructions for the view resolution --- src/ol/VectorRenderTile.js | 9 +++++ src/ol/renderer/canvas/TileLayer.js | 9 ++--- src/ol/renderer/canvas/VectorTileLayer.js | 40 ++++++++++++++++++----- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/ol/VectorRenderTile.js b/src/ol/VectorRenderTile.js index 47b3f47a1a..d682cdb425 100644 --- a/src/ol/VectorRenderTile.js +++ b/src/ol/VectorRenderTile.js @@ -12,8 +12,10 @@ import {createCanvasContext2D} from './dom.js'; * @property {boolean} dirty * @property {null|import("./render.js").OrderFunction} renderedRenderOrder * @property {number} renderedTileRevision + * @property {number} renderedResolution * @property {number} renderedRevision * @property {number} renderedZ + * @property {number} renderedTileResolution * @property {number} renderedTileZ */ @@ -64,6 +66,11 @@ class VectorRenderTile extends Tile { */ this.replayState_ = {}; + /** + * @type {number} + */ + this.wantedResolution; + /** * @type {!function(import("./VectorRenderTile.js").default):Array} */ @@ -156,7 +163,9 @@ class VectorRenderTile extends Tile { this.replayState_[key] = { dirty: false, renderedRenderOrder: null, + renderedResolution: NaN, renderedRevision: -1, + renderedTileResolution: NaN, renderedTileRevision: -1, renderedZ: -1, renderedTileZ: -1 diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index cddca15d24..03b29a026f 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -82,11 +82,12 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer { * @param {number} z Tile coordinate z. * @param {number} x Tile coordinate x. * @param {number} y Tile coordinate y. - * @param {number} pixelRatio Pixel ratio. - * @param {import("../../proj/Projection.js").default} projection Projection. + * @param {import("../../PluggableMap.js").FrameState} frameState Frame state. * @return {!import("../../Tile.js").default} Tile. */ - getTile(z, x, y, pixelRatio, projection) { + getTile(z, x, y, frameState) { + const pixelRatio = frameState.pixelRatio; + const projection = frameState.viewState.projection; const tileLayer = /** @type {import("../../layer/Tile.js").default} */ (this.getLayer()); const tileSource = tileLayer.getSource(); let tile = tileSource.getTile(z, x, y, pixelRatio, projection); @@ -186,7 +187,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer { this.newTiles_ = false; for (let x = tileRange.minX; x <= tileRange.maxX; ++x) { for (let y = tileRange.minY; y <= tileRange.maxY; ++y) { - const tile = this.getTile(z, x, y, pixelRatio, projection); + const tile = this.getTile(z, x, y, frameState); if (this.isDrawableTile(tile)) { const uid = getUid(this); if (tile.getState() == TileState.LOADED) { diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index a0ab43bc57..60ed514aad 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -179,15 +179,25 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { /** * @inheritDoc */ - getTile(z, x, y, pixelRatio, projection) { - const tile = /** @type {import("../../VectorRenderTile.js").default} */ (super.getTile(z, x, y, pixelRatio, projection)); + getTile(z, x, y, frameState) { + const tile = /** @type {import("../../VectorRenderTile.js").default} */ (super.getTile(z, x, y, frameState)); + const pixelRatio = frameState.pixelRatio; + const viewState = frameState.viewState; + const resolution = viewState.resolution; + const projection = viewState.projection; if (tile.getState() < TileState.LOADED) { + tile.wantedResolution = resolution; const tileUid = getUid(tile); if (!(tileUid in this.tileListenerKeys_)) { const listenerKey = listen(tile, EventType.CHANGE, this.prepareTile.bind(this, tile, pixelRatio, projection)); this.tileListenerKeys_[tileUid] = listenerKey; } } else { + const viewHints = frameState.viewHints; + const hifi = !(viewHints[ViewHint.ANIMATING] || viewHints[ViewHint.INTERACTING]); + if (hifi || !tile.wantedResolution) { + tile.wantedResolution = resolution; + } this.prepareTile(tile, pixelRatio, projection); } return tile; @@ -230,8 +240,10 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { const revision = layer.getRevision(); const renderOrder = layer.getRenderOrder() || null; + const resolution = tile.wantedResolution; const builderState = tile.getReplayState(layer); - if (!builderState.dirty && builderState.renderedRevision == revision && + if (!builderState.dirty && builderState.renderedResolution === resolution && + builderState.renderedRevision == revision && builderState.renderedRenderOrder == renderOrder && builderState.renderedZ === tile.sourceZ) { return; } @@ -239,8 +251,6 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { const source = layer.getSource(); const sourceTileGrid = source.getTileGrid(); const tileGrid = source.getTileGridForProjection(projection); - const zoom = tile.tileCoord[0]; - const resolution = tileGrid.getResolution(zoom); const tileExtent = tileGrid.getTileCoordExtent(tile.wrappedTileCoord); const sourceTiles = source.getSourceTiles(pixelRatio, projection, tile); @@ -306,6 +316,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { builderState.renderedRevision = revision; builderState.renderedZ = tile.sourceZ; builderState.renderedRenderOrder = renderOrder; + builderState.renderedResolution = resolution; } /** @@ -539,7 +550,11 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { if (this.declutterTree_ && layer.getRenderMode() === VectorTileRenderType.IMAGE) { this.declutterTree_.clear(); } - this.renderTileImage_(tile, frameState.pixelRatio, frameState.viewState.projection); + const viewState = frameState.viewState; + const tileGrid = layer.getSource().getTileGridForProjection(viewState.projection); + const tileResolution = tileGrid.getResolution(tile.tileCoord[0]); + const renderPixelRatio = frameState.pixelRatio / tile.wantedResolution * tileResolution; + this.renderTileImage_(tile, frameState.pixelRatio, renderPixelRatio, viewState.projection); } clear(this.renderTileImageQueue_); } @@ -582,16 +597,18 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { const replayState = tile.getReplayState(layer); const revision = layer.getRevision(); const sourceZ = tile.sourceZ; - return replayState.renderedTileRevision !== revision || replayState.renderedTileZ !== sourceZ; + const resolution = tile.wantedResolution; + return replayState.renderedTileResolution !== resolution || replayState.renderedTileRevision !== revision || replayState.renderedTileZ !== sourceZ; } /** * @param {import("../../VectorRenderTile.js").default} tile Tile. * @param {number} pixelRatio Pixel ratio. + * @param {number} renderPixelRatio Render pixel ratio. * @param {import("../../proj/Projection.js").default} projection Projection. * @private */ - renderTileImage_(tile, pixelRatio, projection) { + renderTileImage_(tile, pixelRatio, renderPixelRatio, projection) { const layer = /** @type {import("../../layer/VectorTile.js").default} */ (this.getLayer()); const replayState = tile.getReplayState(layer); const revision = layer.getRevision(); @@ -607,15 +624,20 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { const size = source.getTilePixelSize(z, pixelRatio, projection); context.canvas.width = size[0]; context.canvas.height = size[1]; + const canvasTransform = resetTransform(this.tmpTransform_); + const renderScale = pixelRatio / renderPixelRatio; + scaleTransform(canvasTransform, renderScale, renderScale); + context.setTransform.apply(context, canvasTransform); const tileExtent = tileGrid.getTileCoordExtent(tileCoord, this.tmpExtent); for (let i = 0, ii = executorGroups.length; i < ii; ++i) { const executorGroup = executorGroups[i]; - const pixelScale = pixelRatio / resolution; + const pixelScale = renderPixelRatio / resolution; const transform = resetTransform(this.tmpTransform_); scaleTransform(transform, pixelScale, -pixelScale); translateTransform(transform, -tileExtent[0], -tileExtent[3]); executorGroup.execute(context, transform, 0, {}, true, IMAGE_REPLAYS[layer.getRenderMode()]); } + replayState.renderedTileResolution = tile.wantedResolution; } /**