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

Merge pull request #5937 from ahocevar/one-require-vectortile

Browse Source 
One provide per file for vector tiles
This commit is contained in:
Andreas Hocevar
2016-10-07 07:46:15 +02:00
committed by GitHub
parent 5cdbd76b1e 04649a74cd
commit fe874938c3
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/ol/renderer/canvas/vectortilelayer.js
View File

@@ -17,26 +17,6 @@ goog.require('ol.size');
goog.require('ol.transform'); goog.require('ol.transform');
/**
* @const
* @type {!Object.<string, Array.<ol.render.ReplayType>>}
*/
ol.renderer.canvas.IMAGE_REPLAYS = {
'image': ol.render.replay.ORDER,
'hybrid': [ol.render.ReplayType.POLYGON, ol.render.ReplayType.LINE_STRING]
};
/**
* @const
* @type {!Object.<string, Array.<ol.render.ReplayType>>}
*/
ol.renderer.canvas.VECTOR_REPLAYS = {
'hybrid': [ol.render.ReplayType.IMAGE, ol.render.ReplayType.TEXT],
'vector': ol.render.replay.ORDER
};
/** /**
* @constructor * @constructor
* @extends {ol.renderer.canvas.TileLayer} * @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); ol.inherits(ol.renderer.canvas.VectorTileLayer, ol.renderer.canvas.TileLayer);
/**
* @const
* @type {!Object.<string, Array.<ol.render.ReplayType>>}
*/
ol.renderer.canvas.VectorTileLayer.IMAGE_REPLAYS = {
'image': ol.render.replay.ORDER,
'hybrid': [ol.render.ReplayType.POLYGON, ol.render.ReplayType.LINE_STRING]
};
/**
* @const
* @type {!Object.<string, Array.<ol.render.ReplayType>>}
*/
ol.renderer.canvas.VectorTileLayer.VECTOR_REPLAYS = {
'hybrid': [ol.render.ReplayType.IMAGE, ol.render.ReplayType.TEXT],
'vector': ol.render.replay.ORDER
};
/** /**
* @inheritDoc * @inheritDoc
*/ */
@@ -107,7 +107,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.renderTileReplays_ = function(
context, frameState, layerState) { context, frameState, layerState) {
var layer = this.getLayer(); 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 pixelRatio = frameState.pixelRatio;
var skippedFeatureUids = layerState.managed ? var skippedFeatureUids = layerState.managed ?
frameState.skippedFeatureUids : {}; frameState.skippedFeatureUids : {};
@@ -393,7 +393,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.renderFeature = function(feature, s
ol.renderer.canvas.VectorTileLayer.prototype.renderTileImage_ = function( ol.renderer.canvas.VectorTileLayer.prototype.renderTileImage_ = function(
tile, frameState, layerState, skippedFeatures) { tile, frameState, layerState, skippedFeatures) {
var layer = this.getLayer(); 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) { if (!replays) {
// do not create an image in 'vector' mode // do not create an image in 'vector' mode
return; return;