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

Rename _ol_renderer_canvas_VectorTileLayer_ to CanvasVectorTileLayerRenderer

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 09:41:18 -07:00
parent 1dfc37d6d2
commit 4d5dd1ea0d
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/CanvasMap.js
View File

@@ -12,7 +12,7 @@ import CanvasImageLayerRenderer from './renderer/canvas/ImageLayer.js';
import _ol_renderer_canvas_Map_ from './renderer/canvas/Map.js';
import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js';
import _ol_renderer_canvas_VectorTileLayer_ from './renderer/canvas/VectorTileLayer.js';
import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.js';
register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
@@ -20,7 +20,7 @@ registerMultiple(PluginType.LAYER_RENDERER, [
CanvasImageLayerRenderer,
CanvasTileLayerRenderer,
CanvasVectorLayerRenderer,
_ol_renderer_canvas_VectorTileLayer_
CanvasVectorTileLayerRenderer
]);

4
src/ol/Map.js
View File

@@ -12,7 +12,7 @@ import CanvasImageLayerRenderer from './renderer/canvas/ImageLayer.js';
import _ol_renderer_canvas_Map_ from './renderer/canvas/Map.js';
import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js';
import _ol_renderer_canvas_VectorTileLayer_ from './renderer/canvas/VectorTileLayer.js';
import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.js';
import _ol_renderer_webgl_ImageLayer_ from './renderer/webgl/ImageLayer.js';
import _ol_renderer_webgl_Map_ from './renderer/webgl/Map.js';
import _ol_renderer_webgl_TileLayer_ from './renderer/webgl/TileLayer.js';
@@ -24,7 +24,7 @@ registerMultiple(PluginType.LAYER_RENDERER, [
CanvasImageLayerRenderer,
CanvasTileLayerRenderer,
CanvasVectorLayerRenderer,
_ol_renderer_canvas_VectorTileLayer_
CanvasVectorTileLayerRenderer
]);
// TODO: move these to new ol-webgl package

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

