Rename _ol_renderer_canvas_TileLayer_ to CanvasTileLayerRenderer

src/ol/CanvasMap.js

@@ -10,7 +10,7 @@ import _ol_obj_ from './obj.js';
 import {register, registerMultiple} from './plugins.js';
 import CanvasImageLayerRenderer from './renderer/canvas/ImageLayer.js';
 import _ol_renderer_canvas_Map_ from './renderer/canvas/Map.js';
-import _ol_renderer_canvas_TileLayer_ from './renderer/canvas/TileLayer.js';
+import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
 import _ol_renderer_canvas_VectorLayer_ from './renderer/canvas/VectorLayer.js';
 import _ol_renderer_canvas_VectorTileLayer_ from './renderer/canvas/VectorTileLayer.js';
 
@@ -18,7 +18,7 @@ import _ol_renderer_canvas_VectorTileLayer_ from './renderer/canvas/VectorTileLa
 register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
 registerMultiple(PluginType.LAYER_RENDERER, [
   CanvasImageLayerRenderer,
-  _ol_renderer_canvas_TileLayer_,
+  CanvasTileLayerRenderer,
   _ol_renderer_canvas_VectorLayer_,
   _ol_renderer_canvas_VectorTileLayer_
 ]);

src/ol/Map.js

@@ -10,7 +10,7 @@ import _ol_obj_ from './obj.js';
 import {register, registerMultiple} from './plugins.js';
 import CanvasImageLayerRenderer from './renderer/canvas/ImageLayer.js';
 import _ol_renderer_canvas_Map_ from './renderer/canvas/Map.js';
-import _ol_renderer_canvas_TileLayer_ from './renderer/canvas/TileLayer.js';
+import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
 import _ol_renderer_canvas_VectorLayer_ 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';
@@ -22,7 +22,7 @@ import _ol_renderer_webgl_VectorLayer_ from './renderer/webgl/VectorLayer.js';
 register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
 registerMultiple(PluginType.LAYER_RENDERER, [
   CanvasImageLayerRenderer,
-  _ol_renderer_canvas_TileLayer_,
+  CanvasTileLayerRenderer,
   _ol_renderer_canvas_VectorLayer_,
   _ol_renderer_canvas_VectorTileLayer_
 ]);

src/ol/renderer/canvas/TileLayer.js

@@ -18,7 +18,7 @@ import _ol_transform_ from '../../transform.js';
  * @param {ol.layer.Tile|ol.layer.VectorTile} tileLayer Tile layer.
  * @api
  */
