diff --git a/src/ol/ImageCanvas.js b/src/ol/ImageCanvas.js index ba1783911b..0a35034f0b 100644 --- a/src/ol/ImageCanvas.js +++ b/src/ol/ImageCanvas.js @@ -15,7 +15,7 @@ import ImageState from './ImageState.js'; * @param {ol.ImageCanvasLoader=} opt_loader Optional loader function to * support asynchronous canvas drawing. */ -var _ol_ImageCanvas_ = function(extent, resolution, pixelRatio, canvas, opt_loader) { +var ImageCanvas = function(extent, resolution, pixelRatio, canvas, opt_loader) { /** * Optional canvas loader function. @@ -42,14 +42,14 @@ var _ol_ImageCanvas_ = function(extent, resolution, pixelRatio, canvas, opt_load }; -inherits(_ol_ImageCanvas_, _ol_ImageBase_); +inherits(ImageCanvas, _ol_ImageBase_); /** * Get any error associated with asynchronous rendering. * @return {Error} Any error that occurred during rendering. */ -_ol_ImageCanvas_.prototype.getError = function() { +ImageCanvas.prototype.getError = function() { return this.error_; }; @@ -59,7 +59,7 @@ _ol_ImageCanvas_.prototype.getError = function() { * @param {Error} err Any error during drawing. * @private */ -_ol_ImageCanvas_.prototype.handleLoad_ = function(err) { +ImageCanvas.prototype.handleLoad_ = function(err) { if (err) { this.error_ = err; this.state = ImageState.ERROR; @@ -73,7 +73,7 @@ _ol_ImageCanvas_.prototype.handleLoad_ = function(err) { /** * @inheritDoc */ -_ol_ImageCanvas_.prototype.load = function() { +ImageCanvas.prototype.load = function() { if (this.state == ImageState.IDLE) { this.state = ImageState.LOADING; this.changed(); @@ -85,7 +85,7 @@ _ol_ImageCanvas_.prototype.load = function() { /** * @inheritDoc */ -_ol_ImageCanvas_.prototype.getImage = function() { +ImageCanvas.prototype.getImage = function() { return this.canvas_; }; -export default _ol_ImageCanvas_; +export default ImageCanvas; diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index cb20cccff9..b0bb994192 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -3,7 +3,7 @@ */ import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; import {inherits} from '../../index.js'; -import _ol_ImageCanvas_ from '../../ImageCanvas.js'; +import ImageCanvas from '../../ImageCanvas.js'; import LayerType from '../../LayerType.js'; import ViewHint from '../../ViewHint.js'; import {equals} from '../../array.js'; @@ -153,7 +153,7 @@ CanvasImageLayerRenderer.prototype.prepareFrame = function(frameState, layerStat context.canvas.width = imageFrameState.size[0] * pixelRatio; context.canvas.height = imageFrameState.size[1] * pixelRatio; vectorRenderer.composeFrame(imageFrameState, layerState, context); - this.image_ = new _ol_ImageCanvas_(renderedExtent, viewResolution, pixelRatio, context.canvas); + this.image_ = new ImageCanvas(renderedExtent, viewResolution, pixelRatio, context.canvas); this.skippedFeatures_ = skippedFeatures; } } else { diff --git a/src/ol/source/ImageCanvas.js b/src/ol/source/ImageCanvas.js index eb47c6a388..7388153c04 100644 --- a/src/ol/source/ImageCanvas.js +++ b/src/ol/source/ImageCanvas.js @@ -2,7 +2,7 @@ * @module ol/source/ImageCanvas */ import {inherits} from '../index.js'; -import _ol_ImageCanvas_ from '../ImageCanvas.js'; +import ImageCanvas from '../ImageCanvas.js'; import {containsExtent, getHeight, getWidth, scaleFromCenter} from '../extent.js'; import ImageSource from '../source/Image.js'; @@ -78,7 +78,7 @@ _ol_source_ImageCanvas_.prototype.getImageInternal = function(extent, resolution var canvasElement = this.canvasFunction_( extent, resolution, pixelRatio, size, projection); if (canvasElement) { - canvas = new _ol_ImageCanvas_(extent, resolution, pixelRatio, canvasElement); + canvas = new ImageCanvas(extent, resolution, pixelRatio, canvasElement); } this.canvas_ = canvas; this.renderedRevision_ = this.getRevision(); diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js index a466fbbf31..b8086d7872 100644 --- a/src/ol/source/Raster.js +++ b/src/ol/source/Raster.js @@ -2,7 +2,7 @@ * @module ol/source/Raster */ import {getUid, inherits} from '../index.js'; -import _ol_ImageCanvas_ from '../ImageCanvas.js'; +import ImageCanvas from '../ImageCanvas.js'; import TileQueue from '../TileQueue.js'; import {createCanvasContext2D} from '../dom.js'; import _ol_events_ from '../events.js'; @@ -317,7 +317,7 @@ RasterSource.prototype.onWorkerComplete_ = function(frameState, err, output, dat var width = Math.round(getWidth(extent) / resolution); var height = Math.round(getHeight(extent) / resolution); context = createCanvasContext2D(width, height); - this.renderedImageCanvas_ = new _ol_ImageCanvas_(extent, resolution, 1, context.canvas); + this.renderedImageCanvas_ = new ImageCanvas(extent, resolution, 1, context.canvas); } context.putImageData(output, 0, 0);