Rename _ol_renderer_canvas_Layer_ to CanvasLayerRenderer

src/ol/renderer/canvas/IntermediateCanvas.js

@@ -5,7 +5,7 @@ import {inherits, nullFunction} from '../../index.js';
 import _ol_coordinate_ from '../../coordinate.js';
 import {createCanvasContext2D} from '../../dom.js';
 import {containsExtent, intersects} from '../../extent.js';
-import _ol_renderer_canvas_Layer_ from '../canvas/Layer.js';
+import CanvasLayerRenderer from '../canvas/Layer.js';
 import _ol_transform_ from '../../transform.js';
 
 /**
@@ -16,7 +16,7 @@ import _ol_transform_ from '../../transform.js';
  */
 var _ol_renderer_canvas_IntermediateCanvas_ = function(layer) {
 
-  _ol_renderer_canvas_Layer_.call(this, layer);
+  CanvasLayerRenderer.call(this, layer);
 
   /**
    * @protected
@@ -32,7 +32,7 @@ var _ol_renderer_canvas_IntermediateCanvas_ = function(layer) {
 
 };
 
-inherits(_ol_renderer_canvas_IntermediateCanvas_, _ol_renderer_canvas_Layer_);
+inherits(_ol_renderer_canvas_IntermediateCanvas_, CanvasLayerRenderer);
 
 
 /**
@@ -126,7 +126,7 @@ _ol_renderer_canvas_IntermediateCanvas_.prototype.forEachLayerAtCoordinate = fun
   if (this.getLayer().getSource().forEachFeatureAtCoordinate !== nullFunction) {
     // for ImageCanvas sources use the original hit-detection logic,
     // so that for example also transparent polygons are detected
-    return _ol_renderer_canvas_Layer_.prototype.forEachLayerAtCoordinate.apply(this, arguments);
+    return CanvasLayerRenderer.prototype.forEachLayerAtCoordinate.apply(this, arguments);
   } else {
     var pixel = _ol_transform_.apply(this.coordinateToCanvasPixelTransform, coordinate.slice());
     _ol_coordinate_.scale(pixel, frameState.viewState.resolution / this.renderedResolution);

src/ol/renderer/canvas/Layer.js

@@ -17,7 +17,7 @@ import _ol_transform_ from '../../transform.js';
  * @extends {ol.renderer.Layer}
  * @param {ol.layer.Layer} layer Layer.
  */
-var _ol_renderer_canvas_Layer_ = function(layer) {
+var CanvasLayerRenderer = function(layer) {
 
   LayerRenderer.call(this, layer);
 
@@ -35,7 +35,7 @@ var _ol_renderer_canvas_Layer_ = function(layer) {
 
 };
 
-inherits(_ol_renderer_canvas_Layer_, LayerRenderer);
+inherits(CanvasLayerRenderer, LayerRenderer);
 
 
 /**
@@ -44,7 +44,7 @@ inherits(_ol_renderer_canvas_Layer_, LayerRenderer);
  * @param {ol.Extent} extent Clip extent.
  * @protected
  */
-_ol_renderer_canvas_Layer_.prototype.clip = function(context, frameState, extent) {
+CanvasLayerRenderer.prototype.clip = function(context, frameState, extent) {
   var pixelRatio = frameState.pixelRatio;
   var width = frameState.size[0] * pixelRatio;
   var height = frameState.size[1] * pixelRatio;
@@ -78,7 +78,7 @@ _ol_renderer_canvas_Layer_.prototype.clip = function(context, frameState, extent
  * @param {ol.Transform=} opt_transform Transform.
  * @private
  */
-_ol_renderer_canvas_Layer_.prototype.dispatchComposeEvent_ = function(type, context, frameState, opt_transform) {
+CanvasLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, frameState, opt_transform) {
   var layer = this.getLayer();
   if (layer.hasListener(type)) {
     var width = frameState.size[0] * frameState.pixelRatio;
@@ -107,7 +107,7 @@ _ol_renderer_canvas_Layer_.prototype.dispatchComposeEvent_ = function(type, cont
  * @return {T|undefined} Callback result.
  * @template S,T,U
  */
-_ol_renderer_canvas_Layer_.prototype.forEachLayerAtCoordinate = function(coordinate, frameState, callback, thisArg) {
+CanvasLayerRenderer.prototype.forEachLayerAtCoordinate = function(coordinate, frameState, callback, thisArg) {
   var hasFeature = this.forEachFeatureAtCoordinate(coordinate, frameState, 0, TRUE, this);
 
   if (hasFeature) {
@@ -125,7 +125,7 @@ _ol_renderer_canvas_Layer_.prototype.forEachLayerAtCoordinate = function(coordin
  * @param {ol.Transform=} opt_transform Transform.
  * @protected
  */
-_ol_renderer_canvas_Layer_.prototype.postCompose = function(context, frameState, layerState, opt_transform) {
+CanvasLayerRenderer.prototype.postCompose = function(context, frameState, layerState, opt_transform) {
   this.dispatchComposeEvent_(RenderEventType.POSTCOMPOSE, context, frameState, opt_transform);
 };
 
@@ -136,7 +136,7 @@ _ol_renderer_canvas_Layer_.prototype.postCompose = function(context, frameState,
  * @param {ol.Transform=} opt_transform Transform.
  * @protected
  */
-_ol_renderer_canvas_Layer_.prototype.preCompose = function(context, frameState, opt_transform) {
+CanvasLayerRenderer.prototype.preCompose = function(context, frameState, opt_transform) {
   this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, context, frameState, opt_transform);
 };
 
@@ -147,7 +147,7 @@ _ol_renderer_canvas_Layer_.prototype.preCompose = function(context, frameState,
  * @param {ol.Transform=} opt_transform Transform.
  * @protected
  */
-_ol_renderer_canvas_Layer_.prototype.dispatchRenderEvent = function(context, frameState, opt_transform) {
+CanvasLayerRenderer.prototype.dispatchRenderEvent = function(context, frameState, opt_transform) {
   this.dispatchComposeEvent_(RenderEventType.RENDER, context, frameState, opt_transform);
 };
 
@@ -158,7 +158,7 @@ _ol_renderer_canvas_Layer_.prototype.dispatchRenderEvent = function(context, fra
  * @protected
  * @return {!ol.Transform} Transform.
  */
-_ol_renderer_canvas_Layer_.prototype.getTransform = function(frameState, offsetX) {
+CanvasLayerRenderer.prototype.getTransform = function(frameState, offsetX) {
   var viewState = frameState.viewState;
   var pixelRatio = frameState.pixelRatio;
   var dx1 = pixelRatio * frameState.size[0] / 2;
@@ -178,7 +178,7 @@ _ol_renderer_canvas_Layer_.prototype.getTransform = function(frameState, offsetX
  * @param {ol.LayerState} layerState Layer state.
  * @param {CanvasRenderingContext2D} context Context.
  */
-_ol_renderer_canvas_Layer_.prototype.composeFrame = function(frameState, layerState, context) {};
+CanvasLayerRenderer.prototype.composeFrame = function(frameState, layerState, context) {};
 
 /**
  * @abstract
@@ -186,5 +186,5 @@ _ol_renderer_canvas_Layer_.prototype.composeFrame = function(frameState, layerSt
  * @param {ol.LayerState} layerState Layer state.
  * @return {boolean} whether composeFrame should be called.
  */
-_ol_renderer_canvas_Layer_.prototype.prepareFrame = function(frameState, layerState) {};
+CanvasLayerRenderer.prototype.prepareFrame = function(frameState, layerState) {};
-export default _ol_renderer_canvas_Layer_;
+export default CanvasLayerRenderer;

src/ol/renderer/canvas/VectorLayer.js

@@ -13,7 +13,7 @@ import RenderEventType from '../../render/EventType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_ReplayGroup_ from '../../render/canvas/ReplayGroup.js';
 import RendererType from '../Type.js';
-import _ol_renderer_canvas_Layer_ from '../canvas/Layer.js';
+import CanvasLayerRenderer from '../canvas/Layer.js';
 import _ol_renderer_vector_ from '../vector.js';
 
 /**
@@ -24,7 +24,7 @@ import _ol_renderer_vector_ from '../vector.js';
  */
 var CanvasVectorLayerRenderer = function(vectorLayer) {
 
-  _ol_renderer_canvas_Layer_.call(this, vectorLayer);
+  CanvasLayerRenderer.call(this, vectorLayer);
 
   /**
    * Declutter tree.
@@ -83,7 +83,7 @@ var CanvasVectorLayerRenderer = function(vectorLayer) {
 
 };
 
-inherits(CanvasVectorLayerRenderer, _ol_renderer_canvas_Layer_);
+inherits(CanvasVectorLayerRenderer, CanvasLayerRenderer);
 
 
 /**
@@ -113,7 +113,7 @@ CanvasVectorLayerRenderer['create'] = function(mapRenderer, layer) {
  */
 CanvasVectorLayerRenderer.prototype.disposeInternal = function() {
   _ol_events_.unlisten(_ol_render_canvas_.labelCache, EventType.CLEAR, this.handleFontsChanged_, this);
-  _ol_renderer_canvas_Layer_.prototype.disposeInternal.call(this);
+  CanvasLayerRenderer.prototype.disposeInternal.call(this);
 };
 
 

test/spec/ol/renderer/canvas/map.test.js

@@ -5,7 +5,7 @@ import View from '../../../../../src/ol/View.js';
 import Point from '../../../../../src/ol/geom/Point.js';
 import TileLayer from '../../../../../src/ol/layer/Tile.js';
 import VectorLayer from '../../../../../src/ol/layer/Vector.js';
-import _ol_renderer_canvas_Layer_ from '../../../../../src/ol/renderer/canvas/Layer.js';
+import CanvasLayerRenderer from '../../../../../src/ol/renderer/canvas/Layer.js';
 import CanvasMapRenderer from '../../../../../src/ol/renderer/canvas/Map.js';
 import VectorSource from '../../../../../src/ol/source/Vector.js';
 import _ol_style_Icon_ from '../../../../../src/ol/style/Icon.js';
@@ -174,7 +174,7 @@ describe('ol.renderer.canvas.Map', function() {
       });
       renderer = map.getRenderer();
       renderer.layerRenderers_ = {};
-      var layerRenderer = new _ol_renderer_canvas_Layer_(layer);
+      var layerRenderer = new CanvasLayerRenderer(layer);
       layerRenderer.prepareFrame = function() {
         return true;
       };