From 068931e54461592df2e15e8581df73ecc5742cd5 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 8 Jan 2018 09:38:12 -0700 Subject: [PATCH] Rename _ol_renderer_canvas_ImageLayer_ to CanvasImageLayerRenderer --- src/ol/CanvasMap.js | 4 ++-- src/ol/Map.js | 4 ++-- src/ol/renderer/canvas/ImageLayer.js | 24 ++++++++++++------------ src/ol/source/Raster.js | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ol/CanvasMap.js b/src/ol/CanvasMap.js index 7e05f47db1..9817dcf1aa 100644 --- a/src/ol/CanvasMap.js +++ b/src/ol/CanvasMap.js @@ -8,7 +8,7 @@ import {defaults as defaultControls} from './control.js'; import {defaults as defaultInteractions} from './interaction.js'; import _ol_obj_ from './obj.js'; import {register, registerMultiple} from './plugins.js'; -import _ol_renderer_canvas_ImageLayer_ from './renderer/canvas/ImageLayer.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 _ol_renderer_canvas_VectorLayer_ from './renderer/canvas/VectorLayer.js'; @@ -17,7 +17,7 @@ import _ol_renderer_canvas_VectorTileLayer_ from './renderer/canvas/VectorTileLa register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_); registerMultiple(PluginType.LAYER_RENDERER, [ - _ol_renderer_canvas_ImageLayer_, + CanvasImageLayerRenderer, _ol_renderer_canvas_TileLayer_, _ol_renderer_canvas_VectorLayer_, _ol_renderer_canvas_VectorTileLayer_ diff --git a/src/ol/Map.js b/src/ol/Map.js index d07a57e91f..2078d9e0af 100644 --- a/src/ol/Map.js +++ b/src/ol/Map.js @@ -8,7 +8,7 @@ import {defaults as defaultControls} from './control.js'; import {defaults as defaultInteractions} from './interaction.js'; import _ol_obj_ from './obj.js'; import {register, registerMultiple} from './plugins.js'; -import _ol_renderer_canvas_ImageLayer_ from './renderer/canvas/ImageLayer.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 _ol_renderer_canvas_VectorLayer_ from './renderer/canvas/VectorLayer.js'; @@ -21,7 +21,7 @@ import _ol_renderer_webgl_VectorLayer_ from './renderer/webgl/VectorLayer.js'; register(PluginType.MAP_RENDERER, _ol_renderer_canvas_Map_); registerMultiple(PluginType.LAYER_RENDERER, [ - _ol_renderer_canvas_ImageLayer_, + CanvasImageLayerRenderer, _ol_renderer_canvas_TileLayer_, _ol_renderer_canvas_VectorLayer_, _ol_renderer_canvas_VectorTileLayer_ diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index 42451da22c..ed15bf726b 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -21,7 +21,7 @@ import _ol_transform_ from '../../transform.js'; * @param {ol.layer.Image} imageLayer Single image layer. * @api */ -var _ol_renderer_canvas_ImageLayer_ = function(imageLayer) { +var CanvasImageLayerRenderer = function(imageLayer) { _ol_renderer_canvas_IntermediateCanvas_.call(this, imageLayer); @@ -50,7 +50,7 @@ var _ol_renderer_canvas_ImageLayer_ = function(imageLayer) { }; -inherits(_ol_renderer_canvas_ImageLayer_, _ol_renderer_canvas_IntermediateCanvas_); +inherits(CanvasImageLayerRenderer, _ol_renderer_canvas_IntermediateCanvas_); /** @@ -59,7 +59,7 @@ inherits(_ol_renderer_canvas_ImageLayer_, _ol_renderer_canvas_IntermediateCanvas * @param {ol.layer.Layer} layer The candidate layer. * @return {boolean} The renderer can render the layer. */ -_ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) { +CanvasImageLayerRenderer['handles'] = function(type, layer) { return type === RendererType.CANVAS && (layer.getType() === LayerType.IMAGE || layer.getType() === LayerType.VECTOR && /** @type {ol.layer.Vector} */ (layer).getRenderMode() === _ol_layer_VectorRenderType_.IMAGE); @@ -72,13 +72,13 @@ _ol_renderer_canvas_ImageLayer_['handles'] = function(type, layer) { * @param {ol.layer.Layer} layer The layer to be rendererd. * @return {ol.renderer.canvas.ImageLayer} The layer renderer. */ -_ol_renderer_canvas_ImageLayer_['create'] = function(mapRenderer, layer) { - var renderer = new _ol_renderer_canvas_ImageLayer_(/** @type {ol.layer.Image} */ (layer)); +CanvasImageLayerRenderer['create'] = function(mapRenderer, layer) { + var renderer = new CanvasImageLayerRenderer(/** @type {ol.layer.Image} */ (layer)); if (layer.getType() === LayerType.VECTOR) { var candidates = getLayerRendererPlugins(); for (var i = 0, ii = candidates.length; i < ii; ++i) { var candidate = /** @type {Object.} */ (candidates[i]); - if (candidate !== _ol_renderer_canvas_ImageLayer_ && candidate['handles'](RendererType.CANVAS, layer)) { + if (candidate !== CanvasImageLayerRenderer && candidate['handles'](RendererType.CANVAS, layer)) { renderer.setVectorRenderer(candidate['create'](mapRenderer, layer)); } } @@ -90,7 +90,7 @@ _ol_renderer_canvas_ImageLayer_['create'] = function(mapRenderer, layer) { /** * @inheritDoc */ -_ol_renderer_canvas_ImageLayer_.prototype.getImage = function() { +CanvasImageLayerRenderer.prototype.getImage = function() { return !this.image_ ? null : this.image_.getImage(); }; @@ -98,7 +98,7 @@ _ol_renderer_canvas_ImageLayer_.prototype.getImage = function() { /** * @inheritDoc */ -_ol_renderer_canvas_ImageLayer_.prototype.getImageTransform = function() { +CanvasImageLayerRenderer.prototype.getImageTransform = function() { return this.imageTransform_; }; @@ -106,7 +106,7 @@ _ol_renderer_canvas_ImageLayer_.prototype.getImageTransform = function() { /** * @inheritDoc */ -_ol_renderer_canvas_ImageLayer_.prototype.prepareFrame = function(frameState, layerState) { +CanvasImageLayerRenderer.prototype.prepareFrame = function(frameState, layerState) { var pixelRatio = frameState.pixelRatio; var size = frameState.size; @@ -197,7 +197,7 @@ _ol_renderer_canvas_ImageLayer_.prototype.prepareFrame = function(frameState, la /** * @inheritDoc */ -_ol_renderer_canvas_ImageLayer_.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) { +CanvasImageLayerRenderer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, hitTolerance, callback, thisArg) { if (this.vectorRenderer_) { return this.vectorRenderer_.forEachFeatureAtCoordinate(coordinate, frameState, hitTolerance, callback, thisArg); } else { @@ -209,7 +209,7 @@ _ol_renderer_canvas_ImageLayer_.prototype.forEachFeatureAtCoordinate = function( /** * @param {ol.renderer.canvas.VectorLayer} renderer Vector renderer. */ -_ol_renderer_canvas_ImageLayer_.prototype.setVectorRenderer = function(renderer) { +CanvasImageLayerRenderer.prototype.setVectorRenderer = function(renderer) { this.vectorRenderer_ = renderer; }; -export default _ol_renderer_canvas_ImageLayer_; +export default CanvasImageLayerRenderer; diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js index bfe9ad304d..91016d7bd4 100644 --- a/src/ol/source/Raster.js +++ b/src/ol/source/Raster.js @@ -13,7 +13,7 @@ import {equals, getCenter, getHeight, getWidth} from '../extent.js'; import _ol_layer_Image_ from '../layer/Image.js'; import TileLayer from '../layer/Tile.js'; import _ol_obj_ from '../obj.js'; -import _ol_renderer_canvas_ImageLayer_ from '../renderer/canvas/ImageLayer.js'; +import CanvasImageLayerRenderer from '../renderer/canvas/ImageLayer.js'; import _ol_renderer_canvas_TileLayer_ from '../renderer/canvas/TileLayer.js'; import _ol_source_Image_ from '../source/Image.js'; import RasterOperationType from '../source/RasterOperationType.js'; @@ -414,7 +414,7 @@ function createRenderer(source) { */ function createImageRenderer(source) { var layer = new _ol_layer_Image_({source: source}); - return new _ol_renderer_canvas_ImageLayer_(layer); + return new CanvasImageLayerRenderer(layer); }