diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js index e8fcba47dc..35f6b42501 100644 --- a/src/ol/layer/VectorTile.js +++ b/src/ol/layer/VectorTile.js @@ -6,7 +6,7 @@ import LayerType from '../LayerType.js'; import {assert} from '../asserts.js'; import TileProperty from '../layer/TileProperty.js'; import VectorLayer from '../layer/Vector.js'; -import _ol_layer_VectorTileRenderType_ from '../layer/VectorTileRenderType.js'; +import VectorTileRenderType from '../layer/VectorTileRenderType.js'; import {assign} from '../obj.js'; /** @@ -24,14 +24,14 @@ import {assign} from '../obj.js'; const VectorTileLayer = function(opt_options) { const options = opt_options ? opt_options : {}; - let renderMode = options.renderMode || _ol_layer_VectorTileRenderType_.HYBRID; + let renderMode = options.renderMode || VectorTileRenderType.HYBRID; assert(renderMode == undefined || - renderMode == _ol_layer_VectorTileRenderType_.IMAGE || - renderMode == _ol_layer_VectorTileRenderType_.HYBRID || - renderMode == _ol_layer_VectorTileRenderType_.VECTOR, + renderMode == VectorTileRenderType.IMAGE || + renderMode == VectorTileRenderType.HYBRID || + renderMode == VectorTileRenderType.VECTOR, 28); // `renderMode` must be `'image'`, `'hybrid'` or `'vector'` - if (options.declutter && renderMode == _ol_layer_VectorTileRenderType_.IMAGE) { - renderMode = _ol_layer_VectorTileRenderType_.HYBRID; + if (options.declutter && renderMode == VectorTileRenderType.IMAGE) { + renderMode = VectorTileRenderType.HYBRID; } options.renderMode = renderMode; diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index 757cc76707..bd2b2f6788 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -9,7 +9,7 @@ import {listen, unlisten} from '../../events.js'; import EventType from '../../events/EventType.js'; import rbush from 'rbush'; import {buffer, containsCoordinate, equals, getIntersection, getTopLeft, intersects} from '../../extent.js'; -import _ol_layer_VectorTileRenderType_ from '../../layer/VectorTileRenderType.js'; +import VectorTileRenderType from '../../layer/VectorTileRenderType.js'; import {equivalent as equivalentProjection} from '../../proj.js'; import Units from '../../proj/Units.js'; import ReplayType from '../../render/ReplayType.js'; @@ -82,8 +82,7 @@ const CanvasVectorTileLayerRenderer = function(layer) { this.tmpTransform_ = _ol_transform_.create(); // Use lower resolution for pure vector rendering. Closest resolution otherwise. - this.zDirection = - layer.getRenderMode() == _ol_layer_VectorTileRenderType_.VECTOR ? 1 : 0; + this.zDirection = layer.getRenderMode() == VectorTileRenderType.VECTOR ? 1 : 0; listen(labelCache, EventType.CLEAR, this.handleFontsChanged_, this); @@ -132,10 +131,10 @@ CanvasVectorTileLayerRenderer.prototype.prepareFrame = function(frameState, laye if (this.renderedLayerRevision_ != layerRevision) { this.renderedTiles.length = 0; const renderMode = layer.getRenderMode(); - if (!this.context && renderMode != _ol_layer_VectorTileRenderType_.VECTOR) { + if (!this.context && renderMode != VectorTileRenderType.VECTOR) { this.context = createCanvasContext2D(); } - if (this.context && renderMode == _ol_layer_VectorTileRenderType_.VECTOR) { + if (this.context && renderMode == VectorTileRenderType.VECTOR) { this.context = null; } } @@ -398,7 +397,7 @@ CanvasVectorTileLayerRenderer.prototype.postCompose = function(context, frameSta continue; } const replayGroup = sourceTile.getReplayGroup(layer, tileCoord.toString()); - if (renderMode != _ol_layer_VectorTileRenderType_.VECTOR && !replayGroup.hasReplays(replayTypes)) { + if (renderMode != VectorTileRenderType.VECTOR && !replayGroup.hasReplays(replayTypes)) { continue; } if (!transform) {