From 427c73ddf9348e9f736050f9037e714a10c7f24c Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 5 Feb 2019 11:31:59 +0100 Subject: [PATCH] Remove unnecessary type cast `npx tsc` output is the same before and after the changes. --- src/ol/renderer/canvas/ImageLayer.js | 3 +-- src/ol/renderer/canvas/VectorLayer.js | 2 +- src/ol/renderer/canvas/VectorTileLayer.js | 8 +++----- 3 files changed, 5 insertions(+), 8 deletions(-) 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/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 &&