Rename _ol_events_EventType_ to EventType

src/ol/Feature.js

@@ -3,7 +3,7 @@
  */
 import _ol_asserts_ from './asserts.js';
 import _ol_events_ from './events.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 import {inherits} from './index.js';
 import _ol_Object_ from './Object.js';
 import Geometry from './geom/Geometry.js';
@@ -211,7 +211,7 @@ _ol_Feature_.prototype.handleGeometryChanged_ = function() {
   var geometry = this.getGeometry();
   if (geometry) {
     this.geometryChangeKey_ = _ol_events_.listen(geometry,
-        _ol_events_EventType_.CHANGE, this.handleGeometryChange_, this);
+        EventType.CHANGE, this.handleGeometryChange_, this);
   }
   this.changed();
 };

src/ol/Geolocation.js

@@ -8,7 +8,7 @@ import _ol_GeolocationProperty_ from './GeolocationProperty.js';
 import _ol_Object_ from './Object.js';
 import _ol_Sphere_ from './Sphere.js';
 import _ol_events_ from './events.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 import Polygon from './geom/Polygon.js';
 import _ol_has_ from './has.js';
 import _ol_math_ from './math.js';
@@ -179,7 +179,7 @@ _ol_Geolocation_.prototype.positionChange_ = function(position) {
  * @param {GeolocationPositionError} error error object.
  */
 _ol_Geolocation_.prototype.positionError_ = function(error) {
-  error.type = _ol_events_EventType_.ERROR;
+  error.type = EventType.ERROR;
   this.setTracking(false);
   this.dispatchEvent(/** @type {{type: string, target: undefined}} */ (error));
 };

src/ol/Image.js

@@ -5,7 +5,7 @@ import {inherits} from './index.js';
 import _ol_ImageBase_ from './ImageBase.js';
 import _ol_ImageState_ from './ImageState.js';
 import _ol_events_ from './events.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 import {getHeight} from './extent.js';
 
 /**
@@ -108,9 +108,9 @@ _ol_Image_.prototype.load = function() {
     this.state = _ol_ImageState_.LOADING;
     this.changed();
     this.imageListenerKeys_ = [
-      _ol_events_.listenOnce(this.image_, _ol_events_EventType_.ERROR,
+      _ol_events_.listenOnce(this.image_, EventType.ERROR,
           this.handleImageError_, this),
-      _ol_events_.listenOnce(this.image_, _ol_events_EventType_.LOAD,
+      _ol_events_.listenOnce(this.image_, EventType.LOAD,
           this.handleImageLoad_, this)
     ];
     this.imageLoadFunction_(this, this.src_);

src/ol/ImageBase.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from './index.js';
 import _ol_events_EventTarget_ from './events/EventTarget.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 
 /**
  * @constructor
@@ -51,7 +51,7 @@ inherits(_ol_ImageBase_, _ol_events_EventTarget_);
  * @protected
  */
 _ol_ImageBase_.prototype.changed = function() {
-  this.dispatchEvent(_ol_events_EventType_.CHANGE);
+  this.dispatchEvent(EventType.CHANGE);
 };
 
 

src/ol/ImageTile.js

@@ -6,7 +6,7 @@ import _ol_Tile_ from './Tile.js';
 import _ol_TileState_ from './TileState.js';
 import {createCanvasContext2D} from './dom.js';
 import _ol_events_ from './events.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 
 /**
  * @constructor
@@ -142,9 +142,9 @@ _ol_ImageTile_.prototype.load = function() {
     this.state = _ol_TileState_.LOADING;
     this.changed();
     this.imageListenerKeys_ = [
-      _ol_events_.listenOnce(this.image_, _ol_events_EventType_.ERROR,
+      _ol_events_.listenOnce(this.image_, EventType.ERROR,
           this.handleImageError_, this),
-      _ol_events_.listenOnce(this.image_, _ol_events_EventType_.LOAD,
+      _ol_events_.listenOnce(this.image_, EventType.LOAD,
           this.handleImageLoad_, this)
     ];
     this.tileLoadFunction_(this, this.src_);

src/ol/Observable.js

@@ -4,7 +4,7 @@
 import {inherits} from './index.js';
 import _ol_events_ from './events.js';
 import _ol_events_EventTarget_ from './events/EventTarget.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 
 /**
  * @classdesc
@@ -58,7 +58,7 @@ _ol_Observable_.unByKey = function(key) {
  */
 _ol_Observable_.prototype.changed = function() {
   ++this.revision_;
-  this.dispatchEvent(_ol_events_EventType_.CHANGE);
+  this.dispatchEvent(EventType.CHANGE);
 };
 
 

src/ol/PluggableMap.js

@@ -19,7 +19,7 @@ import _ol_asserts_ from './asserts.js';
 import {removeNode} from './dom.js';
 import _ol_events_ from './events.js';
 import Event from './events/Event.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 import {createEmpty, clone, createOrUpdateEmpty, equals, getForViewAndSize, isEmpty} from './extent.js';
 import {TRUE} from './functions.js';
 import _ol_has_ from './has.js';
@@ -168,14 +168,14 @@ var _ol_PluggableMap_ = function(options) {
   this.overlayContainerStopEvent_ = document.createElement('DIV');
   this.overlayContainerStopEvent_.className = 'ol-overlaycontainer-stopevent';
   var overlayEvents = [
-    _ol_events_EventType_.CLICK,
-    _ol_events_EventType_.DBLCLICK,
-    _ol_events_EventType_.MOUSEDOWN,
-    _ol_events_EventType_.TOUCHSTART,
-    _ol_events_EventType_.MSPOINTERDOWN,
+    EventType.CLICK,
+    EventType.DBLCLICK,
+    EventType.MOUSEDOWN,
+    EventType.TOUCHSTART,
+    EventType.MSPOINTERDOWN,
     MapBrowserEventType.POINTERDOWN,
-    _ol_events_EventType_.MOUSEWHEEL,
-    _ol_events_EventType_.WHEEL
+    EventType.MOUSEWHEEL,
+    EventType.WHEEL
   ];
   for (var i = 0, ii = overlayEvents.length; i < ii; ++i) {
     _ol_events_.listen(this.overlayContainerStopEvent_, overlayEvents[i],
@@ -205,9 +205,9 @@ var _ol_PluggableMap_ = function(options) {
    */
   this.keyHandlerKeys_ = null;
 
-  _ol_events_.listen(this.viewport_, _ol_events_EventType_.WHEEL,
+  _ol_events_.listen(this.viewport_, EventType.WHEEL,
       this.handleBrowserEvent, this);
-  _ol_events_.listen(this.viewport_, _ol_events_EventType_.MOUSEWHEEL,
+  _ol_events_.listen(this.viewport_, EventType.MOUSEWHEEL,
       this.handleBrowserEvent, this);
 
   /**
@@ -429,12 +429,12 @@ _ol_PluggableMap_.prototype.addOverlayInternal_ = function(overlay) {
  */
 _ol_PluggableMap_.prototype.disposeInternal = function() {
   this.mapBrowserEventHandler_.dispose();
-  _ol_events_.unlisten(this.viewport_, _ol_events_EventType_.WHEEL,
+  _ol_events_.unlisten(this.viewport_, EventType.WHEEL,
       this.handleBrowserEvent, this);
-  _ol_events_.unlisten(this.viewport_, _ol_events_EventType_.MOUSEWHEEL,
+  _ol_events_.unlisten(this.viewport_, EventType.MOUSEWHEEL,
       this.handleBrowserEvent, this);
   if (this.handleResize_ !== undefined) {
-    window.removeEventListener(_ol_events_EventType_.RESIZE,
+    window.removeEventListener(EventType.RESIZE,
         this.handleResize_, false);
     this.handleResize_ = undefined;
   }
@@ -949,7 +949,7 @@ _ol_PluggableMap_.prototype.handleTargetChanged_ = function() {
     this.renderer_.removeLayerRenderers();
     removeNode(this.viewport_);
     if (this.handleResize_ !== undefined) {
-      window.removeEventListener(_ol_events_EventType_.RESIZE,
+      window.removeEventListener(EventType.RESIZE,
           this.handleResize_, false);
       this.handleResize_ = undefined;
     }
@@ -959,15 +959,15 @@ _ol_PluggableMap_.prototype.handleTargetChanged_ = function() {
     var keyboardEventTarget = !this.keyboardEventTarget_ ?
       targetElement : this.keyboardEventTarget_;
     this.keyHandlerKeys_ = [
-      _ol_events_.listen(keyboardEventTarget, _ol_events_EventType_.KEYDOWN,
+      _ol_events_.listen(keyboardEventTarget, EventType.KEYDOWN,
           this.handleBrowserEvent, this),
-      _ol_events_.listen(keyboardEventTarget, _ol_events_EventType_.KEYPRESS,
+      _ol_events_.listen(keyboardEventTarget, EventType.KEYPRESS,
           this.handleBrowserEvent, this)
     ];
 
     if (!this.handleResize_) {
       this.handleResize_ = this.updateSize.bind(this);
-      window.addEventListener(_ol_events_EventType_.RESIZE,
+      window.addEventListener(EventType.RESIZE,
           this.handleResize_, false);
     }
   }
@@ -1013,7 +1013,7 @@ _ol_PluggableMap_.prototype.handleViewChanged_ = function() {
         view, _ol_ObjectEventType_.PROPERTYCHANGE,
         this.handleViewPropertyChanged_, this);
     this.viewChangeListenerKey_ = _ol_events_.listen(
-        view, _ol_events_EventType_.CHANGE,
+        view, EventType.CHANGE,
         this.handleViewPropertyChanged_, this);
   }
   this.render();
@@ -1035,7 +1035,7 @@ _ol_PluggableMap_.prototype.handleLayerGroupChanged_ = function() {
           layerGroup, _ol_ObjectEventType_.PROPERTYCHANGE,
           this.render, this),
       _ol_events_.listen(
-          layerGroup, _ol_events_EventType_.CHANGE,
+          layerGroup, EventType.CHANGE,
           this.render, this)
     ];
   }

src/ol/Tile.js

@@ -5,7 +5,7 @@ import {inherits} from './index.js';
 import _ol_TileState_ from './TileState.js';
 import {easeIn} from './easing.js';
 import _ol_events_EventTarget_ from './events/EventTarget.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 
 /**
  * @classdesc
@@ -73,7 +73,7 @@ inherits(_ol_Tile_, _ol_events_EventTarget_);
  * @protected
  */
 _ol_Tile_.prototype.changed = function() {
-  this.dispatchEvent(_ol_events_EventType_.CHANGE);
+  this.dispatchEvent(EventType.CHANGE);
 };
 
 

src/ol/TileQueue.js

@@ -4,7 +4,7 @@
 import {inherits} from './index.js';
 import _ol_TileState_ from './TileState.js';
 import _ol_events_ from './events.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 import _ol_structs_PriorityQueue_ from './structs/PriorityQueue.js';
 
 /**
@@ -65,7 +65,7 @@ _ol_TileQueue_.prototype.enqueue = function(element) {
   var added = _ol_structs_PriorityQueue_.prototype.enqueue.call(this, element);
   if (added) {
     var tile = element[0];
-    _ol_events_.listen(tile, _ol_events_EventType_.CHANGE,
+    _ol_events_.listen(tile, EventType.CHANGE,
         this.handleTileChange, this);
   }
   return added;
@@ -89,7 +89,7 @@ _ol_TileQueue_.prototype.handleTileChange = function(event) {
   var state = tile.getState();
   if (state === _ol_TileState_.LOADED || state === _ol_TileState_.ERROR ||
       state === _ol_TileState_.EMPTY || state === _ol_TileState_.ABORT) {
-    _ol_events_.unlisten(tile, _ol_events_EventType_.CHANGE,
+    _ol_events_.unlisten(tile, EventType.CHANGE,
         this.handleTileChange, this);
     var tileKey = tile.getKey();
     if (tileKey in this.tilesLoadingKeys_) {

src/ol/VectorImageTile.js

@@ -7,7 +7,7 @@ import _ol_TileState_ from './TileState.js';
 import {createCanvasContext2D} from './dom.js';
 import _ol_events_ from './events.js';
 import {getHeight, getIntersection, getWidth} from './extent.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 import _ol_featureloader_ from './featureloader.js';
 
 /**
@@ -111,7 +111,7 @@ var _ol_VectorImageTile_ = function(tileCoord, state, sourceRevision, format,
               tileUrl == undefined ? '' : tileUrl,
               format, tileLoadFunction);
           this.sourceTileListenerKeys_.push(
-              _ol_events_.listen(sourceTile, _ol_events_EventType_.CHANGE, handleTileChange));
+              _ol_events_.listen(sourceTile, EventType.CHANGE, handleTileChange));
         }
         sourceTile.consumers++;
         this.tileKeys.push(sourceTileKey);
@@ -234,7 +234,7 @@ _ol_VectorImageTile_.prototype.load = function() {
         sourceTile.load();
       }
       if (sourceTile.state == _ol_TileState_.LOADING) {
-        var key = _ol_events_.listen(sourceTile, _ol_events_EventType_.CHANGE, function(e) {
+        var key = _ol_events_.listen(sourceTile, EventType.CHANGE, function(e) {
           var state = sourceTile.getState();
           if (state == _ol_TileState_.LOADED ||
               state == _ol_TileState_.ERROR) {

src/ol/control/Attribution.js

@@ -9,7 +9,7 @@ import Control from '../control/Control.js';
 import _ol_css_ from '../css.js';
 import {removeNode, replaceNode} from '../dom.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_layer_Layer_ from '../layer/Layer.js';
 import _ol_obj_ from '../obj.js';
 
@@ -99,7 +99,7 @@ var Attribution = function(opt_options) {
   button.title = tipLabel;
   button.appendChild(activeLabel);
 
-  _ol_events_.listen(button, _ol_events_EventType_.CLICK, this.handleClick_, this);
+  _ol_events_.listen(button, EventType.CLICK, this.handleClick_, this);
 
   var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' +
       _ol_css_.CLASS_CONTROL +

src/ol/control/FullScreen.js

@@ -6,7 +6,7 @@ import Control from '../control/Control.js';
 import _ol_css_ from '../css.js';
 import {replaceNode} from '../dom.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 
 /**
  * @classdesc
@@ -61,7 +61,7 @@ var FullScreen = function(opt_options) {
   button.title = tipLabel;
   button.appendChild(this.labelNode_);
 
-  _ol_events_.listen(button, _ol_events_EventType_.CLICK,
+  _ol_events_.listen(button, EventType.CLICK,
       this.handleClick_, this);
 
   var cssClasses = this.cssClassName_ + ' ' + _ol_css_.CLASS_UNSELECTABLE +

src/ol/control/MousePosition.js

@@ -4,7 +4,7 @@
 
 import {inherits} from '../index.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_Object_ from '../Object.js';
 import Control from '../control/Control.js';
 import {getTransformFromProjections, identityTransform, get as getProjection} from '../proj.js';
@@ -171,9 +171,9 @@ MousePosition.prototype.setMap = function(map) {
   if (map) {
     var viewport = map.getViewport();
     this.listenerKeys.push(
-        _ol_events_.listen(viewport, _ol_events_EventType_.MOUSEMOVE,
+        _ol_events_.listen(viewport, EventType.MOUSEMOVE,
             this.handleMouseMove, this),
-        _ol_events_.listen(viewport, _ol_events_EventType_.MOUSEOUT,
+        _ol_events_.listen(viewport, EventType.MOUSEOUT,
             this.handleMouseOut, this)
     );
   }

src/ol/control/OverviewMap.js

@@ -16,7 +16,7 @@ import _ol_coordinate_ from '../coordinate.js';
 import _ol_css_ from '../css.js';
 import {replaceNode} from '../dom.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {containsExtent, getBottomLeft, getBottomRight, getTopLeft, getTopRight, scaleFromCenter} from '../extent.js';
 
 
@@ -101,7 +101,7 @@ var OverviewMap = function(opt_options) {
   button.title = tipLabel;
   button.appendChild(activeLabel);
 
-  _ol_events_.listen(button, _ol_events_EventType_.CLICK,
+  _ol_events_.listen(button, EventType.CLICK,
       this.handleClick_, this);
 
   /**

src/ol/control/Rotate.js

@@ -6,7 +6,7 @@ import Control from '../control/Control.js';
 import _ol_css_ from '../css.js';
 import {easeOut} from '../easing.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {inherits} from '../index.js';
 
 /**
@@ -51,7 +51,7 @@ var Rotate = function(opt_options) {
   button.title = tipLabel;
   button.appendChild(this.label_);
 
-  _ol_events_.listen(button, _ol_events_EventType_.CLICK,
+  _ol_events_.listen(button, EventType.CLICK,
       Rotate.prototype.handleClick_, this);
 
   var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' +

src/ol/control/Zoom.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import Control from '../control/Control.js';
 import _ol_css_ from '../css.js';
 import {easeOut} from '../easing.js';
@@ -43,7 +43,7 @@ var Zoom = function(opt_options) {
       typeof zoomInLabel === 'string' ? document.createTextNode(zoomInLabel) : zoomInLabel
   );
 
-  _ol_events_.listen(inElement, _ol_events_EventType_.CLICK,
+  _ol_events_.listen(inElement, EventType.CLICK,
       Zoom.prototype.handleClick_.bind(this, delta));
 
   var outElement = document.createElement('button');
@@ -54,7 +54,7 @@ var Zoom = function(opt_options) {
       typeof zoomOutLabel === 'string' ? document.createTextNode(zoomOutLabel) : zoomOutLabel
   );
 
-  _ol_events_.listen(outElement, _ol_events_EventType_.CLICK,
+  _ol_events_.listen(outElement, EventType.CLICK,
       Zoom.prototype.handleClick_.bind(this, -delta));
 
   var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' +

src/ol/control/ZoomSlider.js

@@ -10,7 +10,7 @@ import _ol_css_ from '../css.js';
 import {easeOut} from '../easing.js';
 import _ol_events_ from '../events.js';
 import Event from '../events/Event.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_math_ from '../math.js';
 import _ol_pointer_EventType_ from '../pointer/EventType.js';
 import _ol_pointer_PointerEventHandler_ from '../pointer/PointerEventHandler.js';
@@ -120,9 +120,9 @@ var ZoomSlider = function(opt_options) {
   _ol_events_.listen(this.dragger_, _ol_pointer_EventType_.POINTERUP,
       this.handleDraggerEnd_, this);
 
-  _ol_events_.listen(containerElement, _ol_events_EventType_.CLICK,
+  _ol_events_.listen(containerElement, EventType.CLICK,
       this.handleContainerClick_, this);
-  _ol_events_.listen(thumbElement, _ol_events_EventType_.CLICK,
+  _ol_events_.listen(thumbElement, EventType.CLICK,
       Event.stopPropagation);
 
   var render = options.render ? options.render : ZoomSlider.render;

src/ol/control/ZoomToExtent.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import Control from '../control/Control.js';
 import _ol_css_ from '../css.js';
 
@@ -39,7 +39,7 @@ var ZoomToExtent = function(opt_options) {
       typeof label === 'string' ? document.createTextNode(label) : label
   );
 
-  _ol_events_.listen(button, _ol_events_EventType_.CLICK,
+  _ol_events_.listen(button, EventType.CLICK,
       this.handleClick_, this);
 
   var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' +

src/ol/geom/GeometryCollection.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {createOrUpdateEmpty, closestSquaredDistanceXY, extend, getCenter} from '../extent.js';
 import Geometry from '../geom/Geometry.js';
 import GeometryType from '../geom/GeometryType.js';
@@ -59,7 +59,7 @@ GeometryCollection.prototype.unlistenGeometriesChange_ = function() {
   }
   for (i = 0, ii = this.geometries_.length; i < ii; ++i) {
     _ol_events_.unlisten(
-        this.geometries_[i], _ol_events_EventType_.CHANGE,
+        this.geometries_[i], EventType.CHANGE,
         this.changed, this);
   }
 };
@@ -75,7 +75,7 @@ GeometryCollection.prototype.listenGeometriesChange_ = function() {
   }
   for (i = 0, ii = this.geometries_.length; i < ii; ++i) {
     _ol_events_.listen(
-        this.geometries_[i], _ol_events_EventType_.CHANGE,
+        this.geometries_[i], EventType.CHANGE,
         this.changed, this);
   }
 };

src/ol/interaction/DragAndDrop.js

@@ -7,7 +7,7 @@ import {inherits} from '../index.js';
 import {TRUE} from '../functions.js';
 import _ol_events_ from '../events.js';
 import Event from '../events/Event.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
 import {get as getProjection} from '../proj.js';
 
@@ -77,7 +77,7 @@ _ol_interaction_DragAndDrop_.handleDrop_ = function(event) {
   for (i = 0, ii = files.length; i < ii; ++i) {
     file = files.item(i);
     var reader = new FileReader();
-    reader.addEventListener(_ol_events_EventType_.LOAD,
+    reader.addEventListener(EventType.LOAD,
         this.handleResult_.bind(this, file));
     reader.readAsText(file);
   }
@@ -159,13 +159,13 @@ _ol_interaction_DragAndDrop_.prototype.registerListeners_ = function() {
   if (map) {
     var dropArea = this.target ? this.target : map.getViewport();
     this.dropListenKeys_ = [
-      _ol_events_.listen(dropArea, _ol_events_EventType_.DROP,
+      _ol_events_.listen(dropArea, EventType.DROP,
           _ol_interaction_DragAndDrop_.handleDrop_, this),
-      _ol_events_.listen(dropArea, _ol_events_EventType_.DRAGENTER,
+      _ol_events_.listen(dropArea, EventType.DRAGENTER,
           _ol_interaction_DragAndDrop_.handleStop_, this),
-      _ol_events_.listen(dropArea, _ol_events_EventType_.DRAGOVER,
+      _ol_events_.listen(dropArea, EventType.DRAGOVER,
           _ol_interaction_DragAndDrop_.handleStop_, this),
-      _ol_events_.listen(dropArea, _ol_events_EventType_.DROP,
+      _ol_events_.listen(dropArea, EventType.DROP,
           _ol_interaction_DragAndDrop_.handleStop_, this)
     ];
   }

src/ol/interaction/KeyboardPan.js

@@ -3,7 +3,7 @@
  */
 import {inherits} from '../index.js';
 import _ol_coordinate_ from '../coordinate.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_events_KeyCode_ from '../events/KeyCode.js';
 import _ol_events_condition_ from '../events/condition.js';
 import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
@@ -78,7 +78,7 @@ inherits(_ol_interaction_KeyboardPan_, _ol_interaction_Interaction_);
  */
 _ol_interaction_KeyboardPan_.handleEvent = function(mapBrowserEvent) {
   var stopEvent = false;
-  if (mapBrowserEvent.type == _ol_events_EventType_.KEYDOWN) {
+  if (mapBrowserEvent.type == EventType.KEYDOWN) {
     var keyEvent = mapBrowserEvent.originalEvent;
     var keyCode = keyEvent.keyCode;
     if (this.condition_(mapBrowserEvent) &&

src/ol/interaction/KeyboardZoom.js

@@ -2,7 +2,7 @@
  * @module ol/interaction/KeyboardZoom
  */
 import {inherits} from '../index.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_events_condition_ from '../events/condition.js';
 import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
 
@@ -66,8 +66,8 @@ inherits(_ol_interaction_KeyboardZoom_, _ol_interaction_Interaction_);
  */
 _ol_interaction_KeyboardZoom_.handleEvent = function(mapBrowserEvent) {
   var stopEvent = false;
-  if (mapBrowserEvent.type == _ol_events_EventType_.KEYDOWN ||
-      mapBrowserEvent.type == _ol_events_EventType_.KEYPRESS) {
+  if (mapBrowserEvent.type == EventType.KEYDOWN ||
+      mapBrowserEvent.type == EventType.KEYPRESS) {
     var keyEvent = mapBrowserEvent.originalEvent;
     var charCode = keyEvent.charCode;
     if (this.condition_(mapBrowserEvent) &&

src/ol/interaction/Modify.js

@@ -11,7 +11,7 @@ import _ol_array_ from '../array.js';
 import _ol_coordinate_ from '../coordinate.js';
 import _ol_events_ from '../events.js';
 import Event from '../events/Event.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_events_condition_ from '../events/condition.js';
 import {boundingExtent, buffer, createOrUpdateFromCoordinate} from '../extent.js';
 import GeometryType from '../geom/GeometryType.js';
@@ -256,7 +256,7 @@ _ol_interaction_Modify_.prototype.addFeature_ = function(feature) {
   if (map && map.isRendered() && this.getActive()) {
     this.handlePointerAtPixel_(this.lastPixel_, map);
   }
-  _ol_events_.listen(feature, _ol_events_EventType_.CHANGE,
+  _ol_events_.listen(feature, EventType.CHANGE,
       this.handleFeatureChange_, this);
 };
 
@@ -286,7 +286,7 @@ _ol_interaction_Modify_.prototype.removeFeature_ = function(feature) {
     this.overlay_.getSource().removeFeature(this.vertexFeature_);
     this.vertexFeature_ = null;
   }
-  _ol_events_.unlisten(feature, _ol_events_EventType_.CHANGE,
+  _ol_events_.unlisten(feature, EventType.CHANGE,
       this.handleFeatureChange_, this);
 };
 

src/ol/interaction/MouseWheelZoom.js

@@ -4,7 +4,7 @@
 import {inherits} from '../index.js';
 import _ol_ViewHint_ from '../ViewHint.js';
 import {easeOut} from '../easing.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_has_ from '../has.js';
 import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
 import _ol_math_ from '../math.js';
@@ -128,7 +128,7 @@ inherits(_ol_interaction_MouseWheelZoom_, _ol_interaction_Interaction_);
  */
 _ol_interaction_MouseWheelZoom_.handleEvent = function(mapBrowserEvent) {
   var type = mapBrowserEvent.type;
-  if (type !== _ol_events_EventType_.WHEEL && type !== _ol_events_EventType_.MOUSEWHEEL) {
+  if (type !== EventType.WHEEL && type !== EventType.MOUSEWHEEL) {
     return true;
   }
 
@@ -144,7 +144,7 @@ _ol_interaction_MouseWheelZoom_.handleEvent = function(mapBrowserEvent) {
   // Delta normalisation inspired by
   // https://github.com/mapbox/mapbox-gl-js/blob/001c7b9/js/ui/handler/scroll_zoom.js
   var delta;
-  if (mapBrowserEvent.type == _ol_events_EventType_.WHEEL) {
+  if (mapBrowserEvent.type == EventType.WHEEL) {
     delta = wheelEvent.deltaY;
     if (_ol_has_.FIREFOX &&
         wheelEvent.deltaMode === WheelEvent.DOM_DELTA_PIXEL) {
@@ -153,7 +153,7 @@ _ol_interaction_MouseWheelZoom_.handleEvent = function(mapBrowserEvent) {
     if (wheelEvent.deltaMode === WheelEvent.DOM_DELTA_LINE) {
       delta *= 40;
     }
-  } else if (mapBrowserEvent.type == _ol_events_EventType_.MOUSEWHEEL) {
+  } else if (mapBrowserEvent.type == EventType.MOUSEWHEEL) {
     delta = -wheelEvent.wheelDeltaY;
     if (_ol_has_.SAFARI) {
       delta /= 3;

src/ol/interaction/Snap.js

@@ -6,7 +6,7 @@ import _ol_Collection_ from '../Collection.js';
 import _ol_CollectionEventType_ from '../CollectionEventType.js';
 import _ol_coordinate_ from '../coordinate.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {boundingExtent, createEmpty} from '../extent.js';
 import {TRUE, FALSE} from '../functions.js';
 import GeometryType from '../geom/GeometryType.js';
@@ -174,7 +174,7 @@ _ol_interaction_Snap_.prototype.addFeature = function(feature, opt_listen) {
   if (listen) {
     this.featureChangeListenerKeys_[feature_uid] = _ol_events_.listen(
         feature,
-        _ol_events_EventType_.CHANGE,
+        EventType.CHANGE,
         this.handleFeatureChange_, this);
   }
 };

src/ol/layer/Group.js

@@ -8,7 +8,7 @@ import _ol_Object_ from '../Object.js';
 import _ol_ObjectEventType_ from '../ObjectEventType.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {getIntersection} from '../extent.js';
 import _ol_layer_Base_ from '../layer/Base.js';
 import _ol_obj_ from '../obj.js';
@@ -106,7 +106,7 @@ _ol_layer_Group_.prototype.handleLayersChanged_ = function(event) {
     this.listenerKeys_[getUid(layer).toString()] = [
       _ol_events_.listen(layer, _ol_ObjectEventType_.PROPERTYCHANGE,
           this.handleLayerChange_, this),
-      _ol_events_.listen(layer, _ol_events_EventType_.CHANGE,
+      _ol_events_.listen(layer, EventType.CHANGE,
           this.handleLayerChange_, this)
     ];
   }
@@ -125,7 +125,7 @@ _ol_layer_Group_.prototype.handleLayersAdd_ = function(collectionEvent) {
   this.listenerKeys_[key] = [
     _ol_events_.listen(layer, _ol_ObjectEventType_.PROPERTYCHANGE,
         this.handleLayerChange_, this),
-    _ol_events_.listen(layer, _ol_events_EventType_.CHANGE,
+    _ol_events_.listen(layer, EventType.CHANGE,
         this.handleLayerChange_, this)
   ];
   this.changed();

src/ol/layer/Layer.js

@@ -2,7 +2,7 @@
  * @module ol/layer/Layer
  */
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {getUid, inherits} from '../index.js';
 import _ol_Object_ from '../Object.js';
 import _ol_layer_Base_ from '../layer/Base.js';
@@ -147,7 +147,7 @@ _ol_layer_Layer_.prototype.handleSourcePropertyChange_ = function() {
   var source = this.getSource();
   if (source) {
     this.sourceChangeKey_ = _ol_events_.listen(source,
-        _ol_events_EventType_.CHANGE, this.handleSourceChange_, this);
+        EventType.CHANGE, this.handleSourceChange_, this);
   }
   this.changed();
 };
@@ -187,7 +187,7 @@ _ol_layer_Layer_.prototype.setMap = function(map) {
           evt.frameState.layerStates[getUid(this)] = layerState;
         }, this);
     this.mapRenderKey_ = _ol_events_.listen(
-        this, _ol_events_EventType_.CHANGE, map.render, map);
+        this, EventType.CHANGE, map.render, map);
     this.changed();
   }
 };

src/ol/renderer/Layer.js

@@ -7,7 +7,7 @@ import _ol_Observable_ from '../Observable.js';
 import _ol_TileState_ from '../TileState.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {FALSE} from '../functions.js';
 import _ol_source_State_ from '../source/State.js';
 
@@ -117,7 +117,7 @@ _ol_renderer_Layer_.prototype.loadImage = function(image) {
   var imageState = image.getState();
   if (imageState != _ol_ImageState_.LOADED &&
       imageState != _ol_ImageState_.ERROR) {
-    _ol_events_.listen(image, _ol_events_EventType_.CHANGE,
+    _ol_events_.listen(image, EventType.CHANGE,
         this.handleImageChange_, this);
   }
   if (imageState == _ol_ImageState_.IDLE) {

src/ol/renderer/Map.js

@@ -4,7 +4,7 @@
 import {getUid, inherits, nullFunction} from '../index.js';
 import _ol_Disposable_ from '../Disposable.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {getWidth} from '../extent.js';
 import {TRUE} from '../functions.js';
 import _ol_layer_Layer_ from '../layer/Layer.js';
@@ -221,7 +221,7 @@ _ol_renderer_Map_.prototype.getLayerRenderer = function(layer) {
     if (renderer) {
       this.layerRenderers_[layerKey] = renderer;
       this.layerRendererListeners_[layerKey] = _ol_events_.listen(renderer,
-          _ol_events_EventType_.CHANGE, this.handleLayerRendererChange_, this);
+          EventType.CHANGE, this.handleLayerRendererChange_, this);
     } else {
       throw new Error('Unable to create renderer for layer: ' + layer.getType());
     }

src/ol/renderer/canvas/VectorLayer.js

@@ -6,7 +6,7 @@ import _ol_LayerType_ from '../../LayerType.js';
 import _ol_ViewHint_ from '../../ViewHint.js';
 import {createCanvasContext2D} from '../../dom.js';
 import _ol_events_ from '../../events.js';
-import _ol_events_EventType_ from '../../events/EventType.js';
+import EventType from '../../events/EventType.js';
 import _ol_ext_rbush_ from 'rbush';
 import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js';
 import _ol_render_EventType_ from '../../render/EventType.js';
@@ -80,7 +80,7 @@ var _ol_renderer_canvas_VectorLayer_ = function(vectorLayer) {
    */
   this.context = createCanvasContext2D();
 
-  _ol_events_.listen(_ol_render_canvas_.labelCache, _ol_events_EventType_.CLEAR, this.handleFontsChanged_, this);
+  _ol_events_.listen(_ol_render_canvas_.labelCache, EventType.CLEAR, this.handleFontsChanged_, this);
 
 };
 
@@ -113,7 +113,7 @@ _ol_renderer_canvas_VectorLayer_['create'] = function(mapRenderer, layer) {
  * @inheritDoc
  */
 _ol_renderer_canvas_VectorLayer_.prototype.disposeInternal = function() {
-  _ol_events_.unlisten(_ol_render_canvas_.labelCache, _ol_events_EventType_.CLEAR, this.handleFontsChanged_, this);
+  _ol_events_.unlisten(_ol_render_canvas_.labelCache, EventType.CLEAR, this.handleFontsChanged_, this);
   _ol_renderer_canvas_Layer_.prototype.disposeInternal.call(this);
 };
 

src/ol/renderer/canvas/VectorTileLayer.js

@@ -6,7 +6,7 @@ import _ol_LayerType_ from '../../LayerType.js';
 import _ol_TileState_ from '../../TileState.js';
 import {createCanvasContext2D} from '../../dom.js';
 import _ol_events_ from '../../events.js';
-import _ol_events_EventType_ from '../../events/EventType.js';
+import EventType from '../../events/EventType.js';
 import _ol_ext_rbush_ from 'rbush';
 import {buffer, containsCoordinate, equals, getIntersection, getTopLeft, intersects} from '../../extent.js';
 import _ol_layer_VectorTileRenderType_ from '../../layer/VectorTileRenderType.js';
@@ -64,7 +64,7 @@ var _ol_renderer_canvas_VectorTileLayer_ = function(layer) {
   this.zDirection =
       layer.getRenderMode() == _ol_layer_VectorTileRenderType_.VECTOR ? 1 : 0;
 
-  _ol_events_.listen(_ol_render_canvas_.labelCache, _ol_events_EventType_.CLEAR, this.handleFontsChanged_, this);
+  _ol_events_.listen(_ol_render_canvas_.labelCache, EventType.CLEAR, this.handleFontsChanged_, this);
 
 };
 
@@ -119,7 +119,7 @@ _ol_renderer_canvas_VectorTileLayer_.VECTOR_REPLAYS = {
  * @inheritDoc
  */
 _ol_renderer_canvas_VectorTileLayer_.prototype.disposeInternal = function() {
-  _ol_events_.unlisten(_ol_render_canvas_.labelCache, _ol_events_EventType_.CLEAR, this.handleFontsChanged_, this);
+  _ol_events_.unlisten(_ol_render_canvas_.labelCache, EventType.CLEAR, this.handleFontsChanged_, this);
   _ol_renderer_canvas_TileLayer_.prototype.disposeInternal.call(this);
 };
 

src/ol/reproj/Image.js

@@ -6,7 +6,7 @@ import {inherits} from '../index.js';
 import _ol_ImageBase_ from '../ImageBase.js';
 import _ol_ImageState_ from '../ImageState.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {getCenter, getIntersection, getHeight, getWidth} from '../extent.js';
 import _ol_reproj_ from '../reproj.js';
 import _ol_reproj_Triangulation_ from '../reproj/Triangulation.js';
@@ -174,7 +174,7 @@ _ol_reproj_Image_.prototype.load = function() {
       this.reproject_();
     } else {
       this.sourceListenerKey_ = _ol_events_.listen(this.sourceImage_,
-          _ol_events_EventType_.CHANGE, function(e) {
+          EventType.CHANGE, function(e) {
             var sourceState = this.sourceImage_.getState();
             if (sourceState == _ol_ImageState_.LOADED ||
                 sourceState == _ol_ImageState_.ERROR) {

src/ol/reproj/Tile.js

@@ -6,7 +6,7 @@ import {inherits} from '../index.js';
 import _ol_Tile_ from '../Tile.js';
 import _ol_TileState_ from '../TileState.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {getArea, getCenter, getIntersection} from '../extent.js';
 import _ol_math_ from '../math.js';
 import _ol_reproj_ from '../reproj.js';
@@ -265,7 +265,7 @@ _ol_reproj_Tile_.prototype.load = function() {
         leftToLoad++;
 
         var sourceListenKey;
-        sourceListenKey = _ol_events_.listen(tile, _ol_events_EventType_.CHANGE,
+        sourceListenKey = _ol_events_.listen(tile, EventType.CHANGE,
             function(e) {
               var state = tile.getState();
               if (state == _ol_TileState_.LOADED ||

src/ol/source/Cluster.js

@@ -6,7 +6,7 @@ import {getUid, inherits} from '../index.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_Feature_ from '../Feature.js';
 import _ol_coordinate_ from '../coordinate.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {buffer, createEmpty, createOrUpdateFromCoordinate} from '../extent.js';
 import Point from '../geom/Point.js';
 import _ol_source_Vector_ from '../source/Vector.js';
@@ -67,7 +67,7 @@ var _ol_source_Cluster_ = function(options) {
    */
   this.source = options.source;
 
-  this.source.on(_ol_events_EventType_.CHANGE,
+  this.source.on(EventType.CHANGE,
       _ol_source_Cluster_.prototype.refresh, this);
 };
 

src/ol/source/ImageArcGISRest.js

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import _ol_Image_ from '../Image.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {containsExtent, getHeight, getWidth} from '../extent.js';
 import _ol_obj_ from '../obj.js';
 import _ol_source_Image_ from '../source/Image.js';
@@ -174,7 +174,7 @@ _ol_source_ImageArcGISRest_.prototype.getImageInternal = function(extent, resolu
 
   this.renderedRevision_ = this.getRevision();
 
-  _ol_events_.listen(this.image_, _ol_events_EventType_.CHANGE,
+  _ol_events_.listen(this.image_, EventType.CHANGE,
       this.handleImageChange, this);
 
   return this.image_;

src/ol/source/ImageMapGuide.js

@@ -4,7 +4,7 @@
 import {inherits} from '../index.js';
 import _ol_Image_ from '../Image.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {containsExtent, getCenter, getHeight, getWidth, scaleFromCenter} from '../extent.js';
 import _ol_obj_ from '../obj.js';
 import _ol_source_Image_ from '../source/Image.js';
@@ -144,7 +144,7 @@ _ol_source_ImageMapGuide_.prototype.getImageInternal = function(extent, resoluti
     image = new _ol_Image_(extent, resolution, pixelRatio,
         imageUrl, this.crossOrigin_,
         this.imageLoadFunction_);
-    _ol_events_.listen(image, _ol_events_EventType_.CHANGE,
+    _ol_events_.listen(image, EventType.CHANGE,
         this.handleImageChange, this);
   } else {
     image = null;

src/ol/source/ImageStatic.js

@@ -6,7 +6,7 @@ import _ol_Image_ from '../Image.js';
 import _ol_ImageState_ from '../ImageState.js';
 import {createCanvasContext2D} from '../dom.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {intersects, getHeight, getWidth} from '../extent.js';
 import {get as getProjection} from '../proj.js';
 import _ol_source_Image_ from '../source/Image.js';
@@ -48,7 +48,7 @@ var _ol_source_ImageStatic_ = function(options) {
    */
   this.imageSize_ = options.imageSize ? options.imageSize : null;
 
-  _ol_events_.listen(this.image_, _ol_events_EventType_.CHANGE,
+  _ol_events_.listen(this.image_, EventType.CHANGE,
       this.handleImageChange, this);
 
 };

src/ol/source/ImageWMS.js

@@ -7,7 +7,7 @@ import {inherits} from '../index.js';
 import _ol_Image_ from '../Image.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {containsExtent, getCenter, getForViewAndSize, getHeight, getWidth} from '../extent.js';
 import _ol_obj_ from '../obj.js';
 import {get as getProjection, transform} from '../proj.js';
@@ -237,7 +237,7 @@ _ol_source_ImageWMS_.prototype.getImageInternal = function(extent, resolution, p
 
   this.renderedRevision_ = this.getRevision();
 
-  _ol_events_.listen(this.image_, _ol_events_EventType_.CHANGE,
+  _ol_events_.listen(this.image_, EventType.CHANGE,
       this.handleImageChange, this);
 
   return this.image_;

src/ol/source/Raster.js

@@ -7,7 +7,7 @@ import _ol_TileQueue_ from '../TileQueue.js';
 import {createCanvasContext2D} from '../dom.js';
 import _ol_events_ from '../events.js';
 import Event from '../events/Event.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {Processor as _ol_ext_pixelworks_Processor_} from 'pixelworks';
 import {equals, getCenter, getHeight, getWidth} from '../extent.js';
 import _ol_layer_Image_ from '../layer/Image.js';
@@ -61,7 +61,7 @@ var _ol_source_Raster_ = function(options) {
   this.renderers_ = _ol_source_Raster_.createRenderers_(options.sources);
 
   for (var r = 0, rr = this.renderers_.length; r < rr; ++r) {
-    _ol_events_.listen(this.renderers_[r], _ol_events_EventType_.CHANGE,
+    _ol_events_.listen(this.renderers_[r], EventType.CHANGE,
         this.changed, this);
   }
 

src/ol/source/TileImage.js

@@ -7,7 +7,7 @@ import _ol_ImageTile_ from '../ImageTile.js';
 import _ol_TileCache_ from '../TileCache.js';
 import _ol_TileState_ from '../TileState.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {equivalent, get as getProjection} from '../proj.js';
 import _ol_reproj_Tile_ from '../reproj/Tile.js';
 import _ol_source_UrlTile_ from '../source/UrlTile.js';
@@ -225,7 +225,7 @@ _ol_source_TileImage_.prototype.createTile_ = function(z, x, y, pixelRatio, proj
       this.tileLoadFunction,
       this.tileOptions);
   tile.key = key;
-  _ol_events_.listen(tile, _ol_events_EventType_.CHANGE,
+  _ol_events_.listen(tile, EventType.CHANGE,
       this.handleTileChange, this);
   return tile;
 };

src/ol/source/TileUTFGrid.js

@@ -7,7 +7,7 @@ import _ol_TileState_ from '../TileState.js';
 import _ol_TileUrlFunction_ from '../TileUrlFunction.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {applyTransform, intersects} from '../extent.js';
 import _ol_net_ from '../net.js';
 import {get as getProjection, getTransformFromProjections} from '../proj.js';
@@ -374,7 +374,7 @@ _ol_source_TileUTFGrid_.Tile_.prototype.getData = function(coordinate) {
  */
 _ol_source_TileUTFGrid_.Tile_.prototype.forDataAtCoordinate = function(coordinate, callback, opt_this, opt_request) {
   if (this.state == _ol_TileState_.IDLE && opt_request === true) {
-    _ol_events_.listenOnce(this, _ol_events_EventType_.CHANGE, function(e) {
+    _ol_events_.listenOnce(this, EventType.CHANGE, function(e) {
       callback.call(opt_this, this.getData(coordinate));
     }, this);
     this.loadInternal_();

src/ol/source/Vector.js

@@ -10,7 +10,7 @@ import _ol_array_ from '../array.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_events_ from '../events.js';
 import Event from '../events/Event.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import {containsExtent, equals} from '../extent.js';
 import _ol_featureloader_ from '../featureloader.js';
 import {TRUE} from '../functions.js';
@@ -204,7 +204,7 @@ _ol_source_Vector_.prototype.addFeatureInternal = function(feature) {
  */
 _ol_source_Vector_.prototype.setupChangeEvents_ = function(featureKey, feature) {
   this.featureChangeKeys_[featureKey] = [
-    _ol_events_.listen(feature, _ol_events_EventType_.CHANGE,
+    _ol_events_.listen(feature, EventType.CHANGE,
         this.handleFeatureChange_, this),
     _ol_events_.listen(feature, _ol_ObjectEventType_.PROPERTYCHANGE,
         this.handleFeatureChange_, this)

src/ol/structs/LRUCache.js

@@ -4,7 +4,7 @@
 import {inherits} from '../index.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_events_EventTarget_ from '../events/EventTarget.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 
 /**
  * Implements a Least-Recently-Used cache where the keys do not conflict with
@@ -71,7 +71,7 @@ _ol_structs_LRUCache_.prototype.clear = function() {
   this.entries_ = {};
   this.oldest_ = null;
   this.newest_ = null;
-  this.dispatchEvent(_ol_events_EventType_.CLEAR);
+  this.dispatchEvent(EventType.CLEAR);
 };
 
 

src/ol/style/Icon.js

@@ -6,7 +6,7 @@ import _ol_ImageState_ from '../ImageState.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_color_ from '../color.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_style_IconAnchorUnits_ from '../style/IconAnchorUnits.js';
 import _ol_style_IconImage_ from '../style/IconImage.js';
 import _ol_style_IconOrigin_ from '../style/IconOrigin.js';
@@ -355,7 +355,7 @@ _ol_style_Icon_.prototype.getSize = function() {
  * @override
  */
 _ol_style_Icon_.prototype.listenImageChange = function(listener, thisArg) {
-  return _ol_events_.listen(this.iconImage_, _ol_events_EventType_.CHANGE,
+  return _ol_events_.listen(this.iconImage_, EventType.CHANGE,
       listener, thisArg);
 };
 
@@ -377,7 +377,7 @@ _ol_style_Icon_.prototype.load = function() {
  * @override
  */
 _ol_style_Icon_.prototype.unlistenImageChange = function(listener, thisArg) {
-  _ol_events_.unlisten(this.iconImage_, _ol_events_EventType_.CHANGE,
+  _ol_events_.unlisten(this.iconImage_, EventType.CHANGE,
       listener, thisArg);
 };
 export default _ol_style_Icon_;

src/ol/style/IconImage.js

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import {createCanvasContext2D} from '../dom.js';
 import _ol_events_ from '../events.js';
 import _ol_events_EventTarget_ from '../events/EventTarget.js';
-import _ol_events_EventType_ from '../events/EventType.js';
+import EventType from '../events/EventType.js';
 import _ol_ImageState_ from '../ImageState.js';
 import _ol_style_ from '../style.js';
 
@@ -132,7 +132,7 @@ _ol_style_IconImage_.prototype.determineTainting_ = function() {
  * @private
  */
 _ol_style_IconImage_.prototype.dispatchChangeEvent_ = function() {
-  this.dispatchEvent(_ol_events_EventType_.CHANGE);
+  this.dispatchEvent(EventType.CHANGE);
 };
 
 
@@ -223,9 +223,9 @@ _ol_style_IconImage_.prototype.load = function() {
   if (this.imageState_ == _ol_ImageState_.IDLE) {
     this.imageState_ = _ol_ImageState_.LOADING;
     this.imageListenerKeys_ = [
-      _ol_events_.listenOnce(this.image_, _ol_events_EventType_.ERROR,
+      _ol_events_.listenOnce(this.image_, EventType.ERROR,
           this.handleImageError_, this),
-      _ol_events_.listenOnce(this.image_, _ol_events_EventType_.LOAD,
+      _ol_events_.listenOnce(this.image_, EventType.LOAD,
           this.handleImageLoad_, this)
     ];
     try {

test/spec/ol/imagetile.test.js

@@ -1,7 +1,7 @@
 import _ol_ImageTile_ from '../../../src/ol/ImageTile.js';
 import _ol_TileState_ from '../../../src/ol/TileState.js';
 import _ol_events_ from '../../../src/ol/events.js';
-import _ol_events_EventType_ from '../../../src/ol/events/EventType.js';
+import EventType from '../../../src/ol/events/EventType.js';
 import _ol_source_Image_ from '../../../src/ol/source/Image.js';
 
 
@@ -18,7 +18,7 @@ describe('ol.ImageTile', function() {
 
       var previousState = tile.getState();
 
-      _ol_events_.listen(tile, _ol_events_EventType_.CHANGE, function(event) {
+      _ol_events_.listen(tile, EventType.CHANGE, function(event) {
         var state = tile.getState();
         if (previousState == _ol_TileState_.IDLE) {
           expect(state).to.be(_ol_TileState_.LOADING);
@@ -43,7 +43,7 @@ describe('ol.ImageTile', function() {
 
       var previousState = tile.getState();
 
-      _ol_events_.listen(tile, _ol_events_EventType_.CHANGE, function(event) {
+      _ol_events_.listen(tile, EventType.CHANGE, function(event) {
         var state = tile.getState();
         if (previousState == _ol_TileState_.ERROR) {
           expect(state).to.be(_ol_TileState_.LOADING);
@@ -66,7 +66,7 @@ describe('ol.ImageTile', function() {
       var tileLoadFunction = _ol_source_Image_.defaultImageLoadFunction;
       var tile = new _ol_ImageTile_(tileCoord, state, src, null, tileLoadFunction);
 
-      var key = _ol_events_.listen(tile, _ol_events_EventType_.CHANGE, function(event) {
+      var key = _ol_events_.listen(tile, EventType.CHANGE, function(event) {
         var state = tile.getState();
         if (state == _ol_TileState_.ERROR) {
           expect(state).to.be(_ol_TileState_.ERROR);