diff --git a/src/ol/Overlay.js b/src/ol/Overlay.js index 8aaaae026d..46d7a12688 100644 --- a/src/ol/Overlay.js +++ b/src/ol/Overlay.js @@ -2,7 +2,7 @@ * @module ol/Overlay */ import {inherits} from './index.js'; -import _ol_MapEventType_ from './MapEventType.js'; +import MapEventType from './MapEventType.js'; import _ol_Object_ from './Object.js'; import _ol_OverlayPositioning_ from './OverlayPositioning.js'; import _ol_css_ from './css.js'; @@ -251,7 +251,7 @@ _ol_Overlay_.prototype.handleMapChanged = function() { var map = this.getMap(); if (map) { this.mapPostrenderListenerKey = _ol_events_.listen(map, - _ol_MapEventType_.POSTRENDER, this.render, this); + MapEventType.POSTRENDER, this.render, this); this.updatePixelPosition(); var container = this.stopEvent ? map.getOverlayContainerStopEvent() : map.getOverlayContainer(); diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js index 32bca55aa7..1097a7040e 100644 --- a/src/ol/PluggableMap.js +++ b/src/ol/PluggableMap.js @@ -8,7 +8,7 @@ import MapBrowserEvent from './MapBrowserEvent.js'; import MapBrowserEventHandler from './MapBrowserEventHandler.js'; import MapBrowserEventType from './MapBrowserEventType.js'; import MapEvent from './MapEvent.js'; -import _ol_MapEventType_ from './MapEventType.js'; +import MapEventType from './MapEventType.js'; import _ol_MapProperty_ from './MapProperty.js'; import _ol_Object_ from './Object.js'; import _ol_ObjectEventType_ from './ObjectEventType.js'; @@ -1254,7 +1254,7 @@ _ol_PluggableMap_.prototype.renderFrame_ = function(time) { !equals(frameState.extent, this.previousExtent_)); if (moveStart) { this.dispatchEvent( - new MapEvent(_ol_MapEventType_.MOVESTART, this, previousFrameState)); + new MapEvent(MapEventType.MOVESTART, this, previousFrameState)); this.previousExtent_ = createOrUpdateEmpty(this.previousExtent_); } } @@ -1266,13 +1266,13 @@ _ol_PluggableMap_.prototype.renderFrame_ = function(time) { if (idle) { this.dispatchEvent( - new MapEvent(_ol_MapEventType_.MOVEEND, this, frameState)); + new MapEvent(MapEventType.MOVEEND, this, frameState)); clone(frameState.extent, this.previousExtent_); } } this.dispatchEvent( - new MapEvent(_ol_MapEventType_.POSTRENDER, this, frameState)); + new MapEvent(MapEventType.POSTRENDER, this, frameState)); setTimeout(this.handlePostRender.bind(this), 0); diff --git a/src/ol/control/Control.js b/src/ol/control/Control.js index 3b9b716e37..f0f12a75cc 100644 --- a/src/ol/control/Control.js +++ b/src/ol/control/Control.js @@ -2,7 +2,7 @@ * @module ol/control/Control */ import {inherits, nullFunction} from '../index.js'; -import _ol_MapEventType_ from '../MapEventType.js'; +import MapEventType from '../MapEventType.js'; import _ol_Object_ from '../Object.js'; import {removeNode} from '../dom.js'; import _ol_events_ from '../events.js'; @@ -120,7 +120,7 @@ Control.prototype.setMap = function(map) { target.appendChild(this.element); if (this.render !== nullFunction) { this.listenerKeys.push(_ol_events_.listen(map, - _ol_MapEventType_.POSTRENDER, this.render, this)); + MapEventType.POSTRENDER, this.render, this)); } map.render(); } diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index a541ca1e94..da4e179837 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -4,7 +4,7 @@ import {inherits} from '../index.js'; import _ol_Collection_ from '../Collection.js'; import _ol_PluggableMap_ from '../PluggableMap.js'; -import _ol_MapEventType_ from '../MapEventType.js'; +import MapEventType from '../MapEventType.js'; import _ol_MapProperty_ from '../MapProperty.js'; import _ol_Object_ from '../Object.js'; import _ol_ObjectEventType_ from '../ObjectEventType.js'; @@ -504,7 +504,7 @@ OverviewMap.prototype.handleToggle_ = function() { if (!this.collapsed_ && !ovmap.isRendered()) { ovmap.updateSize(); this.resetExtent_(); - _ol_events_.listenOnce(ovmap, _ol_MapEventType_.POSTRENDER, + _ol_events_.listenOnce(ovmap, MapEventType.POSTRENDER, function(event) { this.updateBox_(); },