Rename _ol_render_EventType_ to RenderEventType

src/ol/Graticule.js

@@ -9,7 +9,7 @@ import Point from './geom/Point.js';
 import _ol_geom_flat_geodesic_ from './geom/flat/geodesic.js';
 import _ol_math_ from './math.js';
 import {get as getProjection, equivalent as equivalentProjection, getTransform, transformExtent} from './proj.js';
-import _ol_render_EventType_ from './render/EventType.js';
+import RenderEventType from './render/EventType.js';
 import _ol_style_Fill_ from './style/Fill.js';
 import _ol_style_Stroke_ from './style/Stroke.js';
 import _ol_style_Text_ from './style/Text.js';
@@ -723,13 +723,11 @@ Graticule.prototype.updateProjectionInfo_ = function(projection) {
  */
 Graticule.prototype.setMap = function(map) {
   if (this.map_) {
-    this.map_.un(_ol_render_EventType_.POSTCOMPOSE,
+    this.map_.un(RenderEventType.POSTCOMPOSE, this.handlePostCompose_, this);
-        this.handlePostCompose_, this);
     this.map_.render();
   }
   if (map) {
-    map.on(_ol_render_EventType_.POSTCOMPOSE,
+    map.on(RenderEventType.POSTCOMPOSE, this.handlePostCompose_, this);
-        this.handlePostCompose_, this);
     map.render();
   }
   this.map_ = map;

src/ol/layer/Heatmap.js

@@ -8,7 +8,7 @@ import {createCanvasContext2D} from '../dom.js';
 import _ol_layer_Vector_ from '../layer/Vector.js';
 import _ol_math_ from '../math.js';
 import _ol_obj_ from '../obj.js';
-import _ol_render_EventType_ from '../render/EventType.js';
+import RenderEventType from '../render/EventType.js';
 import _ol_style_Icon_ from '../style/Icon.js';
 import _ol_style_Style_ from '../style/Style.js';
 
@@ -133,7 +133,7 @@ var Heatmap = function(opt_options) {
   // The render order is not relevant for a heatmap representation.
   this.setRenderOrder(null);
 
-  _ol_events_.listen(this, _ol_render_EventType_.RENDER, this.handleRender_, this);
+  _ol_events_.listen(this, RenderEventType.RENDER, this.handleRender_, this);
 };
 
 inherits(Heatmap, _ol_layer_Vector_);

src/ol/layer/Layer.js

@@ -8,7 +8,7 @@ import _ol_Object_ from '../Object.js';
 import _ol_layer_Base_ from '../layer/Base.js';
 import _ol_layer_Property_ from '../layer/Property.js';
 import _ol_obj_ from '../obj.js';
-import _ol_render_EventType_ from '../render/EventType.js';
+import RenderEventType from '../render/EventType.js';
 import _ol_source_State_ from '../source/State.js';
 
 /**
@@ -179,7 +179,7 @@ _ol_layer_Layer_.prototype.setMap = function(map) {
   }
   if (map) {
     this.mapPrecomposeKey_ = _ol_events_.listen(
-        map, _ol_render_EventType_.PRECOMPOSE, function(evt) {
+        map, RenderEventType.PRECOMPOSE, function(evt) {
           var layerState = this.getLayerState();
           layerState.managed = false;
           layerState.zIndex = Infinity;

src/ol/renderer/canvas/Layer.js

@@ -5,7 +5,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 _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js';
 import _ol_renderer_Layer_ from '../Layer.js';
@@ -126,8 +126,7 @@ _ol_renderer_canvas_Layer_.prototype.forEachLayerAtCoordinate = function(coordin
  * @protected
  */
 _ol_renderer_canvas_Layer_.prototype.postCompose = function(context, frameState, layerState, opt_transform) {
-  this.dispatchComposeEvent_(_ol_render_EventType_.POSTCOMPOSE, context,
+  this.dispatchComposeEvent_(RenderEventType.POSTCOMPOSE, context, frameState, opt_transform);
-      frameState, opt_transform);
 };
 
 
@@ -138,8 +137,7 @@ _ol_renderer_canvas_Layer_.prototype.postCompose = function(context, frameState,
  * @protected
  */
 _ol_renderer_canvas_Layer_.prototype.preCompose = function(context, frameState, opt_transform) {
-  this.dispatchComposeEvent_(_ol_render_EventType_.PRECOMPOSE, context,
+  this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, context, frameState, opt_transform);
-      frameState, opt_transform);
 };
 
 
@@ -150,8 +148,7 @@ _ol_renderer_canvas_Layer_.prototype.preCompose = function(context, frameState,
  * @protected
  */
 _ol_renderer_canvas_Layer_.prototype.dispatchRenderEvent = function(context, frameState, opt_transform) {
-  this.dispatchComposeEvent_(_ol_render_EventType_.RENDER, context,
+  this.dispatchComposeEvent_(RenderEventType.RENDER, context, frameState, opt_transform);
-      frameState, opt_transform);
 };
 
 

src/ol/renderer/canvas/Map.js

@@ -10,7 +10,7 @@ import _ol_css_ 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 _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_Immediate_ from '../../render/canvas/Immediate.js';
 import _ol_renderer_Map_ from '../Map.js';
@@ -163,7 +163,7 @@ _ol_renderer_canvas_Map_.prototype.renderFrame = function(frameState) {
 
   this.calculateMatrices2D(frameState);
 
-  this.dispatchComposeEvent_(_ol_render_EventType_.PRECOMPOSE, frameState);
+  this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, frameState);
 
   var layerStatesArray = frameState.layerStatesArray;
   _ol_array_.stableSort(layerStatesArray, _ol_renderer_Map_.sortByZIndex);
@@ -192,8 +192,7 @@ _ol_renderer_canvas_Map_.prototype.renderFrame = function(frameState) {
     context.restore();
   }
 
-  this.dispatchComposeEvent_(
+  this.dispatchComposeEvent_(RenderEventType.POSTCOMPOSE, frameState);
-      _ol_render_EventType_.POSTCOMPOSE, frameState);
 
   if (!this.renderedVisible_) {
     this.canvas_.style.display = '';

src/ol/renderer/canvas/VectorLayer.js

@@ -9,7 +9,7 @@ import _ol_events_ from '../../events.js';
 import EventType from '../../events/EventType.js';
 import rbush from 'rbush';
 import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js';
-import _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_ReplayGroup_ from '../../render/canvas/ReplayGroup.js';
 import RendererType from '../Type.js';
@@ -152,7 +152,7 @@ _ol_renderer_canvas_VectorLayer_.prototype.composeFrame = function(frameState, l
     var drawOffsetY = 0;
     var replayContext;
     var transparentLayer = layerState.opacity !== 1;
-    var hasRenderListeners = layer.hasListener(_ol_render_EventType_.RENDER);
+    var hasRenderListeners = layer.hasListener(RenderEventType.RENDER);
     if (transparentLayer || hasRenderListeners) {
       var drawWidth = context.canvas.width;
       var drawHeight = context.canvas.height;

src/ol/renderer/webgl/Layer.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../../index.js';
 import _ol_render_Event_ from '../../render/Event.js';
-import _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
 import _ol_renderer_Layer_ from '../Layer.js';
 import _ol_renderer_webgl_defaultmapshader_ from '../webgl/defaultmapshader.js';
@@ -142,8 +142,7 @@ _ol_renderer_webgl_Layer_.prototype.bindFramebuffer = function(frameState, frame
  */
 _ol_renderer_webgl_Layer_.prototype.composeFrame = function(frameState, layerState, context) {
 
-  this.dispatchComposeEvent_(
+  this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, context, frameState);
-      _ol_render_EventType_.PRECOMPOSE, context, frameState);
 
   context.bindBuffer(_ol_webgl_.ARRAY_BUFFER, this.arrayBuffer_);
 
@@ -180,9 +179,7 @@ _ol_renderer_webgl_Layer_.prototype.composeFrame = function(frameState, layerSta
   gl.bindTexture(_ol_webgl_.TEXTURE_2D, this.getTexture());
   gl.drawArrays(_ol_webgl_.TRIANGLE_STRIP, 0, 4);
 
-  this.dispatchComposeEvent_(
+  this.dispatchComposeEvent_(RenderEventType.POSTCOMPOSE, context, frameState);
-      _ol_render_EventType_.POSTCOMPOSE, context, frameState);
-
 };
 
 

src/ol/renderer/webgl/Map.js

@@ -10,7 +10,7 @@ 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 _ol_render_EventType_ from '../../render/EventType.js';
+import RenderEventType from '../../render/EventType.js';
 import _ol_render_webgl_Immediate_ from '../../render/webgl/Immediate.js';
 import _ol_renderer_Map_ from '../Map.js';
 import RendererType from '../Type.js';
@@ -438,7 +438,7 @@ _ol_renderer_webgl_Map_.prototype.renderFrame = function(frameState) {
   this.textureCache_.set((-frameState.index).toString(), null);
   ++this.textureCacheFrameMarkerCount_;
 
-  this.dispatchComposeEvent_(_ol_render_EventType_.PRECOMPOSE, frameState);
+  this.dispatchComposeEvent_(RenderEventType.PRECOMPOSE, frameState);
 
   /** @type {Array.<ol.LayerState>} */
   var layerStatesToDraw = [];
@@ -497,7 +497,7 @@ _ol_renderer_webgl_Map_.prototype.renderFrame = function(frameState) {
     frameState.animate = true;
   }
 
-  this.dispatchComposeEvent_(_ol_render_EventType_.POSTCOMPOSE, frameState);
+  this.dispatchComposeEvent_(RenderEventType.POSTCOMPOSE, frameState);
 
   this.scheduleRemoveUnusedLayerRenderers(frameState);
   this.scheduleExpireIconCache(frameState);