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

Merge pull request #9187 from fredj/cleanup

Browse Source 
Remove unnecessary type cast
This commit is contained in:
Frédéric Junod
2019-02-05 16:36:16 +01:00
committed by GitHub
parent 2c3ffdfdf8 ba02320fcc
commit caa9153dd0
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/renderer/canvas/ImageLayer.js
View File

@@ -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;

5
src/ol/renderer/canvas/TileLayer.js
View File

@@ -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;

2
src/ol/renderer/canvas/VectorLayer.js
View File

@@ -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<string, boolean>} */
const features = {};
const result = this.replayGroup_.forEachFeatureAtCoordinate(coordinate, resolution, rotation, hitTolerance, {},

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

@@ -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 &&