From 04649a74cdf80a2e0ecf49b52b57b41463f0b946 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Thu, 6 Oct 2016 19:38:28 +0200 Subject: [PATCH] One provide per file for vector tiles --- src/ol/renderer/canvas/vectortilelayer.js | 44 +++++++++++------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/ol/renderer/canvas/vectortilelayer.js b/src/ol/renderer/canvas/vectortilelayer.js index f22f19a72d..a6623ba6ac 100644 --- a/src/ol/renderer/canvas/vectortilelayer.js +++ b/src/ol/renderer/canvas/vectortilelayer.js @@ -17,26 +17,6 @@ goog.require('ol.size'); goog.require('ol.transform'); -/** - * @const - * @type {!Object.>} - */ -ol.renderer.canvas.IMAGE_REPLAYS = { - 'image': ol.render.replay.ORDER, - 'hybrid': [ol.render.ReplayType.POLYGON, ol.render.ReplayType.LINE_STRING] -}; - - -/** - * @const - * @type {!Object.>} - */ -ol.renderer.canvas.VECTOR_REPLAYS = { - 'hybrid': [ol.render.ReplayType.IMAGE, ol.render.ReplayType.TEXT], - 'vector': ol.render.replay.ORDER -}; - - /** * @constructor * @extends {ol.renderer.canvas.TileLayer} @@ -66,6 +46,26 @@ ol.renderer.canvas.VectorTileLayer = function(layer) { ol.inherits(ol.renderer.canvas.VectorTileLayer, ol.renderer.canvas.TileLayer); +/** + * @const + * @type {!Object.>} + */ +ol.renderer.canvas.VectorTileLayer.IMAGE_REPLAYS = { + 'image': ol.render.replay.ORDER, + 'hybrid': [ol.render.ReplayType.POLYGON, ol.render.ReplayType.LINE_STRING] +}; + + +/** + * @const + * @type {!Object.>} + */ +ol.renderer.canvas.VectorTileLayer.VECTOR_REPLAYS = { + 'hybrid': [ol.render.ReplayType.IMAGE, ol.render.ReplayType.TEXT], + 'vector': ol.render.replay.ORDER +}; + + /** * @inheritDoc */ @@ -107,7 +107,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.renderTileReplays_ = function( context, frameState, layerState) { var layer = this.getLayer(); - var replays = ol.renderer.canvas.VECTOR_REPLAYS[layer.getRenderMode()]; + var replays = ol.renderer.canvas.VectorTileLayer.VECTOR_REPLAYS[layer.getRenderMode()]; var pixelRatio = frameState.pixelRatio; var skippedFeatureUids = layerState.managed ? frameState.skippedFeatureUids : {}; @@ -393,7 +393,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.renderFeature = function(feature, s ol.renderer.canvas.VectorTileLayer.prototype.renderTileImage_ = function( tile, frameState, layerState, skippedFeatures) { var layer = this.getLayer(); - var replays = ol.renderer.canvas.IMAGE_REPLAYS[layer.getRenderMode()]; + var replays = ol.renderer.canvas.VectorTileLayer.IMAGE_REPLAYS[layer.getRenderMode()]; if (!replays) { // do not create an image in 'vector' mode return;