@@ -27,7 +27,7 @@ import _ol_transform_ from '../../transform.js';
* @param {ol.layer.VectorTile} layer VectorTile layer.
* @api
*/
var _ol_renderer_canvas_VectorTileLayer_ = function(layer) {
var CanvasVectorTileLayerRenderer = function(layer) {
/**
* @type {CanvasRenderingContext2D}
@@ -68,7 +68,7 @@ var _ol_renderer_canvas_VectorTileLayer_ = function(layer) {
};
inherits(_ol_renderer_canvas_VectorTileLayer_, CanvasTileLayerRenderer);
inherits(CanvasVectorTileLayerRenderer, CanvasTileLayerRenderer);
/**
@@ -77,7 +77,7 @@ inherits(_ol_renderer_canvas_VectorTileLayer_, CanvasTileLayerRenderer);
* @param {ol.layer.Layer} layer The candidate layer.
* @return {boolean} The renderer can render the layer.
*/
_ol_renderer_canvas_VectorTileLayer_['handles'] = function(type, layer) {
CanvasVectorTileLayerRenderer['handles'] = function(type, layer) {
return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR_TILE;
};
@@ -88,8 +88,8 @@ _ol_renderer_canvas_VectorTileLayer_['handles'] = function(type, layer) {
* @param {ol.layer.Layer} layer The layer to be rendererd.
* @return {ol.renderer.canvas.VectorTileLayer} The layer renderer.
*/
_ol_renderer_canvas_VectorTileLayer_['create'] = function(mapRenderer, layer) {
return new _ol_renderer_canvas_VectorTileLayer_(/** @type {ol.layer.VectorTile} */ (layer));
CanvasVectorTileLayerRenderer['create'] = function(mapRenderer, layer) {
return new CanvasVectorTileLayerRenderer(/** @type {ol.layer.VectorTile} */ (layer));
};
@@ -97,7 +97,7 @@ _ol_renderer_canvas_VectorTileLayer_['create'] = function(mapRenderer, layer) {
* @const
* @type {!Object.<string, Array.<ol.render.ReplayType>>}
*/
_ol_renderer_canvas_VectorTileLayer_.IMAGE_REPLAYS = {
CanvasVectorTileLayerRenderer.IMAGE_REPLAYS = {
'image': [ReplayType.POLYGON, ReplayType.CIRCLE,
ReplayType.LINE_STRING, ReplayType.IMAGE, ReplayType.TEXT],
'hybrid': [ReplayType.POLYGON, ReplayType.LINE_STRING]
@@ -108,7 +108,7 @@ _ol_renderer_canvas_VectorTileLayer_.IMAGE_REPLAYS = {
* @const
* @type {!Object.<string, Array.<ol.render.ReplayType>>}
*/
_ol_renderer_canvas_VectorTileLayer_.VECTOR_REPLAYS = {
CanvasVectorTileLayerRenderer.VECTOR_REPLAYS = {
'image': [ReplayType.DEFAULT],
'hybrid': [ReplayType.IMAGE, ReplayType.TEXT, ReplayType.DEFAULT],
'vector': _ol_render_replay_.ORDER
@@ -118,7 +118,7 @@ _ol_renderer_canvas_VectorTileLayer_.VECTOR_REPLAYS = {
/**
* @inheritDoc
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.disposeInternal = function() {
CanvasVectorTileLayerRenderer.prototype.disposeInternal = function() {
_ol_events_.unlisten(_ol_render_canvas_.labelCache, EventType.CLEAR, this.handleFontsChanged_, this);
CanvasTileLayerRenderer.prototype.disposeInternal.call(this);
};
@@ -127,7 +127,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.disposeInternal = function() {
/**
* @inheritDoc
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.prepareFrame = function(frameState, layerState) {
CanvasVectorTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState) {
var layer = this.getLayer();
var layerRevision = layer.getRevision();
if (this.renderedLayerRevision_ != layerRevision) {
@@ -150,7 +150,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.prepareFrame = function(frameStat
* @param {olx.FrameState} frameState Frame state.
* @private
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.createReplayGroup_ = function(
CanvasVectorTileLayerRenderer.prototype.createReplayGroup_ = function(
tile, frameState) {
var layer = this.getLayer();
var pixelRatio = frameState.pixelRatio;
@@ -252,7 +252,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.createReplayGroup_ = function(
/**
* @inheritDoc
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.drawTileImage = function(
CanvasVectorTileLayerRenderer.prototype.drawTileImage = function(
tile, frameState, layerState, x, y, w, h, gutter, transition) {
var vectorImageTile = /** @type {ol.VectorImageTile} */ (tile);
this.createReplayGroup_(vectorImageTile, frameState);
@@ -266,7 +266,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.drawTileImage = function(
/**
* @inheritDoc
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
CanvasVectorTileLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) {
var resolution = frameState.viewState.resolution;
var rotation = frameState.viewState.rotation;
hitTolerance = hitTolerance == undefined ? 0 : hitTolerance;
@@ -321,7 +321,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.forEachFeatureAtCoordinate = func
* @return {ol.Transform} transform Transform.
* @private
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.getReplayTransform_ = function(tile, frameState) {
CanvasVectorTileLayerRenderer.prototype.getReplayTransform_ = function(tile, frameState) {
var layer = this.getLayer();
var source = /** @type {ol.source.VectorTile} */ (layer.getSource());
var tileGrid = source.getTileGrid();
@@ -348,7 +348,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.getReplayTransform_ = function(ti
/**
* @param {ol.events.Event} event Event.
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.handleFontsChanged_ = function(event) {
CanvasVectorTileLayerRenderer.prototype.handleFontsChanged_ = function(event) {
var layer = this.getLayer();
if (layer.getVisible() && this.renderedLayerRevision_ !== undefined) {
layer.changed();
@@ -361,7 +361,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.handleFontsChanged_ = function(ev
* @param {ol.events.Event} event Image style change event.
* @private
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.handleStyleImageChange_ = function(event) {
CanvasVectorTileLayerRenderer.prototype.handleStyleImageChange_ = function(event) {
this.renderIfReadyAndVisible();
};
@@ -369,12 +369,12 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.handleStyleImageChange_ = functio
/**
* @inheritDoc
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.postCompose = function(context, frameState, layerState) {
CanvasVectorTileLayerRenderer.prototype.postCompose = function(context, frameState, layerState) {
var layer = this.getLayer();
var declutterReplays = layer.getDeclutter() ? {} : null;
var source = /** @type {ol.source.VectorTile} */ (layer.getSource());
var renderMode = layer.getRenderMode();
var replayTypes = _ol_renderer_canvas_VectorTileLayer_.VECTOR_REPLAYS[renderMode];
var replayTypes = CanvasVectorTileLayerRenderer.VECTOR_REPLAYS[renderMode];
var pixelRatio = frameState.pixelRatio;
var rotation = frameState.viewState.rotation;
var size = frameState.size;
@@ -460,7 +460,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.postCompose = function(context, f
* @param {ol.render.canvas.ReplayGroup} replayGroup Replay group.
* @return {boolean} `true` if an image is loading.
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.renderFeature = function(feature, squaredTolerance, styles, replayGroup) {
CanvasVectorTileLayerRenderer.prototype.renderFeature = function(feature, squaredTolerance, styles, replayGroup) {
if (!styles) {
return false;
}
@@ -486,12 +486,12 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.renderFeature = function(feature,
* @param {ol.LayerState} layerState Layer state.
* @private
*/
_ol_renderer_canvas_VectorTileLayer_.prototype.renderTileImage_ = function(
CanvasVectorTileLayerRenderer.prototype.renderTileImage_ = function(
tile, frameState, layerState) {
var layer = this.getLayer();
var replayState = tile.getReplayState(layer);
var revision = layer.getRevision();
var replays = _ol_renderer_canvas_VectorTileLayer_.IMAGE_REPLAYS[layer.getRenderMode()];
var replays = CanvasVectorTileLayerRenderer.IMAGE_REPLAYS[layer.getRenderMode()];
if (replays && replayState.renderedTileRevision !== revision) {
replayState.renderedTileRevision = revision;
var tileCoord = tile.wrappedTileCoord;
@@ -519,4 +519,4 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.renderTileImage_ = function(
}
}
};
export default _ol_renderer_canvas_VectorTileLayer_;
export default CanvasVectorTileLayerRenderer;

22
test/spec/ol/renderer/canvas/vectortilelayer.test.js
View File

@@ -14,7 +14,7 @@ import {get as getProjection, fromLonLat} from '../../../../../src/ol/proj.js';
import _ol_proj_Projection_ from '../../../../../src/ol/proj/Projection.js';
import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
import _ol_render_Feature_ from '../../../../../src/ol/render/Feature.js';
import _ol_renderer_canvas_VectorTileLayer_ from '../../../../../src/ol/renderer/canvas/VectorTileLayer.js';
import CanvasVectorTileLayerRenderer from '../../../../../src/ol/renderer/canvas/VectorTileLayer.js';
import _ol_source_VectorTile_ from '../../../../../src/ol/source/VectorTile.js';
import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
import _ol_style_Text_ from '../../../../../src/ol/style/Text.js';
@@ -90,20 +90,20 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
it('creates a new instance', function() {
var renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
expect(renderer).to.be.a(_ol_renderer_canvas_VectorTileLayer_);
var renderer = new CanvasVectorTileLayerRenderer(layer);
expect(renderer).to.be.a(CanvasVectorTileLayerRenderer);
expect(renderer.zDirection).to.be(0);
});
it('uses lower resolution for pure vector rendering', function() {
layer.renderMode_ = 'vector';
var renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
var renderer = new CanvasVectorTileLayerRenderer(layer);
expect(renderer.zDirection).to.be(1);
});
it('does not render images for pure vector rendering', function() {
layer.renderMode_ = 'vector';
var spy = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
var spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'renderTileImage_');
map.renderSync();
expect(spy.callCount).to.be(0);
@@ -112,7 +112,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
it('does not render replays for pure image rendering', function() {
layer.renderMode_ = 'image';
var spy = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
var spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'getTransform');
map.renderSync();
expect(spy.callCount).to.be(0);
@@ -120,9 +120,9 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
});
it('renders both replays and images for hybrid rendering', function() {
var spy1 = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
var spy1 = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'getTransform');
var spy2 = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
var spy2 = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'renderTileImage_');
map.renderSync();
expect(spy1.callCount).to.be(1);
@@ -136,7 +136,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
layer.setStyle(new _ol_style_Style_({
renderer: function() {}
}));
var spy = sinon.spy(_ol_renderer_canvas_VectorTileLayer_.prototype,
var spy = sinon.spy(CanvasVectorTileLayerRenderer.prototype,
'getTransform');
map.renderSync();
expect(spy.callCount).to.be(1);
@@ -261,7 +261,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
layer.getSource().getTile = function() {
return tile;
};
var renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
var renderer = new CanvasVectorTileLayerRenderer(layer);
renderer.renderTileImage_ = sinon.spy();
var proj = getProjection('EPSG:3857');
var frameState = {
@@ -314,7 +314,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
tileGrid: _ol_tilegrid_.createXYZ()
})
});
renderer = new _ol_renderer_canvas_VectorTileLayer_(layer);
renderer = new CanvasVectorTileLayerRenderer(layer);
replayGroup.forEachFeatureAtCoordinate = function(coordinate,
resolution, rotation, hitTolerance, skippedFeaturesUids, callback) {
var feature = new Feature();