Rename _ol_renderer_canvas_Map_ to CanvasMapRenderer

src/ol/CanvasMap.js

@@ -9,13 +9,13 @@ import {defaults as defaultInteractions} from './interaction.js';
 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 CanvasMapRenderer from './renderer/canvas/Map.js';
 import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
 import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js';
 import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.js';
 
 
-register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
+register(PluginType.MAP_RENDERER, CanvasMapRenderer);
 registerMultiple(PluginType.LAYER_RENDERER, [
   CanvasImageLayerRenderer,
   CanvasTileLayerRenderer,

src/ol/Map.js

@@ -9,7 +9,7 @@ import {defaults as defaultInteractions} from './interaction.js';
 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 CanvasMapRenderer from './renderer/canvas/Map.js';
 import CanvasTileLayerRenderer from './renderer/canvas/TileLayer.js';
 import CanvasVectorLayerRenderer from './renderer/canvas/VectorLayer.js';
 import CanvasVectorTileLayerRenderer from './renderer/canvas/VectorTileLayer.js';
@@ -19,7 +19,7 @@ import _ol_renderer_webgl_TileLayer_ from './renderer/webgl/TileLayer.js';
 import _ol_renderer_webgl_VectorLayer_ from './renderer/webgl/VectorLayer.js';
 
 
-register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_);
+register(PluginType.MAP_RENDERER, CanvasMapRenderer);
 registerMultiple(PluginType.LAYER_RENDERER, [
   CanvasImageLayerRenderer,
   CanvasTileLayerRenderer,

src/ol/renderer/canvas/Map.js

@@ -24,7 +24,7 @@ import SourceState from '../../source/State.js';
  * @param {ol.PluggableMap} map Map.
  * @api
  */
-var _ol_renderer_canvas_Map_ = function(container, map) {
+var CanvasMapRenderer = function(container, map) {
 
   _ol_renderer_Map_.call(this, container, map);
 
@@ -60,7 +60,7 @@ var _ol_renderer_canvas_Map_ = function(container, map) {
 
 };
 
-inherits(_ol_renderer_canvas_Map_, _ol_renderer_Map_);
+inherits(CanvasMapRenderer, _ol_renderer_Map_);
 
 
 /**
@@ -68,7 +68,7 @@ inherits(_ol_renderer_canvas_Map_, _ol_renderer_Map_);
  * @param {ol.renderer.Type} type The renderer type.
  * @return {boolean} The renderer can render the layer.
  */
-_ol_renderer_canvas_Map_['handles'] = function(type) {
+CanvasMapRenderer['handles'] = function(type) {
   return type === RendererType.CANVAS;
 };
 
@@ -79,8 +79,8 @@ _ol_renderer_canvas_Map_['handles'] = function(type) {
  * @param {ol.PluggableMap} map Map.
  * @return {ol.renderer.canvas.Map} The map renderer.
  */
-_ol_renderer_canvas_Map_['create'] = function(container, map) {
+CanvasMapRenderer['create'] = function(container, map) {
-  return new _ol_renderer_canvas_Map_(container, map);
+  return new CanvasMapRenderer(container, map);
 };
 
 
@@ -89,7 +89,7 @@ _ol_renderer_canvas_Map_['create'] = function(container, map) {
  * @param {olx.FrameState} frameState Frame state.
  * @private
  */
-_ol_renderer_canvas_Map_.prototype.dispatchComposeEvent_ = function(type, frameState) {
+CanvasMapRenderer.prototype.dispatchComposeEvent_ = function(type, frameState) {
   var map = this.getMap();
   var context = this.context_;
   if (map.hasListener(type)) {
@@ -114,7 +114,7 @@ _ol_renderer_canvas_Map_.prototype.dispatchComposeEvent_ = function(type, frameS
  * @protected
  * @return {!ol.Transform} Transform.
  */
-_ol_renderer_canvas_Map_.prototype.getTransform = function(frameState) {
+CanvasMapRenderer.prototype.getTransform = function(frameState) {
   var viewState = frameState.viewState;
   var dx1 = this.canvas_.width / 2;
   var dy1 = this.canvas_.height / 2;
@@ -130,7 +130,7 @@ _ol_renderer_canvas_Map_.prototype.getTransform = function(frameState) {
 /**
  * @inheritDoc
  */
-_ol_renderer_canvas_Map_.prototype.getType = function() {
+CanvasMapRenderer.prototype.getType = function() {
   return RendererType.CANVAS;
 };
 
@@ -138,7 +138,7 @@ _ol_renderer_canvas_Map_.prototype.getType = function() {
 /**
  * @inheritDoc
  */
-_ol_renderer_canvas_Map_.prototype.renderFrame = function(frameState) {
+CanvasMapRenderer.prototype.renderFrame = function(frameState) {
 
   if (!frameState) {
     if (this.renderedVisible_) {
@@ -207,7 +207,7 @@ _ol_renderer_canvas_Map_.prototype.renderFrame = function(frameState) {
 /**
  * @inheritDoc
  */
-_ol_renderer_canvas_Map_.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg,
+CanvasMapRenderer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg,
     layerFilter, thisArg2) {
   var result;
   var viewState = frameState.viewState;
@@ -235,4 +235,4 @@ _ol_renderer_canvas_Map_.prototype.forEachLayerAtPixel = function(pixel, frameSt
   }
   return undefined;
 };
-export default _ol_renderer_canvas_Map_;
+export default CanvasMapRenderer;

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

@@ -6,7 +6,7 @@ import Point from '../../../../../src/ol/geom/Point.js';
 import TileLayer from '../../../../../src/ol/layer/Tile.js';
 import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js';
 import _ol_renderer_canvas_Layer_ from '../../../../../src/ol/renderer/canvas/Layer.js';
-import _ol_renderer_canvas_Map_ from '../../../../../src/ol/renderer/canvas/Map.js';
+import CanvasMapRenderer from '../../../../../src/ol/renderer/canvas/Map.js';
 import _ol_source_Vector_ from '../../../../../src/ol/source/Vector.js';
 import _ol_style_Icon_ from '../../../../../src/ol/style/Icon.js';
 import _ol_style_Style_ from '../../../../../src/ol/style/Style.js';
@@ -19,8 +19,8 @@ describe('ol.renderer.canvas.Map', function() {
       var map = new Map({
         target: document.createElement('div')
       });
-      var renderer = new _ol_renderer_canvas_Map_(map.viewport_, map);
+      var renderer = new CanvasMapRenderer(map.viewport_, map);
-      expect(renderer).to.be.a(_ol_renderer_canvas_Map_);
+      expect(renderer).to.be.a(CanvasMapRenderer);
     });
 
   });