diff --git a/src/ol/CanvasMap.js b/src/ol/CanvasMap.js index 13be9b4108..302150000f 100644 --- a/src/ol/CanvasMap.js +++ b/src/ol/CanvasMap.js @@ -11,7 +11,7 @@ import {register, registerMultiple} from './plugins.js'; 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 _ol_renderer_canvas_VectorLayer_ from './renderer/canvas/VectorLayer.js'; +import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js'; import _ol_renderer_canvas_VectorTileLayer_ from './renderer/canvas/VectorTileLayer.js'; @@ -19,7 +19,7 @@ register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_); registerMultiple(PluginType.LAYER_RENDERER, [ CanvasImageLayerRenderer, CanvasTileLayerRenderer, - _ol_renderer_canvas_VectorLayer_, + CanvasVectorLayerRenderer, _ol_renderer_canvas_VectorTileLayer_ ]); diff --git a/src/ol/Map.js b/src/ol/Map.js index 4ebe4c73eb..590652254a 100644 --- a/src/ol/Map.js +++ b/src/ol/Map.js @@ -11,7 +11,7 @@ import {register, registerMultiple} from './plugins.js'; 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 _ol_renderer_canvas_VectorLayer_ from './renderer/canvas/VectorLayer.js'; +import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js'; import _ol_renderer_canvas_VectorTileLayer_ 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'; @@ -23,7 +23,7 @@ register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_); registerMultiple(PluginType.LAYER_RENDERER, [ CanvasImageLayerRenderer, CanvasTileLayerRenderer, - _ol_renderer_canvas_VectorLayer_, + CanvasVectorLayerRenderer, _ol_renderer_canvas_VectorTileLayer_ ]); diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 761d7bf500..f178bfe9df 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -22,7 +22,7 @@ import _ol_renderer_vector_ from '../vector.js'; * @param {ol.layer.Vector} vectorLayer Vector layer. * @api */ -var _ol_renderer_canvas_VectorLayer_ = function(vectorLayer) { +var CanvasVectorLayerRenderer = function(vectorLayer) { _ol_renderer_canvas_Layer_.call(this, vectorLayer); @@ -83,7 +83,7 @@ var _ol_renderer_canvas_VectorLayer_ = function(vectorLayer) { }; -inherits(_ol_renderer_canvas_VectorLayer_, _ol_renderer_canvas_Layer_); +inherits(CanvasVectorLayerRenderer, _ol_renderer_canvas_Layer_); /** @@ -92,7 +92,7 @@ inherits(_ol_renderer_canvas_VectorLayer_, _ol_renderer_canvas_Layer_); * @param {ol.layer.Layer} layer The candidate layer. * @return {boolean} The renderer can render the layer. */ -_ol_renderer_canvas_VectorLayer_['handles'] = function(type, layer) { +CanvasVectorLayerRenderer['handles'] = function(type, layer) { return type === RendererType.CANVAS && layer.getType() === LayerType.VECTOR; }; @@ -103,15 +103,15 @@ _ol_renderer_canvas_VectorLayer_['handles'] = function(type, layer) { * @param {ol.layer.Layer} layer The layer to be rendererd. * @return {ol.renderer.canvas.VectorLayer} The layer renderer. */ -_ol_renderer_canvas_VectorLayer_['create'] = function(mapRenderer, layer) { - return new _ol_renderer_canvas_VectorLayer_(/** @type {ol.layer.Vector} */ (layer)); +CanvasVectorLayerRenderer['create'] = function(mapRenderer, layer) { + return new CanvasVectorLayerRenderer(/** @type {ol.layer.Vector} */ (layer)); }; /** * @inheritDoc */ -_ol_renderer_canvas_VectorLayer_.prototype.disposeInternal = function() { +CanvasVectorLayerRenderer.prototype.disposeInternal = function() { _ol_events_.unlisten(_ol_render_canvas_.labelCache, EventType.CLEAR, this.handleFontsChanged_, this); _ol_renderer_canvas_Layer_.prototype.disposeInternal.call(this); }; @@ -120,7 +120,7 @@ _ol_renderer_canvas_VectorLayer_.prototype.disposeInternal = function() { /** * @inheritDoc */ -_ol_renderer_canvas_VectorLayer_.prototype.composeFrame = function(frameState, layerState, context) { +CanvasVectorLayerRenderer.prototype.composeFrame = function(frameState, layerState, context) { var extent = frameState.extent; var pixelRatio = frameState.pixelRatio; @@ -246,7 +246,7 @@ _ol_renderer_canvas_VectorLayer_.prototype.composeFrame = function(frameState, l /** * @inheritDoc */ -_ol_renderer_canvas_VectorLayer_.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) { +CanvasVectorLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) { if (!this.replayGroup_) { return undefined; } else { @@ -276,7 +276,7 @@ _ol_renderer_canvas_VectorLayer_.prototype.forEachFeatureAtCoordinate = function /** * @param {ol.events.Event} event Event. */ -_ol_renderer_canvas_VectorLayer_.prototype.handleFontsChanged_ = function(event) { +CanvasVectorLayerRenderer.prototype.handleFontsChanged_ = function(event) { var layer = this.getLayer(); if (layer.getVisible() && this.replayGroup_) { layer.changed(); @@ -289,7 +289,7 @@ _ol_renderer_canvas_VectorLayer_.prototype.handleFontsChanged_ = function(event) * @param {ol.events.Event} event Image style change event. * @private */ -_ol_renderer_canvas_VectorLayer_.prototype.handleStyleImageChange_ = function(event) { +CanvasVectorLayerRenderer.prototype.handleStyleImageChange_ = function(event) { this.renderIfReadyAndVisible(); }; @@ -297,7 +297,7 @@ _ol_renderer_canvas_VectorLayer_.prototype.handleStyleImageChange_ = function(ev /** * @inheritDoc */ -_ol_renderer_canvas_VectorLayer_.prototype.prepareFrame = function(frameState, layerState) { +CanvasVectorLayerRenderer.prototype.prepareFrame = function(frameState, layerState) { var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer()); var vectorSource = vectorLayer.getSource(); @@ -418,7 +418,7 @@ _ol_renderer_canvas_VectorLayer_.prototype.prepareFrame = function(frameState, l * @param {ol.render.canvas.ReplayGroup} replayGroup Replay group. * @return {boolean} `true` if an image is loading. */ -_ol_renderer_canvas_VectorLayer_.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) { +CanvasVectorLayerRenderer.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) { if (!styles) { return false; } @@ -438,4 +438,4 @@ _ol_renderer_canvas_VectorLayer_.prototype.renderFeature = function(feature, res } return loading; }; -export default _ol_renderer_canvas_VectorLayer_; +export default CanvasVectorLayerRenderer; diff --git a/test/spec/ol/renderer/canvas/vectorlayer.test.js b/test/spec/ol/renderer/canvas/vectorlayer.test.js index cad4be3be1..c64dbe0f83 100644 --- a/test/spec/ol/renderer/canvas/vectorlayer.test.js +++ b/test/spec/ol/renderer/canvas/vectorlayer.test.js @@ -8,7 +8,7 @@ import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js'; import _ol_obj_ from '../../../../../src/ol/obj.js'; import {get as getProjection} from '../../../../../src/ol/proj.js'; import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js'; -import _ol_renderer_canvas_VectorLayer_ from '../../../../../src/ol/renderer/canvas/VectorLayer.js'; +import CanvasVectorLayerRenderer from '../../../../../src/ol/renderer/canvas/VectorLayer.js'; import _ol_source_Vector_ from '../../../../../src/ol/source/Vector.js'; import _ol_style_Style_ from '../../../../../src/ol/style/Style.js'; import _ol_style_Text_ from '../../../../../src/ol/style/Text.js'; @@ -40,8 +40,8 @@ describe('ol.renderer.canvas.VectorLayer', function() { var layer = new _ol_layer_Vector_({ source: new _ol_source_Vector_() }); - var renderer = new _ol_renderer_canvas_VectorLayer_(layer); - expect(renderer).to.be.a(_ol_renderer_canvas_VectorLayer_); + var renderer = new CanvasVectorLayerRenderer(layer); + expect(renderer).to.be.a(CanvasVectorLayerRenderer); }); it('gives precedence to feature styles over layer styles', function() { @@ -188,7 +188,7 @@ describe('ol.renderer.canvas.VectorLayer', function() { layer = new _ol_layer_Vector_({ source: new _ol_source_Vector_() }); - renderer = new _ol_renderer_canvas_VectorLayer_(layer); + renderer = new CanvasVectorLayerRenderer(layer); var replayGroup = {}; renderer.replayGroup_ = replayGroup; replayGroup.forEachFeatureAtCoordinate = function(coordinate, @@ -225,7 +225,7 @@ describe('ol.renderer.canvas.VectorLayer', function() { var layer = new _ol_layer_Vector_({ source: new _ol_source_Vector_({wrapX: true}) }); - renderer = new _ol_renderer_canvas_VectorLayer_(layer); + renderer = new CanvasVectorLayerRenderer(layer); var projection = getProjection('EPSG:3857'); projExtent = projection.getExtent(); worldWidth = _ol_extent_.getWidth(projExtent);