diff --git a/src/ol/render/Event.js b/src/ol/render/Event.js index 12d7d0eee2..ce8f075264 100644 --- a/src/ol/render/Event.js +++ b/src/ol/render/Event.js @@ -14,7 +14,7 @@ import Event from '../events/Event.js'; * @param {?CanvasRenderingContext2D=} opt_context Context. * @param {?ol.webgl.Context=} opt_glContext WebGL Context. */ -var _ol_render_Event_ = function( +var RenderEvent = function( type, opt_vectorContext, opt_frameState, opt_context, opt_glContext) { @@ -52,5 +52,5 @@ var _ol_render_Event_ = function( }; -inherits(_ol_render_Event_, Event); -export default _ol_render_Event_; +inherits(RenderEvent, Event); +export default RenderEvent; diff --git a/src/ol/renderer/canvas/Layer.js b/src/ol/renderer/canvas/Layer.js index 85c3fc554c..52b9c5c723 100644 --- a/src/ol/renderer/canvas/Layer.js +++ b/src/ol/renderer/canvas/Layer.js @@ -4,7 +4,7 @@ import {inherits} from '../../index.js'; import {getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../../extent.js'; import {TRUE} from '../../functions.js'; -import _ol_render_Event_ from '../../render/Event.js'; +import RenderEvent from '../../render/Event.js'; import RenderEventType from '../../render/EventType.js'; import _ol_render_canvas_ from '../../render/canvas.js'; import CanvasImmediateRenderer from '../../render/canvas/Immediate.js'; @@ -90,7 +90,7 @@ CanvasLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, fr var render = new CanvasImmediateRenderer( context, frameState.pixelRatio, frameState.extent, transform, frameState.viewState.rotation); - var composeEvent = new _ol_render_Event_(type, render, frameState, + var composeEvent = new RenderEvent(type, render, frameState, context, null); layer.dispatchEvent(composeEvent); _ol_render_canvas_.rotateAtOffset(context, rotation, width / 2, height / 2); diff --git a/src/ol/renderer/canvas/Map.js b/src/ol/renderer/canvas/Map.js index ced664a4c6..058079f908 100644 --- a/src/ol/renderer/canvas/Map.js +++ b/src/ol/renderer/canvas/Map.js @@ -9,7 +9,7 @@ import {stableSort} from '../../array.js'; import {CLASS_UNSELECTABLE} from '../../css.js'; import {createCanvasContext2D} from '../../dom.js'; import _ol_layer_Layer_ from '../../layer/Layer.js'; -import _ol_render_Event_ from '../../render/Event.js'; +import RenderEvent from '../../render/Event.js'; import RenderEventType from '../../render/EventType.js'; import _ol_render_canvas_ from '../../render/canvas.js'; import CanvasImmediateRenderer from '../../render/canvas/Immediate.js'; @@ -102,7 +102,7 @@ CanvasMapRenderer.prototype.dispatchComposeEvent_ = function(type, frameState) { var vectorContext = new CanvasImmediateRenderer(context, pixelRatio, extent, transform, rotation); - var composeEvent = new _ol_render_Event_(type, vectorContext, + var composeEvent = new RenderEvent(type, vectorContext, frameState, context, null); map.dispatchEvent(composeEvent); } diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js index 639af5b1ad..31ea973144 100644 --- a/src/ol/renderer/webgl/Layer.js +++ b/src/ol/renderer/webgl/Layer.js @@ -2,7 +2,7 @@ * @module ol/renderer/webgl/Layer */ import {inherits} from '../../index.js'; -import _ol_render_Event_ from '../../render/Event.js'; +import RenderEvent from '../../render/Event.js'; import RenderEventType from '../../render/EventType.js'; import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js'; import LayerRenderer from '../Layer.js'; @@ -202,7 +202,7 @@ WebGLLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, fra var render = new _ol_render_webgl_Immediate_( context, center, resolution, rotation, size, extent, pixelRatio); - var composeEvent = new _ol_render_Event_( + var composeEvent = new RenderEvent( type, render, frameState, null, context); layer.dispatchEvent(composeEvent); } diff --git a/src/ol/renderer/webgl/Map.js b/src/ol/renderer/webgl/Map.js index 4d11bcb810..9737b3905a 100644 --- a/src/ol/renderer/webgl/Map.js +++ b/src/ol/renderer/webgl/Map.js @@ -9,7 +9,7 @@ import {createCanvasContext2D} from '../../dom.js'; import _ol_events_ from '../../events.js'; import _ol_has_ from '../../has.js'; import _ol_layer_Layer_ from '../../layer/Layer.js'; -import _ol_render_Event_ from '../../render/Event.js'; +import RenderEvent from '../../render/Event.js'; import RenderEventType from '../../render/EventType.js'; import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js'; import MapRenderer from '../Map.js'; @@ -276,7 +276,7 @@ WebGLMapRenderer.prototype.dispatchComposeEvent_ = function(type, frameState) { var vectorContext = new _ol_render_webgl_Immediate_(context, center, resolution, rotation, size, extent, pixelRatio); - var composeEvent = new _ol_render_Event_(type, vectorContext, + var composeEvent = new RenderEvent(type, vectorContext, frameState, null, context); map.dispatchEvent(composeEvent); } diff --git a/test/spec/ol/layer/layer.test.js b/test/spec/ol/layer/layer.test.js index 1ae8063886..8d2211799e 100644 --- a/test/spec/ol/layer/layer.test.js +++ b/test/spec/ol/layer/layer.test.js @@ -2,7 +2,7 @@ import {getUid} from '../../../../src/ol/index.js'; import Map from '../../../../src/ol/Map.js'; import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js'; import {get as getProjection} from '../../../../src/ol/proj.js'; -import _ol_render_Event_ from '../../../../src/ol/render/Event.js'; +import RenderEvent from '../../../../src/ol/render/Event.js'; import Source from '../../../../src/ol/source/Source.js'; @@ -399,7 +399,7 @@ describe('ol.layer.Layer', function() { layerStatesArray: [], layerStates: {} }; - map.dispatchEvent(new _ol_render_Event_('precompose', null, + map.dispatchEvent(new RenderEvent('precompose', null, frameState, null, null)); expect(frameState.layerStatesArray.length).to.be(1); var layerState = frameState.layerStatesArray[0];