-var _ol_renderer_canvas_TileLayer_ = function(tileLayer) {
+var CanvasTileLayerRenderer = function(tileLayer) {
 
   _ol_renderer_canvas_IntermediateCanvas_.call(this, tileLayer);
 
@@ -78,7 +78,7 @@ var _ol_renderer_canvas_TileLayer_ = function(tileLayer) {
 
 };
 
-inherits(_ol_renderer_canvas_TileLayer_, _ol_renderer_canvas_IntermediateCanvas_);
+inherits(CanvasTileLayerRenderer, _ol_renderer_canvas_IntermediateCanvas_);
 
 
 /**
@@ -87,7 +87,7 @@ inherits(_ol_renderer_canvas_TileLayer_, _ol_renderer_canvas_IntermediateCanvas_
  * @param {ol.layer.Layer} layer The candidate layer.
  * @return {boolean} The renderer can render the layer.
  */
-_ol_renderer_canvas_TileLayer_['handles'] = function(type, layer) {
+CanvasTileLayerRenderer['handles'] = function(type, layer) {
   return type === RendererType.CANVAS && layer.getType() === LayerType.TILE;
 };
 
@@ -98,8 +98,8 @@ _ol_renderer_canvas_TileLayer_['handles'] = function(type, layer) {
  * @param {ol.layer.Layer} layer The layer to be rendererd.
  * @return {ol.renderer.canvas.TileLayer} The layer renderer.
  */
-_ol_renderer_canvas_TileLayer_['create'] = function(mapRenderer, layer) {
+CanvasTileLayerRenderer['create'] = function(mapRenderer, layer) {
-  return new _ol_renderer_canvas_TileLayer_(/** @type {ol.layer.Tile} */ (layer));
+  return new CanvasTileLayerRenderer(/** @type {ol.layer.Tile} */ (layer));
 };
 
 
@@ -108,7 +108,7 @@ _ol_renderer_canvas_TileLayer_['create'] = function(mapRenderer, layer) {
  * @param {ol.Tile} tile Tile.
  * @return {boolean} Tile is drawable.
  */
-_ol_renderer_canvas_TileLayer_.prototype.isDrawableTile_ = function(tile) {
+CanvasTileLayerRenderer.prototype.isDrawableTile_ = function(tile) {
   var tileState = tile.getState();
   var useInterimTilesOnError = this.getLayer().getUseInterimTilesOnError();
   return tileState == TileState.LOADED ||
@@ -119,7 +119,7 @@ _ol_renderer_canvas_TileLayer_.prototype.isDrawableTile_ = function(tile) {
 /**
  * @inheritDoc
  */
-_ol_renderer_canvas_TileLayer_.prototype.prepareFrame = function(frameState, layerState) {
+CanvasTileLayerRenderer.prototype.prepareFrame = function(frameState, layerState) {
 
   var pixelRatio = frameState.pixelRatio;
   var size = frameState.size;
@@ -308,7 +308,7 @@ _ol_renderer_canvas_TileLayer_.prototype.prepareFrame = function(frameState, lay
  * @param {number} gutter Tile gutter.
  * @param {boolean} transition Apply an alpha transition.
  */
-_ol_renderer_canvas_TileLayer_.prototype.drawTileImage = function(tile, frameState, layerState, x, y, w, h, gutter, transition) {
+CanvasTileLayerRenderer.prototype.drawTileImage = function(tile, frameState, layerState, x, y, w, h, gutter, transition) {
   var image = tile.getImage(this.getLayer());
   if (!image) {
     return;
@@ -340,7 +340,7 @@ _ol_renderer_canvas_TileLayer_.prototype.drawTileImage = function(tile, frameSta
 /**
  * @inheritDoc
  */
-_ol_renderer_canvas_TileLayer_.prototype.getImage = function() {
+CanvasTileLayerRenderer.prototype.getImage = function() {
   var context = this.context;
   return context ? context.canvas : null;
 };
@@ -350,13 +350,13 @@ _ol_renderer_canvas_TileLayer_.prototype.getImage = function() {
  * @function
  * @return {ol.layer.Tile|ol.layer.VectorTile}
  */
-_ol_renderer_canvas_TileLayer_.prototype.getLayer;
+CanvasTileLayerRenderer.prototype.getLayer;
 
 
 /**
  * @inheritDoc
  */
-_ol_renderer_canvas_TileLayer_.prototype.getImageTransform = function() {
+CanvasTileLayerRenderer.prototype.getImageTransform = function() {
   return this.imageTransform_;
 };
-export default _ol_renderer_canvas_TileLayer_;
+export default CanvasTileLayerRenderer;

src/ol/renderer/canvas/VectorTileLayer.js

@@ -17,7 +17,7 @@ import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_ReplayGroup_ from '../../render/canvas/ReplayGroup.js';
 import _ol_render_replay_ from '../../render/replay.js';
 import RendererType from '../Type.js';
-import _ol_renderer_canvas_TileLayer_ from '../canvas/TileLayer.js';
+import CanvasTileLayerRenderer from '../canvas/TileLayer.js';
 import _ol_renderer_vector_ from '../vector.js';
 import _ol_transform_ from '../../transform.js';
 
@@ -34,7 +34,7 @@ var _ol_renderer_canvas_VectorTileLayer_ = function(layer) {
    */
   this.context = null;
 
-  _ol_renderer_canvas_TileLayer_.call(this, layer);
+  CanvasTileLayerRenderer.call(this, layer);
 
   /**
    * Declutter tree.
@@ -68,7 +68,7 @@ var _ol_renderer_canvas_VectorTileLayer_ = function(layer) {
 
 };
 
-inherits(_ol_renderer_canvas_VectorTileLayer_, _ol_renderer_canvas_TileLayer_);
+inherits(_ol_renderer_canvas_VectorTileLayer_, CanvasTileLayerRenderer);
 
 
 /**
@@ -120,7 +120,7 @@ _ol_renderer_canvas_VectorTileLayer_.VECTOR_REPLAYS = {
  */
 _ol_renderer_canvas_VectorTileLayer_.prototype.disposeInternal = function() {
   _ol_events_.unlisten(_ol_render_canvas_.labelCache, EventType.CLEAR, this.handleFontsChanged_, this);
-  _ol_renderer_canvas_TileLayer_.prototype.disposeInternal.call(this);
+  CanvasTileLayerRenderer.prototype.disposeInternal.call(this);
 };
 
 
@@ -141,7 +141,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.prepareFrame = function(frameStat
     }
   }
   this.renderedLayerRevision_ = layerRevision;
-  return _ol_renderer_canvas_TileLayer_.prototype.prepareFrame.apply(this, arguments);
+  return CanvasTileLayerRenderer.prototype.prepareFrame.apply(this, arguments);
 };
 
 
@@ -258,7 +258,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.drawTileImage = function(
   this.createReplayGroup_(vectorImageTile, frameState);
   if (this.context) {
     this.renderTileImage_(vectorImageTile, frameState, layerState);
-    _ol_renderer_canvas_TileLayer_.prototype.drawTileImage.apply(this, arguments);
+    CanvasTileLayerRenderer.prototype.drawTileImage.apply(this, arguments);
   }
 };
 
@@ -448,7 +448,7 @@ _ol_renderer_canvas_VectorTileLayer_.prototype.postCompose = function(context, f
     _ol_render_canvas_.rotateAtOffset(context, rotation,
         /** @type {number} */ (offsetX), /** @type {number} */ (offsetY));
   }
-  _ol_renderer_canvas_TileLayer_.prototype.postCompose.apply(this, arguments);
+  CanvasTileLayerRenderer.prototype.postCompose.apply(this, arguments);
 };
 
 

src/ol/source/Raster.js

@@ -14,7 +14,7 @@ import _ol_layer_Image_ from '../layer/Image.js';
 import TileLayer from '../layer/Tile.js';
 import _ol_obj_ from '../obj.js';
 import CanvasImageLayerRenderer from '../renderer/canvas/ImageLayer.js';
-import _ol_renderer_canvas_TileLayer_ from '../renderer/canvas/TileLayer.js';
+import CanvasTileLayerRenderer from '../renderer/canvas/TileLayer.js';
 import _ol_source_Image_ from '../source/Image.js';
 import RasterOperationType from '../source/RasterOperationType.js';
 import SourceState from '../source/State.js';
@@ -425,7 +425,7 @@ function createImageRenderer(source) {
  */
 function createTileRenderer(source) {
   var layer = new TileLayer({source: source});
-  return new _ol_renderer_canvas_TileLayer_(layer);
+  return new CanvasTileLayerRenderer(layer);
 }
 
 

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

@@ -3,7 +3,7 @@ import _ol_View_ from '../../../../../src/ol/View.js';
 import TileLayer from '../../../../../src/ol/layer/Tile.js';
 import {get as getProjection} from '../../../../../src/ol/proj.js';
 import _ol_renderer_Map_ from '../../../../../src/ol/renderer/Map.js';
-import _ol_renderer_canvas_TileLayer_ from '../../../../../src/ol/renderer/canvas/TileLayer.js';
+import CanvasTileLayerRenderer from '../../../../../src/ol/renderer/canvas/TileLayer.js';
 import _ol_source_TileWMS_ from '../../../../../src/ol/source/TileWMS.js';
 import _ol_source_XYZ_ from '../../../../../src/ol/source/XYZ.js';
 import _ol_transform_ from '../../../../../src/ol/transform.js';
@@ -75,7 +75,7 @@ describe('ol.renderer.canvas.TileLayer', function() {
           tileSize: 1
         })
       });
-      var renderer = new _ol_renderer_canvas_TileLayer_(layer);
+      var renderer = new CanvasTileLayerRenderer(layer);
       renderer.renderedTiles = [];
       var frameState = {
         viewHints: [],