ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename _ol_render_Event_ to RenderEvent

Browse Source
This commit is contained in:
Tim Schaub
2018-01-11 10:17:59 -07:00
parent d840eab615
commit 0113b9283c
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/render/Event.js
View File

@@ -14,7 +14,7 @@ import Event from '../events/Event.js';
* @param {?CanvasRenderingContext2D=} opt_context Context. * @param {?CanvasRenderingContext2D=} opt_context Context.
* @param {?ol.webgl.Context=} opt_glContext WebGL Context. * @param {?ol.webgl.Context=} opt_glContext WebGL Context.
*/ */
var _ol_render_Event_ = function( var RenderEvent = function(
type, opt_vectorContext, opt_frameState, opt_context, type, opt_vectorContext, opt_frameState, opt_context,
opt_glContext) { opt_glContext) {
@@ -52,5 +52,5 @@ var _ol_render_Event_ = function(
}; };
inherits(_ol_render_Event_, Event); inherits(RenderEvent, Event);
export default _ol_render_Event_; export default RenderEvent;

4
src/ol/renderer/canvas/Layer.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../../index.js'; import {inherits} from '../../index.js';
import {getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../../extent.js'; import {getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../../extent.js';
import {TRUE} from '../../functions.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 RenderEventType from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js'; import _ol_render_canvas_ from '../../render/canvas.js';
import CanvasImmediateRenderer from '../../render/canvas/Immediate.js'; import CanvasImmediateRenderer from '../../render/canvas/Immediate.js';
@@ -90,7 +90,7 @@ CanvasLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, fr
var render = new CanvasImmediateRenderer( var render = new CanvasImmediateRenderer(
context, frameState.pixelRatio, frameState.extent, transform, context, frameState.pixelRatio, frameState.extent, transform,
frameState.viewState.rotation); frameState.viewState.rotation);
var composeEvent = new _ol_render_Event_(type, render, frameState, var composeEvent = new RenderEvent(type, render, frameState,
context, null); context, null);
layer.dispatchEvent(composeEvent); layer.dispatchEvent(composeEvent);
_ol_render_canvas_.rotateAtOffset(context, rotation, width / 2, height / 2); _ol_render_canvas_.rotateAtOffset(context, rotation, width / 2, height / 2);

4
src/ol/renderer/canvas/Map.js
View File

@@ -9,7 +9,7 @@ import {stableSort} from '../../array.js';
import {CLASS_UNSELECTABLE} from '../../css.js'; import {CLASS_UNSELECTABLE} from '../../css.js';
import {createCanvasContext2D} from '../../dom.js'; import {createCanvasContext2D} from '../../dom.js';
import _ol_layer_Layer_ from '../../layer/Layer.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 RenderEventType from '../../render/EventType.js';
import _ol_render_canvas_ from '../../render/canvas.js'; import _ol_render_canvas_ from '../../render/canvas.js';
import CanvasImmediateRenderer from '../../render/canvas/Immediate.js'; import CanvasImmediateRenderer from '../../render/canvas/Immediate.js';
@@ -102,7 +102,7 @@ CanvasMapRenderer.prototype.dispatchComposeEvent_ = function(type, frameState) {
var vectorContext = new CanvasImmediateRenderer(context, pixelRatio, var vectorContext = new CanvasImmediateRenderer(context, pixelRatio,
extent, transform, rotation); extent, transform, rotation);
var composeEvent = new _ol_render_Event_(type, vectorContext, var composeEvent = new RenderEvent(type, vectorContext,
frameState, context, null); frameState, context, null);
map.dispatchEvent(composeEvent); map.dispatchEvent(composeEvent);
} }

4
src/ol/renderer/webgl/Layer.js
View File

@@ -2,7 +2,7 @@
* @module ol/renderer/webgl/Layer * @module ol/renderer/webgl/Layer
*/ */
import {inherits} from '../../index.js'; 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 RenderEventType from '../../render/EventType.js';
import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js'; import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
import LayerRenderer from '../Layer.js'; import LayerRenderer from '../Layer.js';
@@ -202,7 +202,7 @@ WebGLLayerRenderer.prototype.dispatchComposeEvent_ = function(type, context, fra
var render = new _ol_render_webgl_Immediate_( var render = new _ol_render_webgl_Immediate_(
context, center, resolution, rotation, size, extent, pixelRatio); context, center, resolution, rotation, size, extent, pixelRatio);
var composeEvent = new _ol_render_Event_( var composeEvent = new RenderEvent(
type, render, frameState, null, context); type, render, frameState, null, context);
layer.dispatchEvent(composeEvent); layer.dispatchEvent(composeEvent);
} }

4
src/ol/renderer/webgl/Map.js
View File

@@ -9,7 +9,7 @@ import {createCanvasContext2D} from '../../dom.js';
import _ol_events_ from '../../events.js'; import _ol_events_ from '../../events.js';
import _ol_has_ from '../../has.js'; import _ol_has_ from '../../has.js';
import _ol_layer_Layer_ from '../../layer/Layer.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 RenderEventType from '../../render/EventType.js';
import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js'; import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
import MapRenderer from '../Map.js'; import MapRenderer from '../Map.js';
@@ -276,7 +276,7 @@ WebGLMapRenderer.prototype.dispatchComposeEvent_ = function(type, frameState) {
var vectorContext = new _ol_render_webgl_Immediate_(context, var vectorContext = new _ol_render_webgl_Immediate_(context,
center, resolution, rotation, size, extent, pixelRatio); center, resolution, rotation, size, extent, pixelRatio);
var composeEvent = new _ol_render_Event_(type, vectorContext, var composeEvent = new RenderEvent(type, vectorContext,
frameState, null, context); frameState, null, context);
map.dispatchEvent(composeEvent); map.dispatchEvent(composeEvent);
} }

4
test/spec/ol/layer/layer.test.js
View File

@@ -2,7 +2,7 @@ import {getUid} from '../../../../src/ol/index.js';
import Map from '../../../../src/ol/Map.js'; import Map from '../../../../src/ol/Map.js';
import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js'; import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
import {get as getProjection} from '../../../../src/ol/proj.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'; import Source from '../../../../src/ol/source/Source.js';
@@ -399,7 +399,7 @@ describe('ol.layer.Layer', function() {
layerStatesArray: [], layerStatesArray: [],
layerStates: {} layerStates: {}
}; };
map.dispatchEvent(new _ol_render_Event_('precompose', null, map.dispatchEvent(new RenderEvent('precompose', null,
frameState, null, null)); frameState, null, null));
expect(frameState.layerStatesArray.length).to.be(1); expect(frameState.layerStatesArray.length).to.be(1);
var layerState = frameState.layerStatesArray[0]; var layerState = frameState.layerStatesArray[0];