diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index 58e52f10dc..26793e7a1d 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -43,8 +43,7 @@ class CanvasImageLayerRenderer extends CanvasLayerRenderer { const viewState = frameState.viewState; const viewResolution = viewState.resolution; - const imageLayer = /** @type {import("../../layer/Image.js").default} */ (this.getLayer()); - const imageSource = imageLayer.getSource(); + const imageSource = this.getLayer().getSource(); const hints = frameState.viewHints; diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index ac77df3d5e..412005f9a4 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -281,7 +281,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer { const w = nextX - x; const h = nextY - y; - this.drawTileImage(tile, frameState, layerState, x, y, w, h, tileGutter, z === currentZ); + this.drawTileImage(tile, frameState, x, y, w, h, tileGutter, z === currentZ); this.renderedTiles.push(tile); this.updateUsedTiles(frameState.usedTiles, tileSource, tile); } @@ -318,7 +318,6 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer { /** * @param {import("../../Tile.js").default} tile Tile. * @param {import("../../PluggableMap.js").FrameState} frameState Frame state. - * @param {import("../../layer/Layer.js").State} layerState Layer state. * @param {number} x Left of the tile. * @param {number} y Top of the tile. * @param {number} w Width of the tile. @@ -326,7 +325,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer { * @param {number} gutter Tile gutter. * @param {boolean} transition Apply an alpha transition. */ - drawTileImage(tile, frameState, layerState, x, y, w, h, gutter, transition) { + drawTileImage(tile, frameState, x, y, w, h, gutter, transition) { const image = this.getTileImage(tile); if (!image) { return; diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index eea1dfa764..26271e7f41 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -196,7 +196,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { } else { const resolution = frameState.viewState.resolution; const rotation = frameState.viewState.rotation; - const layer = /** @type {import("../../layer/Vector.js").default} */ (this.getLayer()); + const layer = this.getLayer(); /** @type {!Object} */ const features = {}; const result = this.replayGroup_.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {}, diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index bba7d651ab..6d864173ce 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -205,16 +205,14 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { * @inheritDoc */ getTileImage(tile) { - const tileLayer = /** @type {import("../../layer/Tile.js").default} */ (this.getLayer()); - return tile.getImage(tileLayer); + return tile.getImage(this.getLayer()); } /** * @inheritDoc */ prepareFrame(frameState, layerState) { - const layer = /** @type {import("../../layer/VectorTile.js").default} */ (this.getLayer()); - const layerRevision = layer.getRevision(); + const layerRevision = this.getLayer().getRevision(); if (this.renderedLayerRevision_ != layerRevision) { this.renderedTiles.length = 0; } @@ -231,7 +229,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { updateExecutorGroup_(tile, pixelRatio, projection) { const layer = /** @type {import("../../layer/VectorTile.js").default} */ (this.getLayer()); const revision = layer.getRevision(); - const renderOrder = /** @type {import("../../render.js").OrderFunction} */ (layer.getRenderOrder()) || null; + const renderOrder = layer.getRenderOrder() || null; const builderState = tile.getReplayState(layer); if (!builderState.dirty && builderState.renderedRevision == revision &&