Merge pull request #7599 from marcjansen/rename-event-variables

Rename event variables

src/ol/Collection.js

@@ -10,7 +10,7 @@ import {inherits} from './index.js';
 import _ol_AssertionError_ from './AssertionError.js';
 import _ol_CollectionEventType_ from './CollectionEventType.js';
 import _ol_Object_ from './Object.js';
-import _ol_events_Event_ from './events/Event.js';
+import Event from './events/Event.js';
 
 /**
  * @classdesc
@@ -292,7 +292,7 @@ _ol_Collection_.Property_ = {
  */
 _ol_Collection_.Event = function(type, opt_element) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The element that is added to or removed from the collection.
@@ -302,6 +302,6 @@ _ol_Collection_.Event = function(type, opt_element) {
   this.element = opt_element;
 
 };
-inherits(_ol_Collection_.Event, _ol_events_Event_);
+inherits(_ol_Collection_.Event, Event);
 
 export default _ol_Collection_;

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

@@ -2,8 +2,8 @@
  * @module ol/ImageBase
  */
 import {inherits} from './index.js';
-import _ol_events_EventTarget_ from './events/EventTarget.js';
+import EventTarget from './events/EventTarget.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 
 /**
  * @constructor
@@ -16,7 +16,7 @@ import _ol_events_EventType_ from './events/EventType.js';
  */
 var _ol_ImageBase_ = function(extent, resolution, pixelRatio, state) {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @protected
@@ -44,14 +44,14 @@ var _ol_ImageBase_ = function(extent, resolution, pixelRatio, state) {
 
 };
 
-inherits(_ol_ImageBase_, _ol_events_EventTarget_);
+inherits(_ol_ImageBase_, 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/MapBrowserEvent.js

@@ -2,7 +2,7 @@
  * @module ol/MapBrowserEvent
  */
 import {inherits} from './index.js';
-import _ol_MapEvent_ from './MapEvent.js';
+import MapEvent from './MapEvent.js';
 
 /**
  * @classdesc
@@ -18,10 +18,10 @@ import _ol_MapEvent_ from './MapEvent.js';
  * @param {boolean=} opt_dragging Is the map currently being dragged?
  * @param {?olx.FrameState=} opt_frameState Frame state.
  */
-var _ol_MapBrowserEvent_ = function(type, map, browserEvent, opt_dragging,
+var MapBrowserEvent = function(type, map, browserEvent, opt_dragging,
     opt_frameState) {
 
-  _ol_MapEvent_.call(this, type, map, opt_frameState);
+  MapEvent.call(this, type, map, opt_frameState);
 
   /**
    * The original browser event.
@@ -56,7 +56,7 @@ var _ol_MapBrowserEvent_ = function(type, map, browserEvent, opt_dragging,
 
 };
 
-inherits(_ol_MapBrowserEvent_, _ol_MapEvent_);
+inherits(MapBrowserEvent, MapEvent);
 
 
 /**
@@ -65,8 +65,8 @@ inherits(_ol_MapBrowserEvent_, _ol_MapEvent_);
  * @override
  * @api
  */
-_ol_MapBrowserEvent_.prototype.preventDefault = function() {
+MapBrowserEvent.prototype.preventDefault = function() {
-  _ol_MapEvent_.prototype.preventDefault.call(this);
+  MapEvent.prototype.preventDefault.call(this);
   this.originalEvent.preventDefault();
 };
 
@@ -77,8 +77,8 @@ _ol_MapBrowserEvent_.prototype.preventDefault = function() {
  * @override
  * @api
  */
-_ol_MapBrowserEvent_.prototype.stopPropagation = function() {
+MapBrowserEvent.prototype.stopPropagation = function() {
-  _ol_MapEvent_.prototype.stopPropagation.call(this);
+  MapEvent.prototype.stopPropagation.call(this);
   this.originalEvent.stopPropagation();
 };
-export default _ol_MapBrowserEvent_;
+export default MapBrowserEvent;

src/ol/MapBrowserEventHandler.js

@@ -3,10 +3,10 @@
  */
 import {inherits} from './index.js';
 import _ol_has_ from './has.js';
-import _ol_MapBrowserEventType_ from './MapBrowserEventType.js';
+import MapBrowserEventType from './MapBrowserEventType.js';
-import _ol_MapBrowserPointerEvent_ from './MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from './MapBrowserPointerEvent.js';
 import _ol_events_ from './events.js';
-import _ol_events_EventTarget_ from './events/EventTarget.js';
+import EventTarget from './events/EventTarget.js';
 import _ol_pointer_EventType_ from './pointer/EventType.js';
 import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js';
 
@@ -16,9 +16,9 @@ import _ol_pointer_PointerEventHandler_ from './pointer/PointerEventHandler.js';
  * @constructor
  * @extends {ol.events.EventTarget}
  */
-var _ol_MapBrowserEventHandler_ = function(map, moveTolerance) {
+var MapBrowserEventHandler = function(map, moveTolerance) {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * This is the element that we will listen to the real events on.
@@ -110,30 +110,30 @@ var _ol_MapBrowserEventHandler_ = function(map, moveTolerance) {
 
 };
 
-inherits(_ol_MapBrowserEventHandler_, _ol_events_EventTarget_);
+inherits(MapBrowserEventHandler, EventTarget);
 
 
 /**
  * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
  * @private
  */
-_ol_MapBrowserEventHandler_.prototype.emulateClick_ = function(pointerEvent) {
+MapBrowserEventHandler.prototype.emulateClick_ = function(pointerEvent) {
-  var newEvent = new _ol_MapBrowserPointerEvent_(
+  var newEvent = new MapBrowserPointerEvent(
-      _ol_MapBrowserEventType_.CLICK, this.map_, pointerEvent);
+      MapBrowserEventType.CLICK, this.map_, pointerEvent);
   this.dispatchEvent(newEvent);
   if (this.clickTimeoutId_ !== 0) {
     // double-click
     clearTimeout(this.clickTimeoutId_);
     this.clickTimeoutId_ = 0;
-    newEvent = new _ol_MapBrowserPointerEvent_(
+    newEvent = new MapBrowserPointerEvent(
-        _ol_MapBrowserEventType_.DBLCLICK, this.map_, pointerEvent);
+        MapBrowserEventType.DBLCLICK, this.map_, pointerEvent);
     this.dispatchEvent(newEvent);
   } else {
     // click
     this.clickTimeoutId_ = setTimeout(function() {
       this.clickTimeoutId_ = 0;
-      var newEvent = new _ol_MapBrowserPointerEvent_(
+      var newEvent = new MapBrowserPointerEvent(
-          _ol_MapBrowserEventType_.SINGLECLICK, this.map_, pointerEvent);
+          MapBrowserEventType.SINGLECLICK, this.map_, pointerEvent);
       this.dispatchEvent(newEvent);
     }.bind(this), 250);
   }
@@ -146,13 +146,13 @@ _ol_MapBrowserEventHandler_.prototype.emulateClick_ = function(pointerEvent) {
  * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
  * @private
  */
-_ol_MapBrowserEventHandler_.prototype.updateActivePointers_ = function(pointerEvent) {
+MapBrowserEventHandler.prototype.updateActivePointers_ = function(pointerEvent) {
   var event = pointerEvent;
 
-  if (event.type == _ol_MapBrowserEventType_.POINTERUP ||
+  if (event.type == MapBrowserEventType.POINTERUP ||
-      event.type == _ol_MapBrowserEventType_.POINTERCANCEL) {
+      event.type == MapBrowserEventType.POINTERCANCEL) {
     delete this.trackedTouches_[event.pointerId];
-  } else if (event.type == _ol_MapBrowserEventType_.POINTERDOWN) {
+  } else if (event.type == MapBrowserEventType.POINTERDOWN) {
     this.trackedTouches_[event.pointerId] = true;
   }
   this.activePointers_ = Object.keys(this.trackedTouches_).length;
@@ -163,10 +163,10 @@ _ol_MapBrowserEventHandler_.prototype.updateActivePointers_ = function(pointerEv
  * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
  * @private
  */
-_ol_MapBrowserEventHandler_.prototype.handlePointerUp_ = function(pointerEvent) {
+MapBrowserEventHandler.prototype.handlePointerUp_ = function(pointerEvent) {
   this.updateActivePointers_(pointerEvent);
-  var newEvent = new _ol_MapBrowserPointerEvent_(
+  var newEvent = new MapBrowserPointerEvent(
-      _ol_MapBrowserEventType_.POINTERUP, this.map_, pointerEvent);
+      MapBrowserEventType.POINTERUP, this.map_, pointerEvent);
   this.dispatchEvent(newEvent);
 
   // We emulate click events on left mouse button click, touch contact, and pen
@@ -195,7 +195,7 @@ _ol_MapBrowserEventHandler_.prototype.handlePointerUp_ = function(pointerEvent)
  * @return {boolean} If the left mouse button was pressed.
  * @private
  */
-_ol_MapBrowserEventHandler_.prototype.isMouseActionButton_ = function(pointerEvent) {
+MapBrowserEventHandler.prototype.isMouseActionButton_ = function(pointerEvent) {
   return pointerEvent.button === 0;
 };
 
@@ -204,10 +204,10 @@ _ol_MapBrowserEventHandler_.prototype.isMouseActionButton_ = function(pointerEve
  * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
  * @private
  */
-_ol_MapBrowserEventHandler_.prototype.handlePointerDown_ = function(pointerEvent) {
+MapBrowserEventHandler.prototype.handlePointerDown_ = function(pointerEvent) {
   this.updateActivePointers_(pointerEvent);
-  var newEvent = new _ol_MapBrowserPointerEvent_(
+  var newEvent = new MapBrowserPointerEvent(
-      _ol_MapBrowserEventType_.POINTERDOWN, this.map_, pointerEvent);
+      MapBrowserEventType.POINTERDOWN, this.map_, pointerEvent);
   this.dispatchEvent(newEvent);
 
   this.down_ = pointerEvent;
@@ -222,10 +222,10 @@ _ol_MapBrowserEventHandler_.prototype.handlePointerDown_ = function(pointerEvent
 
     this.dragListenerKeys_.push(
         _ol_events_.listen(this.documentPointerEventHandler_,
-            _ol_MapBrowserEventType_.POINTERMOVE,
+            MapBrowserEventType.POINTERMOVE,
             this.handlePointerMove_, this),
         _ol_events_.listen(this.documentPointerEventHandler_,
-            _ol_MapBrowserEventType_.POINTERUP,
+            MapBrowserEventType.POINTERUP,
             this.handlePointerUp_, this),
         /* Note that the listener for `pointercancel is set up on
        * `pointerEventHandler_` and not `documentPointerEventHandler_` like
@@ -241,7 +241,7 @@ _ol_MapBrowserEventHandler_.prototype.handlePointerDown_ = function(pointerEvent
        * only registered there.
        */
         _ol_events_.listen(this.pointerEventHandler_,
-            _ol_MapBrowserEventType_.POINTERCANCEL,
+            MapBrowserEventType.POINTERCANCEL,
             this.handlePointerUp_, this)
     );
   }
@@ -252,14 +252,14 @@ _ol_MapBrowserEventHandler_.prototype.handlePointerDown_ = function(pointerEvent
  * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
  * @private
  */
-_ol_MapBrowserEventHandler_.prototype.handlePointerMove_ = function(pointerEvent) {
+MapBrowserEventHandler.prototype.handlePointerMove_ = function(pointerEvent) {
   // Between pointerdown and pointerup, pointermove events are triggered.
   // To avoid a 'false' touchmove event to be dispatched, we test if the pointer
   // moved a significant distance.
   if (this.isMoving_(pointerEvent)) {
     this.dragging_ = true;
-    var newEvent = new _ol_MapBrowserPointerEvent_(
+    var newEvent = new MapBrowserPointerEvent(
-        _ol_MapBrowserEventType_.POINTERDRAG, this.map_, pointerEvent,
+        MapBrowserEventType.POINTERDRAG, this.map_, pointerEvent,
         this.dragging_);
     this.dispatchEvent(newEvent);
   }
@@ -278,9 +278,9 @@ _ol_MapBrowserEventHandler_.prototype.handlePointerMove_ = function(pointerEvent
  * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
  * @private
  */
-_ol_MapBrowserEventHandler_.prototype.relayEvent_ = function(pointerEvent) {
+MapBrowserEventHandler.prototype.relayEvent_ = function(pointerEvent) {
   var dragging = !!(this.down_ && this.isMoving_(pointerEvent));
-  this.dispatchEvent(new _ol_MapBrowserPointerEvent_(
+  this.dispatchEvent(new MapBrowserPointerEvent(
       pointerEvent.type, this.map_, pointerEvent, dragging));
 };
 
@@ -290,7 +290,7 @@ _ol_MapBrowserEventHandler_.prototype.relayEvent_ = function(pointerEvent) {
  * @return {boolean} Is moving.
  * @private
  */
-_ol_MapBrowserEventHandler_.prototype.isMoving_ = function(pointerEvent) {
+MapBrowserEventHandler.prototype.isMoving_ = function(pointerEvent) {
   return Math.abs(pointerEvent.clientX - this.down_.clientX) > this.moveTolerance_ ||
       Math.abs(pointerEvent.clientY - this.down_.clientY) > this.moveTolerance_;
 };
@@ -299,7 +299,7 @@ _ol_MapBrowserEventHandler_.prototype.isMoving_ = function(pointerEvent) {
 /**
  * @inheritDoc
  */
-_ol_MapBrowserEventHandler_.prototype.disposeInternal = function() {
+MapBrowserEventHandler.prototype.disposeInternal = function() {
   if (this.relayedListenerKey_) {
     _ol_events_.unlistenByKey(this.relayedListenerKey_);
     this.relayedListenerKey_ = null;
@@ -320,6 +320,6 @@ _ol_MapBrowserEventHandler_.prototype.disposeInternal = function() {
     this.pointerEventHandler_.dispose();
     this.pointerEventHandler_ = null;
   }
-  _ol_events_EventTarget_.prototype.disposeInternal.call(this);
+  EventTarget.prototype.disposeInternal.call(this);
 };
-export default _ol_MapBrowserEventHandler_;
+export default MapBrowserEventHandler;

src/ol/MapBrowserPointerEvent.js

@@ -2,7 +2,7 @@
  * @module ol/MapBrowserPointerEvent
  */
 import {inherits} from './index.js';
-import _ol_MapBrowserEvent_ from './MapBrowserEvent.js';
+import MapBrowserEvent from './MapBrowserEvent.js';
 
 /**
  * @constructor
@@ -13,10 +13,10 @@ import _ol_MapBrowserEvent_ from './MapBrowserEvent.js';
  * @param {boolean=} opt_dragging Is the map currently being dragged?
  * @param {?olx.FrameState=} opt_frameState Frame state.
  */
-var _ol_MapBrowserPointerEvent_ = function(type, map, pointerEvent, opt_dragging,
+var MapBrowserPointerEvent = function(type, map, pointerEvent, opt_dragging,
     opt_frameState) {
 
-  _ol_MapBrowserEvent_.call(this, type, map, pointerEvent.originalEvent, opt_dragging,
+  MapBrowserEvent.call(this, type, map, pointerEvent.originalEvent, opt_dragging,
       opt_frameState);
 
   /**
@@ -27,5 +27,5 @@ var _ol_MapBrowserPointerEvent_ = function(type, map, pointerEvent, opt_dragging
 
 };
 
-inherits(_ol_MapBrowserPointerEvent_, _ol_MapBrowserEvent_);
+inherits(MapBrowserPointerEvent, MapBrowserEvent);
-export default _ol_MapBrowserPointerEvent_;
+export default MapBrowserPointerEvent;

src/ol/MapEvent.js

@@ -2,7 +2,7 @@
  * @module ol/MapEvent
  */
 import {inherits} from './index.js';
-import _ol_events_Event_ from './events/Event.js';
+import Event from './events/Event.js';
 
 /**
  * @classdesc
@@ -16,9 +16,9 @@ import _ol_events_Event_ from './events/Event.js';
  * @param {ol.PluggableMap} map Map.
  * @param {?olx.FrameState=} opt_frameState Frame state.
  */
-var _ol_MapEvent_ = function(type, map, opt_frameState) {
+var MapEvent = function(type, map, opt_frameState) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The map where the event occurred.
@@ -36,5 +36,5 @@ var _ol_MapEvent_ = function(type, map, opt_frameState) {
 
 };
 
-inherits(_ol_MapEvent_, _ol_events_Event_);
+inherits(MapEvent, Event);
-export default _ol_MapEvent_;
+export default MapEvent;

src/ol/Object.js

@@ -4,7 +4,7 @@
 import {getUid, inherits} from './index.js';
 import _ol_ObjectEventType_ from './ObjectEventType.js';
 import _ol_Observable_ from './Observable.js';
-import _ol_events_Event_ from './events/Event.js';
+import Event from './events/Event.js';
 import _ol_obj_ from './obj.js';
 
 /**
@@ -205,7 +205,7 @@ _ol_Object_.prototype.unset = function(key, opt_silent) {
  * @constructor
  */
 _ol_Object_.Event = function(type, key, oldValue) {
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The name of the property whose value is changing.
@@ -223,5 +223,5 @@ _ol_Object_.Event = function(type, key, oldValue) {
   this.oldValue = oldValue;
 
 };
-inherits(_ol_Object_.Event, _ol_events_Event_);
+inherits(_ol_Object_.Event, Event);
 export default _ol_Object_;

src/ol/Observable.js

@@ -3,8 +3,8 @@
  */
 import {inherits} from './index.js';
 import _ol_events_ from './events.js';
-import _ol_events_EventTarget_ from './events/EventTarget.js';
+import EventTarget from './events/EventTarget.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 
 /**
  * @classdesc
@@ -22,7 +22,7 @@ import _ol_events_EventType_ from './events/EventType.js';
  */
 var _ol_Observable_ = function() {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @private
@@ -32,7 +32,7 @@ var _ol_Observable_ = function() {
 
 };
 
-inherits(_ol_Observable_, _ol_events_EventTarget_);
+inherits(_ol_Observable_, EventTarget);
 
 
 /**
@@ -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

@@ -4,10 +4,10 @@
 import {getUid, inherits} from './index.js';
 import _ol_Collection_ from './Collection.js';
 import _ol_CollectionEventType_ from './CollectionEventType.js';
-import _ol_MapBrowserEvent_ from './MapBrowserEvent.js';
+import MapBrowserEvent from './MapBrowserEvent.js';
-import _ol_MapBrowserEventHandler_ from './MapBrowserEventHandler.js';
+import MapBrowserEventHandler from './MapBrowserEventHandler.js';
-import _ol_MapBrowserEventType_ from './MapBrowserEventType.js';
+import MapBrowserEventType from './MapBrowserEventType.js';
-import _ol_MapEvent_ from './MapEvent.js';
+import MapEvent from './MapEvent.js';
 import _ol_MapEventType_ from './MapEventType.js';
 import _ol_MapProperty_ from './MapProperty.js';
 import _ol_Object_ from './Object.js';
@@ -18,8 +18,8 @@ import _ol_ViewHint_ from './ViewHint.js';
 import _ol_asserts_ from './asserts.js';
 import {removeNode} from './dom.js';
 import _ol_events_ from './events.js';
-import _ol_events_Event_ from './events/Event.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,18 +168,18 @@ var _ol_PluggableMap_ = function(options) {
   this.overlayContainerStopEvent_ = document.createElement('DIV');
   this.overlayContainerStopEvent_.className = 'ol-overlaycontainer-stopevent';
   var overlayEvents = [
-    _ol_events_EventType_.CLICK,
+    EventType.CLICK,
-    _ol_events_EventType_.DBLCLICK,
+    EventType.DBLCLICK,
-    _ol_events_EventType_.MOUSEDOWN,
+    EventType.MOUSEDOWN,
-    _ol_events_EventType_.TOUCHSTART,
+    EventType.TOUCHSTART,
-    _ol_events_EventType_.MSPOINTERDOWN,
+    EventType.MSPOINTERDOWN,
-    _ol_MapBrowserEventType_.POINTERDOWN,
+    MapBrowserEventType.POINTERDOWN,
-    _ol_events_EventType_.MOUSEWHEEL,
+    EventType.MOUSEWHEEL,
-    _ol_events_EventType_.WHEEL
+    EventType.WHEEL
   ];
   for (var i = 0, ii = overlayEvents.length; i < ii; ++i) {
     _ol_events_.listen(this.overlayContainerStopEvent_, overlayEvents[i],
-        _ol_events_Event_.stopPropagation);
+        Event.stopPropagation);
   }
   this.viewport_.appendChild(this.overlayContainerStopEvent_);
 
@@ -187,9 +187,9 @@ var _ol_PluggableMap_ = function(options) {
    * @private
    * @type {ol.MapBrowserEventHandler}
    */
-  this.mapBrowserEventHandler_ = new _ol_MapBrowserEventHandler_(this, options.moveTolerance);
+  this.mapBrowserEventHandler_ = new MapBrowserEventHandler(this, options.moveTolerance);
-  for (var key in _ol_MapBrowserEventType_) {
+  for (var key in MapBrowserEventType) {
-    _ol_events_.listen(this.mapBrowserEventHandler_, _ol_MapBrowserEventType_[key],
+    _ol_events_.listen(this.mapBrowserEventHandler_, MapBrowserEventType[key],
         this.handleMapBrowserEvent, this);
   }
 
@@ -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;
   }
@@ -837,7 +837,7 @@ _ol_PluggableMap_.prototype.getTilePriority = function(tile, tileSourceKey, tile
  */
 _ol_PluggableMap_.prototype.handleBrowserEvent = function(browserEvent, opt_type) {
   var type = opt_type || browserEvent.type;
-  var mapBrowserEvent = new _ol_MapBrowserEvent_(type, this, browserEvent);
+  var mapBrowserEvent = new MapBrowserEvent(type, this, browserEvent);
   this.handleMapBrowserEvent(mapBrowserEvent);
 };
 
@@ -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)
     ];
   }
@@ -1193,7 +1193,7 @@ _ol_PluggableMap_.prototype.renderFrame_ = function(time) {
                   !equals(frameState.extent, this.previousExtent_));
       if (moveStart) {
         this.dispatchEvent(
-            new _ol_MapEvent_(_ol_MapEventType_.MOVESTART, this, previousFrameState));
+            new MapEvent(_ol_MapEventType_.MOVESTART, this, previousFrameState));
         this.previousExtent_ = createOrUpdateEmpty(this.previousExtent_);
       }
     }
@@ -1205,13 +1205,13 @@ _ol_PluggableMap_.prototype.renderFrame_ = function(time) {
 
     if (idle) {
       this.dispatchEvent(
-          new _ol_MapEvent_(_ol_MapEventType_.MOVEEND, this, frameState));
+          new MapEvent(_ol_MapEventType_.MOVEEND, this, frameState));
       clone(frameState.extent, this.previousExtent_);
     }
   }
 
   this.dispatchEvent(
-      new _ol_MapEvent_(_ol_MapEventType_.POSTRENDER, this, frameState));
+      new MapEvent(_ol_MapEventType_.POSTRENDER, this, frameState));
 
   setTimeout(this.handlePostRender.bind(this), 0);
 

src/ol/Tile.js

@@ -4,8 +4,8 @@
 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 EventTarget from './events/EventTarget.js';
-import _ol_events_EventType_ from './events/EventType.js';
+import EventType from './events/EventType.js';
 
 /**
  * @classdesc
@@ -19,7 +19,7 @@ import _ol_events_EventType_ from './events/EventType.js';
  * @param {olx.TileOptions=} opt_options Tile options.
  */
 var _ol_Tile_ = function(tileCoord, state, opt_options) {
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   var options = opt_options ? opt_options : {};
 
@@ -66,14 +66,14 @@ var _ol_Tile_ = function(tileCoord, state, opt_options) {
 
 };
 
-inherits(_ol_Tile_, _ol_events_EventTarget_);
+inherits(_ol_Tile_, 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

@@ -9,8 +9,8 @@ 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_Event_ from '../events/Event.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,10 +120,10 @@ 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,
-      _ol_events_Event_.stopPropagation);
+      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/events/Event.js

@@ -15,7 +15,7 @@
  * @implements {oli.events.Event}
  * @param {string} type Type.
  */
-var _ol_events_Event_ = function(type) {
+var Event = function(type) {
 
   /**
    * @type {boolean}
@@ -45,7 +45,7 @@ var _ol_events_Event_ = function(type) {
  * @override
  * @api
  */
-_ol_events_Event_.prototype.preventDefault =
+Event.prototype.preventDefault =
 
   /**
    * Stop event propagation.
@@ -53,7 +53,7 @@ _ol_events_Event_.prototype.preventDefault =
    * @override
    * @api
    */
-  _ol_events_Event_.prototype.stopPropagation = function() {
+  Event.prototype.stopPropagation = function() {
     this.propagationStopped = true;
   };
 
@@ -61,7 +61,7 @@ _ol_events_Event_.prototype.preventDefault =
 /**
  * @param {Event|ol.events.Event} evt Event
  */
-_ol_events_Event_.stopPropagation = function(evt) {
+Event.stopPropagation = function(evt) {
   evt.stopPropagation();
 };
 
@@ -69,7 +69,7 @@ _ol_events_Event_.stopPropagation = function(evt) {
 /**
  * @param {Event|ol.events.Event} evt Event
  */
-_ol_events_Event_.preventDefault = function(evt) {
+Event.preventDefault = function(evt) {
   evt.preventDefault();
 };
-export default _ol_events_Event_;
+export default Event;

src/ol/events/EventTarget.js

@@ -4,7 +4,7 @@
 import {inherits, nullFunction} from '../index.js';
 import _ol_Disposable_ from '../Disposable.js';
 import _ol_events_ from '../events.js';
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 
 /**
  * @classdesc
@@ -24,7 +24,7 @@ import _ol_events_Event_ from '../events/Event.js';
  * @constructor
  * @extends {ol.Disposable}
  */
-var _ol_events_EventTarget_ = function() {
+var EventTarget = function() {
 
   _ol_Disposable_.call(this);
 
@@ -48,14 +48,14 @@ var _ol_events_EventTarget_ = function() {
 
 };
 
-inherits(_ol_events_EventTarget_, _ol_Disposable_);
+inherits(EventTarget, _ol_Disposable_);
 
 
 /**
  * @param {string} type Type.
  * @param {ol.EventsListenerFunctionType} listener Listener.
  */
-_ol_events_EventTarget_.prototype.addEventListener = function(type, listener) {
+EventTarget.prototype.addEventListener = function(type, listener) {
   var listeners = this.listeners_[type];
   if (!listeners) {
     listeners = this.listeners_[type] = [];
@@ -73,8 +73,8 @@ _ol_events_EventTarget_.prototype.addEventListener = function(type, listener) {
  * @return {boolean|undefined} `false` if anyone called preventDefault on the
  *     event object or if any of the listeners returned false.
  */
-_ol_events_EventTarget_.prototype.dispatchEvent = function(event) {
+EventTarget.prototype.dispatchEvent = function(event) {
-  var evt = typeof event === 'string' ? new _ol_events_Event_(event) : event;
+  var evt = typeof event === 'string' ? new Event(event) : event;
   var type = evt.type;
   evt.target = this;
   var listeners = this.listeners_[type];
@@ -108,7 +108,7 @@ _ol_events_EventTarget_.prototype.dispatchEvent = function(event) {
 /**
  * @inheritDoc
  */
-_ol_events_EventTarget_.prototype.disposeInternal = function() {
+EventTarget.prototype.disposeInternal = function() {
   _ol_events_.unlistenAll(this);
 };
 
@@ -120,7 +120,7 @@ _ol_events_EventTarget_.prototype.disposeInternal = function() {
  * @param {string} type Type.
  * @return {Array.<ol.EventsListenerFunctionType>} Listeners.
  */
-_ol_events_EventTarget_.prototype.getListeners = function(type) {
+EventTarget.prototype.getListeners = function(type) {
   return this.listeners_[type];
 };
 
@@ -130,7 +130,7 @@ _ol_events_EventTarget_.prototype.getListeners = function(type) {
  *     `true` will be returned if this EventTarget has any listeners.
  * @return {boolean} Has listeners.
  */
-_ol_events_EventTarget_.prototype.hasListener = function(opt_type) {
+EventTarget.prototype.hasListener = function(opt_type) {
   return opt_type ?
     opt_type in this.listeners_ :
     Object.keys(this.listeners_).length > 0;
@@ -141,7 +141,7 @@ _ol_events_EventTarget_.prototype.hasListener = function(opt_type) {
  * @param {string} type Type.
  * @param {ol.EventsListenerFunctionType} listener Listener.
  */
-_ol_events_EventTarget_.prototype.removeEventListener = function(type, listener) {
+EventTarget.prototype.removeEventListener = function(type, listener) {
   var listeners = this.listeners_[type];
   if (listeners) {
     var index = listeners.indexOf(listener);
@@ -157,4 +157,4 @@ _ol_events_EventTarget_.prototype.removeEventListener = function(type, listener)
     }
   }
 };
-export default _ol_events_EventTarget_;
+export default EventTarget;

src/ol/events/condition.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/events/condition
  */
-import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
+import MapBrowserEventType from '../MapBrowserEventType.js';
 import _ol_asserts_ from '../asserts.js';
 import {TRUE, FALSE} from '../functions.js';
 import _ol_has_ from '../has.js';
@@ -61,7 +61,7 @@ _ol_events_condition_.always = TRUE;
  * @api
  */
 _ol_events_condition_.click = function(mapBrowserEvent) {
-  return mapBrowserEvent.type == _ol_MapBrowserEventType_.CLICK;
+  return mapBrowserEvent.type == MapBrowserEventType.CLICK;
 };
 
 
@@ -113,7 +113,7 @@ _ol_events_condition_.pointerMove = function(mapBrowserEvent) {
  * @api
  */
 _ol_events_condition_.singleClick = function(mapBrowserEvent) {
-  return mapBrowserEvent.type == _ol_MapBrowserEventType_.SINGLECLICK;
+  return mapBrowserEvent.type == MapBrowserEventType.SINGLECLICK;
 };
 
 
@@ -125,7 +125,7 @@ _ol_events_condition_.singleClick = function(mapBrowserEvent) {
  * @api
  */
 _ol_events_condition_.doubleClick = function(mapBrowserEvent) {
-  return mapBrowserEvent.type == _ol_MapBrowserEventType_.DBLCLICK;
+  return mapBrowserEvent.type == MapBrowserEventType.DBLCLICK;
 };
 
 

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/DoubleClickZoom.js

@@ -2,7 +2,7 @@
  * @module ol/interaction/DoubleClickZoom
  */
 import {inherits} from '../index.js';
-import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
+import MapBrowserEventType from '../MapBrowserEventType.js';
 import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
 
 /**
@@ -50,7 +50,7 @@ inherits(_ol_interaction_DoubleClickZoom_, _ol_interaction_Interaction_);
 _ol_interaction_DoubleClickZoom_.handleEvent = function(mapBrowserEvent) {
   var stopEvent = false;
   var browserEvent = mapBrowserEvent.originalEvent;
-  if (mapBrowserEvent.type == _ol_MapBrowserEventType_.DBLCLICK) {
+  if (mapBrowserEvent.type == MapBrowserEventType.DBLCLICK) {
     var map = mapBrowserEvent.map;
     var anchor = mapBrowserEvent.coordinate;
     var delta = browserEvent.shiftKey ? -this.delta_ : this.delta_;

src/ol/interaction/DragAndDrop.js

@@ -6,8 +6,8 @@
 import {inherits} from '../index.js';
 import {TRUE} from '../functions.js';
 import _ol_events_ from '../events.js';
-import _ol_events_Event_ from '../events/Event.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)
     ];
   }
@@ -253,7 +253,7 @@ _ol_interaction_DragAndDrop_.EventType_ = {
  */
 _ol_interaction_DragAndDrop_.Event = function(type, file, opt_features, opt_projection) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The features parsed from dropped data.
@@ -277,5 +277,5 @@ _ol_interaction_DragAndDrop_.Event = function(type, file, opt_features, opt_proj
   this.projection = opt_projection;
 
 };
-inherits(_ol_interaction_DragAndDrop_.Event, _ol_events_Event_);
+inherits(_ol_interaction_DragAndDrop_.Event, Event);
 export default _ol_interaction_DragAndDrop_;

src/ol/interaction/DragBox.js

@@ -2,7 +2,7 @@
  * @module ol/interaction/DragBox
  */
 // FIXME draw drag box
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 import {inherits, nullFunction} from '../index.js';
 import _ol_events_condition_ from '../events/condition.js';
 import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
@@ -213,7 +213,7 @@ _ol_interaction_DragBox_.EventType_ = {
  * @implements {oli.DragBoxEvent}
  */
 _ol_interaction_DragBox_.Event = function(type, coordinate, mapBrowserEvent) {
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The coordinate of the drag event.
@@ -231,5 +231,5 @@ _ol_interaction_DragBox_.Event = function(type, coordinate, mapBrowserEvent) {
   this.mapBrowserEvent = mapBrowserEvent;
 
 };
-inherits(_ol_interaction_DragBox_.Event, _ol_events_Event_);
+inherits(_ol_interaction_DragBox_.Event, Event);
 export default _ol_interaction_DragBox_;

src/ol/interaction/Draw.js

@@ -3,11 +3,11 @@
  */
 import {inherits} from '../index.js';
 import _ol_Feature_ from '../Feature.js';
-import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
+import MapBrowserEventType from '../MapBrowserEventType.js';
 import _ol_Object_ from '../Object.js';
 import _ol_coordinate_ from '../coordinate.js';
 import _ol_events_ from '../events.js';
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 import _ol_events_condition_ from '../events/condition.js';
 import {boundingExtent, getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../extent.js';
 import {TRUE, FALSE} from '../functions.js';
@@ -325,16 +325,16 @@ _ol_interaction_Draw_.handleEvent = function(event) {
   this.freehand_ = this.mode_ !== _ol_interaction_Draw_.Mode_.POINT && this.freehandCondition_(event);
   var pass = true;
   if (this.freehand_ &&
-      event.type === _ol_MapBrowserEventType_.POINTERDRAG &&
+      event.type === MapBrowserEventType.POINTERDRAG &&
       this.sketchFeature_ !== null) {
     this.addToDrawing_(event);
     pass = false;
   } else if (this.freehand_ &&
-      event.type === _ol_MapBrowserEventType_.POINTERDOWN) {
+      event.type === MapBrowserEventType.POINTERDOWN) {
     pass = false;
-  } else if (event.type === _ol_MapBrowserEventType_.POINTERMOVE) {
+  } else if (event.type === MapBrowserEventType.POINTERMOVE) {
     pass = this.handlePointerMove_(event);
-  } else if (event.type === _ol_MapBrowserEventType_.DBLCLICK) {
+  } else if (event.type === MapBrowserEventType.DBLCLICK) {
     pass = false;
   }
   return _ol_interaction_Pointer_.handleEvent.call(this, event) && pass;
@@ -889,7 +889,7 @@ _ol_interaction_Draw_.Mode_ = {
  */
 _ol_interaction_Draw_.Event = function(type, feature) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The feature being drawn.
@@ -899,5 +899,5 @@ _ol_interaction_Draw_.Event = function(type, feature) {
   this.feature = feature;
 
 };
-inherits(_ol_interaction_Draw_.Event, _ol_events_Event_);
+inherits(_ol_interaction_Draw_.Event, Event);
 export default _ol_interaction_Draw_;

src/ol/interaction/Extent.js

@@ -3,10 +3,10 @@
  */
 import {inherits} from '../index.js';
 import _ol_Feature_ from '../Feature.js';
-import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
+import MapBrowserEventType from '../MapBrowserEventType.js';
-import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js';
 import _ol_coordinate_ from '../coordinate.js';
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 import {boundingExtent, getArea} from '../extent.js';
 import GeometryType from '../geom/GeometryType.js';
 import Point from '../geom/Point.js';
@@ -132,11 +132,11 @@ inherits(_ol_interaction_Extent_, _ol_interaction_Pointer_);
  * @private
  */
 _ol_interaction_Extent_.handleEvent_ = function(mapBrowserEvent) {
-  if (!(mapBrowserEvent instanceof _ol_MapBrowserPointerEvent_)) {
+  if (!(mapBrowserEvent instanceof MapBrowserPointerEvent)) {
     return true;
   }
   //display pointer (if not dragging)
-  if (mapBrowserEvent.type == _ol_MapBrowserEventType_.POINTERMOVE && !this.handlingDownUpSequence) {
+  if (mapBrowserEvent.type == MapBrowserEventType.POINTERMOVE && !this.handlingDownUpSequence) {
     this.handlePointerMove_(mapBrowserEvent);
   }
   //call pointer to determine up/down/drag
@@ -454,7 +454,7 @@ _ol_interaction_Extent_.prototype.setExtent = function(extent) {
  * @extends {ol.events.Event}
  */
 _ol_interaction_Extent_.Event = function(extent) {
-  _ol_events_Event_.call(this, _ol_interaction_ExtentEventType_.EXTENTCHANGED);
+  Event.call(this, _ol_interaction_ExtentEventType_.EXTENTCHANGED);
 
   /**
    * The current extent.
@@ -464,5 +464,5 @@ _ol_interaction_Extent_.Event = function(extent) {
   this.extent = extent;
 
 };
-inherits(_ol_interaction_Extent_.Event, _ol_events_Event_);
+inherits(_ol_interaction_Extent_.Event, Event);
 export default _ol_interaction_Extent_;

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 ||
+  if (mapBrowserEvent.type == EventType.KEYDOWN ||
-      mapBrowserEvent.type == _ol_events_EventType_.KEYPRESS) {
+      mapBrowserEvent.type == EventType.KEYPRESS) {
     var keyEvent = mapBrowserEvent.originalEvent;
     var charCode = keyEvent.charCode;
     if (this.condition_(mapBrowserEvent) &&

src/ol/interaction/Modify.js

@@ -5,13 +5,13 @@ import {getUid, inherits} from '../index.js';
 import _ol_Collection_ from '../Collection.js';
 import _ol_CollectionEventType_ from '../CollectionEventType.js';
 import _ol_Feature_ from '../Feature.js';
-import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
+import MapBrowserEventType from '../MapBrowserEventType.js';
-import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js';
 import _ol_array_ from '../array.js';
 import _ol_coordinate_ from '../coordinate.js';
 import _ol_events_ from '../events.js';
-import _ol_events_Event_ from '../events/Event.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);
 };
 
@@ -799,19 +799,19 @@ _ol_interaction_Modify_.handleUpEvent_ = function(evt) {
  * @api
  */
 _ol_interaction_Modify_.handleEvent = function(mapBrowserEvent) {
-  if (!(mapBrowserEvent instanceof _ol_MapBrowserPointerEvent_)) {
+  if (!(mapBrowserEvent instanceof MapBrowserPointerEvent)) {
     return true;
   }
   this.lastPointerEvent_ = mapBrowserEvent;
 
   var handled;
   if (!mapBrowserEvent.map.getView().getInteracting() &&
-      mapBrowserEvent.type == _ol_MapBrowserEventType_.POINTERMOVE &&
+      mapBrowserEvent.type == MapBrowserEventType.POINTERMOVE &&
       !this.handlingDownUpSequence) {
     this.handlePointerMove_(mapBrowserEvent);
   }
   if (this.vertexFeature_ && this.deleteCondition_(mapBrowserEvent)) {
-    if (mapBrowserEvent.type != _ol_MapBrowserEventType_.SINGLECLICK ||
+    if (mapBrowserEvent.type != MapBrowserEventType.SINGLECLICK ||
         !this.ignoreNextSingleClick_) {
       handled = this.removePoint();
     } else {
@@ -819,7 +819,7 @@ _ol_interaction_Modify_.handleEvent = function(mapBrowserEvent) {
     }
   }
 
-  if (mapBrowserEvent.type == _ol_MapBrowserEventType_.SINGLECLICK) {
+  if (mapBrowserEvent.type == MapBrowserEventType.SINGLECLICK) {
     this.ignoreNextSingleClick_ = false;
   }
 
@@ -1026,7 +1026,7 @@ _ol_interaction_Modify_.prototype.insertVertex_ = function(segmentData, vertex)
  * @api
  */
 _ol_interaction_Modify_.prototype.removePoint = function() {
-  if (this.lastPointerEvent_ && this.lastPointerEvent_.type != _ol_MapBrowserEventType_.POINTERDRAG) {
+  if (this.lastPointerEvent_ && this.lastPointerEvent_.type != MapBrowserEventType.POINTERDRAG) {
     var evt = this.lastPointerEvent_;
     this.willModifyFeatures_(evt);
     this.removeVertex_();
@@ -1215,7 +1215,7 @@ _ol_interaction_Modify_.getDefaultStyleFunction = function() {
  */
 _ol_interaction_Modify_.Event = function(type, features, mapBrowserPointerEvent) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The features being modified.
@@ -1231,5 +1231,5 @@ _ol_interaction_Modify_.Event = function(type, features, mapBrowserPointerEvent)
    */
   this.mapBrowserEvent = mapBrowserPointerEvent;
 };
-inherits(_ol_interaction_Modify_.Event, _ol_events_Event_);
+inherits(_ol_interaction_Modify_.Event, Event);
 export default _ol_interaction_Modify_;

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/Pointer.js

@@ -3,8 +3,8 @@
  */
 import {inherits, nullFunction} from '../index.js';
 import {FALSE} from '../functions.js';
-import _ol_MapBrowserEventType_ from '../MapBrowserEventType.js';
+import MapBrowserEventType from '../MapBrowserEventType.js';
-import _ol_MapBrowserPointerEvent_ from '../MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js';
 import _ol_interaction_Interaction_ from '../interaction/Interaction.js';
 import _ol_obj_ from '../obj.js';
 
@@ -109,9 +109,9 @@ _ol_interaction_Pointer_.centroid = function(pointerEvents) {
  */
 _ol_interaction_Pointer_.prototype.isPointerDraggingEvent_ = function(mapBrowserEvent) {
   var type = mapBrowserEvent.type;
-  return type === _ol_MapBrowserEventType_.POINTERDOWN ||
+  return type === MapBrowserEventType.POINTERDOWN ||
-    type === _ol_MapBrowserEventType_.POINTERDRAG ||
+    type === MapBrowserEventType.POINTERDRAG ||
-    type === _ol_MapBrowserEventType_.POINTERUP;
+    type === MapBrowserEventType.POINTERUP;
 };
 
 
@@ -124,10 +124,10 @@ _ol_interaction_Pointer_.prototype.updateTrackedPointers_ = function(mapBrowserE
     var event = mapBrowserEvent.pointerEvent;
 
     var id = event.pointerId.toString();
-    if (mapBrowserEvent.type == _ol_MapBrowserEventType_.POINTERUP) {
+    if (mapBrowserEvent.type == MapBrowserEventType.POINTERUP) {
       delete this.trackedPointers_[id];
     } else if (mapBrowserEvent.type ==
-        _ol_MapBrowserEventType_.POINTERDOWN) {
+        MapBrowserEventType.POINTERDOWN) {
       this.trackedPointers_[id] = event;
     } else if (id in this.trackedPointers_) {
       // update only when there was a pointerdown event for this pointer
@@ -178,25 +178,25 @@ _ol_interaction_Pointer_.handleMoveEvent = nullFunction;
  * @api
  */
 _ol_interaction_Pointer_.handleEvent = function(mapBrowserEvent) {
-  if (!(mapBrowserEvent instanceof _ol_MapBrowserPointerEvent_)) {
+  if (!(mapBrowserEvent instanceof MapBrowserPointerEvent)) {
     return true;
   }
 
   var stopEvent = false;
   this.updateTrackedPointers_(mapBrowserEvent);
   if (this.handlingDownUpSequence) {
-    if (mapBrowserEvent.type == _ol_MapBrowserEventType_.POINTERDRAG) {
+    if (mapBrowserEvent.type == MapBrowserEventType.POINTERDRAG) {
       this.handleDragEvent_(mapBrowserEvent);
-    } else if (mapBrowserEvent.type == _ol_MapBrowserEventType_.POINTERUP) {
+    } else if (mapBrowserEvent.type == MapBrowserEventType.POINTERUP) {
       var handledUp = this.handleUpEvent_(mapBrowserEvent);
       this.handlingDownUpSequence = handledUp && this.targetPointers.length > 0;
     }
   } else {
-    if (mapBrowserEvent.type == _ol_MapBrowserEventType_.POINTERDOWN) {
+    if (mapBrowserEvent.type == MapBrowserEventType.POINTERDOWN) {
       var handled = this.handleDownEvent_(mapBrowserEvent);
       this.handlingDownUpSequence = handled;
       stopEvent = this.shouldStopEvent(handled);
-    } else if (mapBrowserEvent.type == _ol_MapBrowserEventType_.POINTERMOVE) {
+    } else if (mapBrowserEvent.type == MapBrowserEventType.POINTERMOVE) {
       this.handleMoveEvent_(mapBrowserEvent);
     }
   }

src/ol/interaction/Select.js

@@ -5,7 +5,7 @@ import {getUid, inherits} from '../index.js';
 import _ol_CollectionEventType_ from '../CollectionEventType.js';
 import _ol_array_ from '../array.js';
 import _ol_events_ from '../events.js';
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 import _ol_events_condition_ from '../events/condition.js';
 import {TRUE} from '../functions.js';
 import GeometryType from '../geom/GeometryType.js';
@@ -391,7 +391,7 @@ _ol_interaction_Select_.prototype.removeFeatureLayerAssociation_ = function(feat
  * @constructor
  */
 _ol_interaction_Select_.Event = function(type, selected, deselected, mapBrowserEvent) {
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * Selected features array.
@@ -414,7 +414,7 @@ _ol_interaction_Select_.Event = function(type, selected, deselected, mapBrowserE
    */
   this.mapBrowserEvent = mapBrowserEvent;
 };
-inherits(_ol_interaction_Select_.Event, _ol_events_Event_);
+inherits(_ol_interaction_Select_.Event, Event);
 
 
 /**

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/interaction/Translate.js

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import _ol_Collection_ from '../Collection.js';
 import _ol_Object_ from '../Object.js';
 import _ol_events_ from '../events.js';
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 import {TRUE} from '../functions.js';
 import _ol_array_ from '../array.js';
 import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
@@ -276,7 +276,7 @@ _ol_interaction_Translate_.prototype.updateState_ = function(oldMap) {
  */
 _ol_interaction_Translate_.Event = function(type, features, coordinate) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The features being translated.
@@ -293,5 +293,5 @@ _ol_interaction_Translate_.Event = function(type, features, coordinate) {
    */
   this.coordinate = coordinate;
 };
-inherits(_ol_interaction_Translate_.Event, _ol_events_Event_);
+inherits(_ol_interaction_Translate_.Event, Event);
 export default _ol_interaction_Translate_;

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/pointer/PointerEvent.js

@@ -32,7 +32,7 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import {inherits} from '../index.js';
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 
 /**
  * A class for pointer events.
@@ -48,7 +48,7 @@ import _ol_events_Event_ from '../events/Event.js';
  *    initial event properties.
  */
 var _ol_pointer_PointerEvent_ = function(type, originalEvent, opt_eventDict) {
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * @const
@@ -192,7 +192,7 @@ var _ol_pointer_PointerEvent_ = function(type, originalEvent, opt_eventDict) {
   }
 };
 
-inherits(_ol_pointer_PointerEvent_, _ol_events_Event_);
+inherits(_ol_pointer_PointerEvent_, Event);
 
 
 /**

src/ol/pointer/PointerEventHandler.js

@@ -33,7 +33,7 @@
 
 import {inherits} from '../index.js';
 import _ol_events_ from '../events.js';
-import _ol_events_EventTarget_ from '../events/EventTarget.js';
+import EventTarget from '../events/EventTarget.js';
 import _ol_has_ from '../has.js';
 import _ol_pointer_EventType_ from '../pointer/EventType.js';
 import _ol_pointer_MouseSource_ from '../pointer/MouseSource.js';
@@ -48,7 +48,7 @@ import _ol_pointer_TouchSource_ from '../pointer/TouchSource.js';
  * @param {Element|HTMLDocument} element Viewport element.
  */
 var _ol_pointer_PointerEventHandler_ = function(element) {
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @const
@@ -78,7 +78,7 @@ var _ol_pointer_PointerEventHandler_ = function(element) {
   this.registerSources();
 };
 
-inherits(_ol_pointer_PointerEventHandler_, _ol_events_EventTarget_);
+inherits(_ol_pointer_PointerEventHandler_, EventTarget);
 
 
 /**
@@ -399,7 +399,7 @@ _ol_pointer_PointerEventHandler_.prototype.wrapMouseEvent = function(eventType,
  */
 _ol_pointer_PointerEventHandler_.prototype.disposeInternal = function() {
   this.unregister_();
-  _ol_events_EventTarget_.prototype.disposeInternal.call(this);
+  EventTarget.prototype.disposeInternal.call(this);
 };
 
 

src/ol/render/Event.js

@@ -2,7 +2,7 @@
  * @module ol/render/Event
  */
 import {inherits} from '../index.js';
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 
 /**
  * @constructor
@@ -18,7 +18,7 @@ var _ol_render_Event_ = function(
     type, opt_vectorContext, opt_frameState, opt_context,
     opt_glContext) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
@@ -52,5 +52,5 @@ var _ol_render_Event_ = function(
 
 };
 
-inherits(_ol_render_Event_, _ol_events_Event_);
+inherits(_ol_render_Event_, Event);
 export default _ol_render_Event_;

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/Image.js

@@ -5,7 +5,7 @@ import {ENABLE_RASTER_REPROJECTION} from '../reproj/common.js';
 import {inherits} from '../index.js';
 import _ol_ImageState_ from '../ImageState.js';
 import _ol_array_ from '../array.js';
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 import {equals} from '../extent.js';
 import {equivalent} from '../proj.js';
 import _ol_reproj_Image_ from '../reproj/Image.js';
@@ -188,7 +188,7 @@ _ol_source_Image_.defaultImageLoadFunction = function(image, src) {
  */
 _ol_source_Image_.Event = function(type, image) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The image related to the event.
@@ -198,7 +198,7 @@ _ol_source_Image_.Event = function(type, image) {
   this.image = image;
 
 };
-inherits(_ol_source_Image_.Event, _ol_events_Event_);
+inherits(_ol_source_Image_.Event, Event);
 
 
 /**

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

@@ -6,8 +6,8 @@ import _ol_ImageCanvas_ from '../ImageCanvas.js';
 import _ol_TileQueue_ from '../TileQueue.js';
 import {createCanvasContext2D} from '../dom.js';
 import _ol_events_ from '../events.js';
-import _ol_events_Event_ from '../events/Event.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);
   }
 
@@ -431,7 +431,7 @@ _ol_source_Raster_.createTileRenderer_ = function(source) {
  * @param {Object} data An object made available to operations.
  */
 _ol_source_Raster_.Event = function(type, frameState, data) {
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The raster extent.
@@ -456,7 +456,7 @@ _ol_source_Raster_.Event = function(type, frameState, data) {
   this.data = data;
 
 };
-inherits(_ol_source_Raster_.Event, _ol_events_Event_);
+inherits(_ol_source_Raster_.Event, Event);
 
 
 /**

src/ol/source/Tile.js

@@ -4,7 +4,7 @@
 import {inherits, nullFunction} from '../index.js';
 import _ol_TileCache_ from '../TileCache.js';
 import _ol_TileState_ from '../TileState.js';
-import _ol_events_Event_ from '../events/Event.js';
+import Event from '../events/Event.js';
 import {equivalent} from '../proj.js';
 import _ol_size_ from '../size.js';
 import _ol_source_Source_ from '../source/Source.js';
@@ -320,7 +320,7 @@ _ol_source_Tile_.prototype.useTile = nullFunction;
  */
 _ol_source_Tile_.Event = function(type, tile) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The tile related to the event.
@@ -330,5 +330,5 @@ _ol_source_Tile_.Event = function(type, tile) {
   this.tile = tile;
 
 };
-inherits(_ol_source_Tile_.Event, _ol_events_Event_);
+inherits(_ol_source_Tile_.Event, Event);
 export default _ol_source_Tile_;

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

@@ -9,8 +9,8 @@ import _ol_ObjectEventType_ from '../ObjectEventType.js';
 import _ol_array_ from '../array.js';
 import _ol_asserts_ from '../asserts.js';
 import _ol_events_ from '../events.js';
-import _ol_events_Event_ from '../events/Event.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)
@@ -866,7 +866,7 @@ _ol_source_Vector_.prototype.setLoader = function(loader) {
  */
 _ol_source_Vector_.Event = function(type, opt_feature) {
 
-  _ol_events_Event_.call(this, type);
+  Event.call(this, type);
 
   /**
    * The feature being added or removed.
@@ -876,5 +876,5 @@ _ol_source_Vector_.Event = function(type, opt_feature) {
   this.feature = opt_feature;
 
 };
-inherits(_ol_source_Vector_.Event, _ol_events_Event_);
+inherits(_ol_source_Vector_.Event, Event);
 export default _ol_source_Vector_;

src/ol/structs/LRUCache.js

@@ -3,8 +3,8 @@
  */
 import {inherits} from '../index.js';
 import _ol_asserts_ from '../asserts.js';
-import _ol_events_EventTarget_ from '../events/EventTarget.js';
+import 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
@@ -19,7 +19,7 @@ import _ol_events_EventType_ from '../events/EventType.js';
  */
 var _ol_structs_LRUCache_ = function(opt_highWaterMark) {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @type {number}
@@ -52,7 +52,7 @@ var _ol_structs_LRUCache_ = function(opt_highWaterMark) {
 
 };
 
-inherits(_ol_structs_LRUCache_, _ol_events_EventTarget_);
+inherits(_ol_structs_LRUCache_, EventTarget);
 
 
 /**
@@ -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

@@ -4,8 +4,8 @@
 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 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';
 
@@ -22,7 +22,7 @@ import _ol_style_ from '../style.js';
 var _ol_style_IconImage_ = function(image, src, size, crossOrigin, imageState,
     color) {
 
-  _ol_events_EventTarget_.call(this);
+  EventTarget.call(this);
 
   /**
    * @private
@@ -89,7 +89,7 @@ var _ol_style_IconImage_ = function(image, src, size, crossOrigin, imageState,
 
 };
 
-inherits(_ol_style_IconImage_, _ol_events_EventTarget_);
+inherits(_ol_style_IconImage_, EventTarget);
 
 
 /**
@@ -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/events.test.js

@@ -1,5 +1,5 @@
 import _ol_events_ from '../../../src/ol/events.js';
-import _ol_events_EventTarget_ from '../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../src/ol/events/EventTarget.js';
 
 describe('ol.events', function() {
   var add, remove, target;
@@ -199,7 +199,7 @@ describe('ol.events', function() {
 
   describe('Compatibility with ol.events.EventTarget', function() {
     it('does not register duplicated listeners', function() {
-      var target = new _ol_events_EventTarget_();
+      var target = new EventTarget();
       var listener = function() {};
       var key1 = _ol_events_.listen(target, 'foo', listener);
       expect(target.getListeners('foo')).to.eql([key1.boundListener]);
@@ -208,7 +208,7 @@ describe('ol.events', function() {
       expect(target.getListeners('foo')).to.eql([key1.boundListener]);
     });
     it('registers multiple listeners if this object is different', function() {
-      var target = new _ol_events_EventTarget_();
+      var target = new EventTarget();
       var listener = function() {};
       var key1 = _ol_events_.listen(target, 'foo', listener, {});
       var key2 = _ol_events_.listen(target, 'foo', listener, {});

test/spec/ol/events/event.test.js

@@ -1,26 +1,26 @@
-import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
+import Event from '../../../../src/ol/events/Event.js';
 
 describe('ol.events.Event', function() {
 
   describe('constructor', function() {
     it('takes a type as argument', function() {
-      var event = new _ol_events_Event_('foo');
+      var event = new Event('foo');
       expect(event.type).to.be('foo');
     });
     it('does not set the propagationStopped flag', function() {
-      var event = new _ol_events_Event_('foo');
+      var event = new Event('foo');
       expect(event.propagationStopped).to.be(undefined);
     });
   });
 
   describe('#preventDefault', function() {
     it('sets the propagationStopped flag', function() {
-      var event = new _ol_events_Event_('foo');
+      var event = new Event('foo');
       event.preventDefault();
       expect(event.propagationStopped).to.be(true);
     });
     it('is the same as #stopPropagation', function() {
-      var event = new _ol_events_Event_('foo');
+      var event = new Event('foo');
       expect(event.stopPropagation).to.equal(event.preventDefault);
     });
   });
@@ -30,7 +30,7 @@ describe('ol.events.Event', function() {
       var event = {
         preventDefault: sinon.spy()
       };
-      _ol_events_Event_.preventDefault(event);
+      Event.preventDefault(event);
       expect(event.preventDefault.called).to.be(true);
     });
   });
@@ -40,7 +40,7 @@ describe('ol.events.Event', function() {
       var event = {
         stopPropagation: sinon.spy()
       };
-      _ol_events_Event_.stopPropagation(event);
+      Event.stopPropagation(event);
       expect(event.stopPropagation.called).to.be(true);
     });
   });

test/spec/ol/events/eventtarget.test.js

@@ -1,7 +1,7 @@
 import _ol_Disposable_ from '../../../../src/ol/Disposable.js';
 import _ol_events_ from '../../../../src/ol/events.js';
-import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
+import Event from '../../../../src/ol/events/Event.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 
 
 describe('ol.events.EventTarget', function() {
@@ -17,12 +17,12 @@ describe('ol.events.EventTarget', function() {
     spy1 = spy.bind({id: 1});
     spy2 = spy.bind({id: 2});
     spy3 = spy.bind({id: 3});
-    eventTarget = new _ol_events_EventTarget_();
+    eventTarget = new EventTarget();
   });
 
   describe('constructor', function() {
     it('creates an instance', function() {
-      expect(eventTarget).to.be.a(_ol_events_EventTarget_);
+      expect(eventTarget).to.be.a(EventTarget);
       expect(eventTarget).to.be.a(_ol_Disposable_);
     });
     it('creates an empty listeners_ object', function() {
@@ -105,7 +105,7 @@ describe('ol.events.EventTarget', function() {
     it('passes a default ol.events.Event object to listeners', function() {
       eventTarget.addEventListener('foo', spy1);
       eventTarget.dispatchEvent('foo');
-      expect(events[0]).to.be.a(_ol_events_Event_);
+      expect(events[0]).to.be.a(Event);
       expect(events[0].type).to.be('foo');
       expect(events[0].target).to.equal(eventTarget);
     });

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);

test/spec/ol/interaction/draganddrop.test.js

@@ -1,7 +1,7 @@
 import {inherits} from '../../../../src/ol/index.js';
 import _ol_View_ from '../../../../src/ol/View.js';
-import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
+import Event from '../../../../src/ol/events/Event.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_format_GeoJSON_ from '../../../../src/ol/format/GeoJSON.js';
 import _ol_interaction_DragAndDrop_ from '../../../../src/ol/interaction/DragAndDrop.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -10,7 +10,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
   var viewport, map, interaction;
 
   beforeEach(function() {
-    viewport = new _ol_events_EventTarget_();
+    viewport = new EventTarget();
     map = {
       getViewport: function() {
         return viewport;
@@ -72,7 +72,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
     });
 
     it('registers and unregisters listeners on a custom target', function() {
-      var customTarget = new _ol_events_EventTarget_();
+      var customTarget = new EventTarget();
       interaction = new _ol_interaction_DragAndDrop_({
         formatConstructors: [_ol_format_GeoJSON_],
         target: customTarget
@@ -95,13 +95,13 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
       OrigFileReader = FileReader;
 
       FileReader = function() {
-        _ol_events_EventTarget_.apply(this, arguments);
+        EventTarget.apply(this, arguments);
         this.readAsText = function(file) {
           this.result = file;
           this.dispatchEvent('load');
         };
       };
-      inherits(FileReader, _ol_events_EventTarget_);
+      inherits(FileReader, EventTarget);
     });
 
     afterEach(function() {
@@ -114,7 +114,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
         done();
       });
       interaction.setMap(map);
-      var event = new _ol_events_Event_();
+      var event = new Event();
       event.dataTransfer = {};
       event.type = 'dragenter';
       viewport.dispatchEvent(event);
@@ -149,7 +149,7 @@ where('FileReader').describe('ol.interaction.DragAndDrop', function() {
         done();
       });
 
-      var event = new _ol_events_Event_();
+      var event = new Event();
       event.dataTransfer = {};
       event.type = 'dragenter';
       viewport.dispatchEvent(event);

test/spec/ol/interaction/dragrotateandzoom.test.js

@@ -1,5 +1,5 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import _ol_interaction_DragRotateAndZoom_ from '../../../../src/ol/interaction/DragRotateAndZoom.js';
 import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
@@ -58,7 +58,7 @@ describe('ol.interaction.DragRotateAndZoom', function() {
     });
 
     it('does not rotate when rotation is disabled on the view', function() {
-      var event = new _ol_MapBrowserPointerEvent_('pointermove', map,
+      var event = new MapBrowserPointerEvent('pointermove', map,
           new _ol_pointer_PointerEvent_('pointermove', {clientX: 20, clientY: 10}, {pointerType: 'mouse'}),
           true);
       interaction.lastAngle_ = Math.PI;
@@ -72,7 +72,7 @@ describe('ol.interaction.DragRotateAndZoom', function() {
         resolution: 1,
         enableRotation: false
       }));
-      event = new _ol_MapBrowserPointerEvent_('pointermove', map,
+      event = new MapBrowserPointerEvent('pointermove', map,
           new _ol_pointer_PointerEvent_('pointermove', {clientX: 24, clientY: 16}, {pointerType: 'mouse'}),
           true);
       interaction.handleDragEvent_(event);

test/spec/ol/interaction/draw.test.js

@@ -1,6 +1,6 @@
 import _ol_Feature_ from '../../../../src/ol/Feature.js';
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import _ol_array_ from '../../../../src/ol/array.js';
 import _ol_events_ from '../../../../src/ol/events.js';
@@ -73,7 +73,7 @@ describe('ol.interaction.Draw', function() {
       clientY: position.top + y + height / 2,
       shiftKey: shiftKey
     });
-    map.handleMapBrowserEvent(new _ol_MapBrowserPointerEvent_(type, map, event));
+    map.handleMapBrowserEvent(new MapBrowserPointerEvent(type, map, event));
   }
 
   describe('constructor', function() {

test/spec/ol/interaction/extent.test.js

@@ -1,5 +1,5 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import _ol_interaction_Extent_ from '../../../../src/ol/interaction/Extent.js';
 import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
@@ -57,7 +57,7 @@ describe('ol.interaction.Extent', function() {
       clientY: position.top - y + height / 2,
       shiftKey: shiftKey
     });
-    var event = new _ol_MapBrowserPointerEvent_(type, map, pointerEvent);
+    var event = new MapBrowserPointerEvent(type, map, pointerEvent);
     event.pointerEvent.pointerId = 1;
     map.handleMapBrowserEvent(event);
   }

test/spec/ol/interaction/interaction.test.js

@@ -1,6 +1,6 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
 import _ol_View_ from '../../../../src/ol/View.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
 
 describe('ol.interaction.Interaction', function() {
@@ -14,7 +14,7 @@ describe('ol.interaction.Interaction', function() {
 
     it('creates a new interaction', function() {
       expect(interaction).to.be.a(_ol_interaction_Interaction_);
-      expect(interaction).to.be.a(_ol_events_EventTarget_);
+      expect(interaction).to.be.a(EventTarget);
     });
 
     it('creates an active interaction', function() {

test/spec/ol/interaction/keyboardpan.test.js

@@ -1,7 +1,7 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserEvent_ from '../../../../src/ol/MapBrowserEvent.js';
+import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
-import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
+import Event from '../../../../src/ol/events/Event.js';
 import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
 describe('ol.interaction.KeyboardPan', function() {
   var map;
@@ -24,10 +24,10 @@ describe('ol.interaction.KeyboardPan', function() {
   describe('handleEvent()', function() {
     it('pans on arrow keys', function() {
       var spy = sinon.spy(_ol_interaction_Interaction_, 'pan');
-      var event = new _ol_MapBrowserEvent_('keydown', map, {
+      var event = new MapBrowserEvent('keydown', map, {
         type: 'keydown',
         target: map.getTargetElement(),
-        preventDefault: _ol_events_Event_.prototype.preventDefault
+        preventDefault: Event.prototype.preventDefault
       });
       event.originalEvent.keyCode = 40; // DOWN
       map.handleMapBrowserEvent(event);

test/spec/ol/interaction/keyboardzoom.test.js

@@ -1,7 +1,7 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserEvent_ from '../../../../src/ol/MapBrowserEvent.js';
+import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
-import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
+import Event from '../../../../src/ol/events/Event.js';
 import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
 describe('ol.interaction.KeyboardZoom', function() {
   var map;
@@ -24,10 +24,10 @@ describe('ol.interaction.KeyboardZoom', function() {
   describe('handleEvent()', function() {
     it('zooms on + and - keys', function() {
       var spy = sinon.spy(_ol_interaction_Interaction_, 'zoomByDelta');
-      var event = new _ol_MapBrowserEvent_('keydown', map, {
+      var event = new MapBrowserEvent('keydown', map, {
         type: 'keydown',
         target: map.getTargetElement(),
-        preventDefault: _ol_events_Event_.prototype.preventDefault
+        preventDefault: Event.prototype.preventDefault
       });
       event.originalEvent.charCode = '+'.charCodeAt(0);
       map.handleMapBrowserEvent(event);

test/spec/ol/interaction/modify.test.js

@@ -1,7 +1,7 @@
 import _ol_Collection_ from '../../../../src/ol/Collection.js';
 import _ol_Feature_ from '../../../../src/ol/Feature.js';
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import _ol_events_ from '../../../../src/ol/events.js';
 import _ol_events_condition_ from '../../../../src/ol/events/condition.js';
@@ -91,7 +91,7 @@ describe('ol.interaction.Modify', function() {
       button: button,
       isPrimary: true
     });
-    var event = new _ol_MapBrowserPointerEvent_(type, map, pointerEvent);
+    var event = new MapBrowserPointerEvent(type, map, pointerEvent);
     event.pointerEvent.pointerId = 1;
     map.handleMapBrowserEvent(event);
   }

test/spec/ol/interaction/mousewheelzoom.test.js

@@ -1,7 +1,7 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserEvent_ from '../../../../src/ol/MapBrowserEvent.js';
+import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
-import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
+import Event from '../../../../src/ol/events/Event.js';
 import _ol_has_ from '../../../../src/ol/has.js';
 import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
 import _ol_interaction_MouseWheelZoom_ from '../../../../src/ol/interaction/MouseWheelZoom.js';
@@ -43,10 +43,10 @@ describe('ol.interaction.MouseWheelZoom', function() {
     });
 
     it('works with the defaut value', function(done) {
-      var event = new _ol_MapBrowserEvent_('mousewheel', map, {
+      var event = new MapBrowserEvent('mousewheel', map, {
         type: 'mousewheel',
         target: map.getViewport(),
-        preventDefault: _ol_events_Event_.prototype.preventDefault
+        preventDefault: Event.prototype.preventDefault
       });
       map.handleMapBrowserEvent(event);
       clock.tick(50);
@@ -70,12 +70,12 @@ describe('ol.interaction.MouseWheelZoom', function() {
         _ol_has_.FIREFOX = origHasFirefox;
         done();
       });
-      var event = new _ol_MapBrowserEvent_('wheel', map, {
+      var event = new MapBrowserEvent('wheel', map, {
         type: 'wheel',
         deltaMode: WheelEvent.DOM_DELTA_PIXEL,
         deltaY: _ol_has_.DEVICE_PIXEL_RATIO,
         target: map.getViewport(),
-        preventDefault: _ol_events_Event_.prototype.preventDefault
+        preventDefault: Event.prototype.preventDefault
       });
       event.coordinate = [0, 0];
       map.handleMapBrowserEvent(event);
@@ -89,12 +89,12 @@ describe('ol.interaction.MouseWheelZoom', function() {
         _ol_has_.FIREFOX = origHasFirefox;
         done();
       });
-      var event = new _ol_MapBrowserEvent_('wheel', map, {
+      var event = new MapBrowserEvent('wheel', map, {
         type: 'wheel',
         deltaMode: WheelEvent.DOM_DELTA_PIXEL,
         deltaY: 1,
         target: map.getViewport(),
-        preventDefault: _ol_events_Event_.prototype.preventDefault
+        preventDefault: Event.prototype.preventDefault
       });
       event.coordinate = [0, 0];
       map.handleMapBrowserEvent(event);
@@ -115,12 +115,12 @@ describe('ol.interaction.MouseWheelZoom', function() {
           expect(call.args[2]).to.eql([0, 0]);
           done();
         });
-        var event = new _ol_MapBrowserEvent_('wheel', map, {
+        var event = new MapBrowserEvent('wheel', map, {
           type: 'wheel',
           deltaMode: WheelEvent.DOM_DELTA_LINE,
           deltaY: 3.714599609375,
           target: map.getViewport(),
-          preventDefault: _ol_events_Event_.prototype.preventDefault
+          preventDefault: Event.prototype.preventDefault
         });
         event.coordinate = [0, 0];
         map.handleMapBrowserEvent(event);
@@ -136,11 +136,11 @@ describe('ol.interaction.MouseWheelZoom', function() {
           _ol_has_.SAFARI = origHasSafari;
           done();
         });
-        var event = new _ol_MapBrowserEvent_('mousewheel', map, {
+        var event = new MapBrowserEvent('mousewheel', map, {
           type: 'mousewheel',
           wheelDeltaY: -50,
           target: map.getViewport(),
-          preventDefault: _ol_events_Event_.prototype.preventDefault
+          preventDefault: Event.prototype.preventDefault
         });
         event.coordinate = [0, 0];
         map.handleMapBrowserEvent(event);
@@ -156,11 +156,11 @@ describe('ol.interaction.MouseWheelZoom', function() {
           _ol_has_.SAFARI = origHasSafari;
           done();
         });
-        var event = new _ol_MapBrowserEvent_('mousewheel', map, {
+        var event = new MapBrowserEvent('mousewheel', map, {
           type: 'mousewheel',
           wheelDeltaY: -120,
           target: map.getViewport(),
-          preventDefault: _ol_events_Event_.prototype.preventDefault
+          preventDefault: Event.prototype.preventDefault
         });
         event.coordinate = [0, 0];
         map.handleMapBrowserEvent(event);

test/spec/ol/interaction/select.test.js

@@ -1,8 +1,8 @@
 import _ol_Collection_ from '../../../../src/ol/Collection.js';
 import _ol_Feature_ from '../../../../src/ol/Feature.js';
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserEventType_ from '../../../../src/ol/MapBrowserEventType.js';
+import MapBrowserEventType from '../../../../src/ol/MapBrowserEventType.js';
-import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import Polygon from '../../../../src/ol/geom/Polygon.js';
 import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
@@ -97,7 +97,7 @@ describe('ol.interaction.Select', function() {
       clientY: position.top + y + height / 2,
       shiftKey: shiftKey
     });
-    map.handleMapBrowserEvent(new _ol_MapBrowserPointerEvent_(type, map, event));
+    map.handleMapBrowserEvent(new MapBrowserPointerEvent(type, map, event));
   }
 
   describe('constructor', function() {
@@ -148,7 +148,7 @@ describe('ol.interaction.Select', function() {
       });
       select.on('select', listenerSpy);
 
-      simulateEvent(_ol_MapBrowserEventType_.SINGLECLICK, -10, -10);
+      simulateEvent(MapBrowserEventType.SINGLECLICK, -10, -10);
 
       expect(listenerSpy.callCount).to.be(0);
 
@@ -162,8 +162,8 @@ describe('ol.interaction.Select', function() {
       });
       select.on('select', listenerSpy);
 
-      simulateEvent(_ol_MapBrowserEventType_.SINGLECLICK, 10, -20);
+      simulateEvent(MapBrowserEventType.SINGLECLICK, 10, -20);
-      simulateEvent(_ol_MapBrowserEventType_.SINGLECLICK, 9, -21);
+      simulateEvent(MapBrowserEventType.SINGLECLICK, 9, -21);
 
       expect(listenerSpy.callCount).to.be(1);
 

test/spec/ol/interaction/translate.test.js

@@ -1,7 +1,7 @@
 import _ol_Collection_ from '../../../../src/ol/Collection.js';
 import _ol_Feature_ from '../../../../src/ol/Feature.js';
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserPointerEvent_ from '../../../../src/ol/MapBrowserPointerEvent.js';
+import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import Point from '../../../../src/ol/geom/Point.js';
 import _ol_interaction_Translate_ from '../../../../src/ol/interaction/Translate.js';
@@ -66,7 +66,7 @@ describe('ol.interaction.Translate', function() {
     // calculated in case body has top < 0 (test runner with small window)
     var position = viewport.getBoundingClientRect();
     var shiftKey = opt_shiftKey !== undefined ? opt_shiftKey : false;
-    var event = new _ol_MapBrowserPointerEvent_(type, map,
+    var event = new MapBrowserPointerEvent(type, map,
         new _ol_pointer_PointerEvent_(type, {
           clientX: position.left + x + width / 2,
           clientY: position.top + y + height / 2,

test/spec/ol/map.test.js

@@ -1,6 +1,6 @@
 import _ol_Feature_ from '../../../src/ol/Feature.js';
 import _ol_Map_ from '../../../src/ol/Map.js';
-import _ol_MapEvent_ from '../../../src/ol/MapEvent.js';
+import MapEvent from '../../../src/ol/MapEvent.js';
 import _ol_Overlay_ from '../../../src/ol/Overlay.js';
 import _ol_View_ from '../../../src/ol/View.js';
 import Point from '../../../src/ol/geom/Point.js';
@@ -349,7 +349,7 @@ describe('ol.Map', function() {
       var spy = sinon.spy(map, 'renderFrame_');
       map.render();
       map.once('postrender', function(event) {
-        expect(event).to.be.a(_ol_MapEvent_);
+        expect(event).to.be.a(MapEvent);
         expect(typeof spy.firstCall.args[0]).to.be('number');
         spy.restore();
         var frameState = event.frameState;
@@ -389,7 +389,7 @@ describe('ol.Map', function() {
 
       map.render();
       map.once('postrender', function(event) {
-        expect(event).to.be.a(_ol_MapEvent_);
+        expect(event).to.be.a(MapEvent);
         var frameState = event.frameState;
         expect(frameState).to.be(null);
         done();
@@ -403,7 +403,7 @@ describe('ol.Map', function() {
 
       map.render();
       map.once('postrender', function(event) {
-        expect(event).to.be.a(_ol_MapEvent_);
+        expect(event).to.be.a(MapEvent);
         var frameState = event.frameState;
         expect(frameState).to.be(null);
         done();

test/spec/ol/mapbrowserevent.test.js

@@ -1,5 +1,5 @@
 import _ol_Map_ from '../../../src/ol/Map.js';
-import _ol_MapBrowserEventHandler_ from '../../../src/ol/MapBrowserEventHandler.js';
+import MapBrowserEventHandler from '../../../src/ol/MapBrowserEventHandler.js';
 import _ol_events_ from '../../../src/ol/events.js';
 import _ol_has_ from '../../../src/ol/has.js';
 import _ol_pointer_PointerEvent_ from '../../../src/ol/pointer/PointerEvent.js';
@@ -16,7 +16,7 @@ describe('ol.MapBrowserEventHandler', function() {
     beforeEach(function() {
       clock = sinon.useFakeTimers();
       target = document.createElement('DIV');
-      handler = new _ol_MapBrowserEventHandler_(new _ol_Map_({
+      handler = new MapBrowserEventHandler(new _ol_Map_({
         target: target
       }));
 
@@ -99,7 +99,7 @@ describe('ol.MapBrowserEventHandler', function() {
 
     var handler;
     beforeEach(function() {
-      handler = new _ol_MapBrowserEventHandler_(new _ol_Map_({}));
+      handler = new MapBrowserEventHandler(new _ol_Map_({}));
     });
 
     it('is null if no "down" type event has been handled', function() {
@@ -119,8 +119,8 @@ describe('ol.MapBrowserEventHandler', function() {
     var moveToleranceHandler;
     var pointerdownAt0;
     beforeEach(function() {
-      defaultHandler = new _ol_MapBrowserEventHandler_(new _ol_Map_({}));
+      defaultHandler = new MapBrowserEventHandler(new _ol_Map_({}));
-      moveToleranceHandler = new _ol_MapBrowserEventHandler_(new _ol_Map_({}), 8);
+      moveToleranceHandler = new MapBrowserEventHandler(new _ol_Map_({}), 8);
       pointerdownAt0 = new _ol_pointer_PointerEvent_('pointerdown', {}, {
         clientX: 0,
         clientY: 0

test/spec/ol/observable.test.js

@@ -1,4 +1,4 @@
-import _ol_events_EventTarget_ from '../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../src/ol/events/EventTarget.js';
 import _ol_Observable_ from '../../../src/ol/Observable.js';
 
 
@@ -9,7 +9,7 @@ describe('ol.Observable', function() {
     it('creates a new observable', function() {
       var observable = new _ol_Observable_();
       expect(observable).to.be.a(_ol_Observable_);
-      expect(observable).to.be.a(_ol_events_EventTarget_);
+      expect(observable).to.be.a(EventTarget);
     });
 
   });

test/spec/ol/pointer/mousesource.test.js

@@ -1,5 +1,5 @@
 import _ol_events_ from '../../../../src/ol/events.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_has_ from '../../../../src/ol/has.js';
 import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js';
 import _ol_pointer_TouchSource_ from '../../../../src/ol/pointer/TouchSource.js';
@@ -13,7 +13,7 @@ describe('ol.pointer.MouseSource', function() {
 
   beforeEach(function() {
     clock = sinon.useFakeTimers();
-    target = new _ol_events_EventTarget_();
+    target = new EventTarget();
 
     // make sure that a mouse and touch event source is used
     _ol_has_.POINTER = false;

test/spec/ol/pointer/pointereventhandler.test.js

@@ -1,5 +1,5 @@
 import _ol_events_ from '../../../../src/ol/events.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_has_ from '../../../../src/ol/has.js';
 import _ol_pointer_MouseSource_ from '../../../../src/ol/pointer/MouseSource.js';
 import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
@@ -12,7 +12,7 @@ describe('ol.pointer.PointerEventHandler', function() {
   var eventSpy;
 
   beforeEach(function() {
-    target = new _ol_events_EventTarget_();
+    target = new EventTarget();
 
     // make sure that a mouse event source is used
     _ol_has_.POINTER = false;

test/spec/ol/pointer/touchsource.test.js

@@ -1,6 +1,6 @@
 import _ol_events_ from '../../../../src/ol/events.js';
-import _ol_events_Event_ from '../../../../src/ol/events/Event.js';
+import Event from '../../../../src/ol/events/Event.js';
-import _ol_events_EventTarget_ from '../../../../src/ol/events/EventTarget.js';
+import EventTarget from '../../../../src/ol/events/EventTarget.js';
 import _ol_has_ from '../../../../src/ol/has.js';
 import _ol_obj_ from '../../../../src/ol/obj.js';
 import _ol_pointer_PointerEventHandler_ from '../../../../src/ol/pointer/PointerEventHandler.js';
@@ -10,7 +10,7 @@ describe('ol.pointer.TouchSource', function() {
   var eventSpy;
 
   beforeEach(function() {
-    target = new _ol_events_EventTarget_();
+    target = new EventTarget();
 
     // make sure that a mouse and touch event source is used
     _ol_has_.POINTER = false;
@@ -122,7 +122,7 @@ describe('ol.pointer.TouchSource', function() {
   function simulateTouchEvent(type, changedTouches, touches) {
     touches = touches !== undefined ? touches : changedTouches;
 
-    var event = new _ol_events_Event_(type);
+    var event = new Event(type);
     _ol_obj_.assign(event, {
       touches: touches,
       changedTouches: changedTouches