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

Rename _ol_layer_VectorTileRenderType_ to VectorTileRenderType

Browse Source
This commit is contained in:
Frederic Junod
2018-02-14 17:03:36 +01:00
parent 8076a8313b
commit 26e11e9b3f
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ol/layer/VectorTile.js
View File

@@ -6,7 +6,7 @@ import LayerType from '../LayerType.js';
import {assert} from '../asserts.js'; import {assert} from '../asserts.js';
import TileProperty from '../layer/TileProperty.js'; import TileProperty from '../layer/TileProperty.js';
import VectorLayer from '../layer/Vector.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'; import {assign} from '../obj.js';
/** /**
@@ -24,14 +24,14 @@ import {assign} from '../obj.js';
const VectorTileLayer = function(opt_options) { const VectorTileLayer = function(opt_options) {
const options = opt_options ? 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 || assert(renderMode == undefined ||
renderMode == _ol_layer_VectorTileRenderType_.IMAGE || renderMode == VectorTileRenderType.IMAGE ||
renderMode == _ol_layer_VectorTileRenderType_.HYBRID || renderMode == VectorTileRenderType.HYBRID ||
renderMode == _ol_layer_VectorTileRenderType_.VECTOR, renderMode == VectorTileRenderType.VECTOR,
28); // `renderMode` must be `'image'`, `'hybrid'` or `'vector'` 28); // `renderMode` must be `'image'`, `'hybrid'` or `'vector'`
if (options.declutter && renderMode == _ol_layer_VectorTileRenderType_.IMAGE) { if (options.declutter && renderMode == VectorTileRenderType.IMAGE) {
renderMode = _ol_layer_VectorTileRenderType_.HYBRID; renderMode = VectorTileRenderType.HYBRID;
} }
options.renderMode = renderMode; options.renderMode = renderMode;

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

@@ -9,7 +9,7 @@ import {listen, unlisten} from '../../events.js';
import EventType from '../../events/EventType.js'; import EventType from '../../events/EventType.js';
import rbush from 'rbush'; import rbush from 'rbush';
import {buffer, containsCoordinate, equals, getIntersection, getTopLeft, intersects} from '../../extent.js'; 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 {equivalent as equivalentProjection} from '../../proj.js';
import Units from '../../proj/Units.js'; import Units from '../../proj/Units.js';
import ReplayType from '../../render/ReplayType.js'; import ReplayType from '../../render/ReplayType.js';
@@ -82,8 +82,7 @@ const CanvasVectorTileLayerRenderer = function(layer) {
this.tmpTransform_ = _ol_transform_.create(); this.tmpTransform_ = _ol_transform_.create();
// Use lower resolution for pure vector rendering. Closest resolution otherwise. // Use lower resolution for pure vector rendering. Closest resolution otherwise.
this.zDirection = this.zDirection = layer.getRenderMode() == VectorTileRenderType.VECTOR ? 1 : 0;
layer.getRenderMode() == _ol_layer_VectorTileRenderType_.VECTOR ? 1 : 0;
listen(labelCache, EventType.CLEAR, this.handleFontsChanged_, this); listen(labelCache, EventType.CLEAR, this.handleFontsChanged_, this);
@@ -132,10 +131,10 @@ CanvasVectorTileLayerRenderer.prototype.prepareFrame = function(frameState, laye
if (this.renderedLayerRevision_ != layerRevision) { if (this.renderedLayerRevision_ != layerRevision) {
this.renderedTiles.length = 0; this.renderedTiles.length = 0;
const renderMode = layer.getRenderMode(); const renderMode = layer.getRenderMode();
if (!this.context && renderMode != _ol_layer_VectorTileRenderType_.VECTOR) { if (!this.context && renderMode != VectorTileRenderType.VECTOR) {
this.context = createCanvasContext2D(); this.context = createCanvasContext2D();
} }
if (this.context && renderMode == _ol_layer_VectorTileRenderType_.VECTOR) { if (this.context && renderMode == VectorTileRenderType.VECTOR) {
this.context = null; this.context = null;
} }
} }
@@ -398,7 +397,7 @@ CanvasVectorTileLayerRenderer.prototype.postCompose = function(context, frameSta
continue; continue;
} }
const replayGroup = sourceTile.getReplayGroup(layer, tileCoord.toString()); const replayGroup = sourceTile.getReplayGroup(layer, tileCoord.toString());
if (renderMode != _ol_layer_VectorTileRenderType_.VECTOR && !replayGroup.hasReplays(replayTypes)) { if (renderMode != VectorTileRenderType.VECTOR && !replayGroup.hasReplays(replayTypes)) {
continue; continue;
} }
if (!transform) { if (!transform) {