diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index d0dea9edc2..1f15d668c5 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -21,6 +21,27 @@ import CanvasTileLayerRenderer from '../canvas/TileLayer.js'; import {getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js'; import _ol_transform_ from '../../transform.js'; + +/** + * @type {!Object.>} + */ +const IMAGE_REPLAYS = { + 'image': [ReplayType.POLYGON, ReplayType.CIRCLE, + ReplayType.LINE_STRING, ReplayType.IMAGE, ReplayType.TEXT], + 'hybrid': [ReplayType.POLYGON, ReplayType.LINE_STRING] +}; + + +/** + * @type {!Object.>} + */ +const VECTOR_REPLAYS = { + 'image': [ReplayType.DEFAULT], + 'hybrid': [ReplayType.IMAGE, ReplayType.TEXT, ReplayType.DEFAULT], + 'vector': _ol_render_replay_.ORDER +}; + + /** * @constructor * @extends {ol.renderer.canvas.TileLayer} @@ -93,28 +114,6 @@ CanvasVectorTileLayerRenderer['create'] = function(mapRenderer, layer) { }; -/** - * @const - * @type {!Object.>} - */ -CanvasVectorTileLayerRenderer.IMAGE_REPLAYS = { - 'image': [ReplayType.POLYGON, ReplayType.CIRCLE, - ReplayType.LINE_STRING, ReplayType.IMAGE, ReplayType.TEXT], - 'hybrid': [ReplayType.POLYGON, ReplayType.LINE_STRING] -}; - - -/** - * @const - * @type {!Object.>} - */ -CanvasVectorTileLayerRenderer.VECTOR_REPLAYS = { - 'image': [ReplayType.DEFAULT], - 'hybrid': [ReplayType.IMAGE, ReplayType.TEXT, ReplayType.DEFAULT], - 'vector': _ol_render_replay_.ORDER -}; - - /** * @inheritDoc */ @@ -367,7 +366,7 @@ CanvasVectorTileLayerRenderer.prototype.postCompose = function(context, frameSta const declutterReplays = layer.getDeclutter() ? {} : null; const source = /** @type {ol.source.VectorTile} */ (layer.getSource()); const renderMode = layer.getRenderMode(); - const replayTypes = CanvasVectorTileLayerRenderer.VECTOR_REPLAYS[renderMode]; + const replayTypes = VECTOR_REPLAYS[renderMode]; const pixelRatio = frameState.pixelRatio; const rotation = frameState.viewState.rotation; const size = frameState.size; @@ -484,7 +483,7 @@ CanvasVectorTileLayerRenderer.prototype.renderTileImage_ = function( const layer = this.getLayer(); const replayState = tile.getReplayState(layer); const revision = layer.getRevision(); - const replays = CanvasVectorTileLayerRenderer.IMAGE_REPLAYS[layer.getRenderMode()]; + const replays = IMAGE_REPLAYS[layer.getRenderMode()]; if (replays && replayState.renderedTileRevision !== revision) { replayState.renderedTileRevision = revision; const tileCoord = tile.wrappedTileCoord;