diff --git a/src/ol/AssertionError.js b/src/ol/AssertionError.js index 1510800b98..c74c6bb869 100644 --- a/src/ol/AssertionError.js +++ b/src/ol/AssertionError.js @@ -1,7 +1,7 @@ /** * @module ol/AssertionError */ -import {VERSION, inherits} from './index.js'; +import {VERSION, inherits} from './util.js'; /** * Error object thrown when an assertion failed. This is an ECMA-262 Error, diff --git a/src/ol/Collection.js b/src/ol/Collection.js index 8e8abff5a8..9dd5a7ff78 100644 --- a/src/ol/Collection.js +++ b/src/ol/Collection.js @@ -1,7 +1,7 @@ /** * @module ol/Collection */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import AssertionError from './AssertionError.js'; import CollectionEventType from './CollectionEventType.js'; import BaseObject from './Object.js'; diff --git a/src/ol/Feature.js b/src/ol/Feature.js index 34f386dbb6..d6d2e025a3 100644 --- a/src/ol/Feature.js +++ b/src/ol/Feature.js @@ -4,7 +4,7 @@ import {assert} from './asserts.js'; import {listen, unlisten, unlistenByKey} from './events.js'; import EventType from './events/EventType.js'; -import {inherits} from './index.js'; +import {inherits} from './util.js'; import BaseObject, {getChangeEventType} from './Object.js'; import Geometry from './geom/Geometry.js'; import Style from './style/Style.js'; diff --git a/src/ol/Geolocation.js b/src/ol/Geolocation.js index d622914290..43a1d55fd7 100644 --- a/src/ol/Geolocation.js +++ b/src/ol/Geolocation.js @@ -1,7 +1,7 @@ /** * @module ol/Geolocation */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import GeolocationProperty from './GeolocationProperty.js'; import BaseObject, {getChangeEventType} from './Object.js'; import {listen} from './events.js'; diff --git a/src/ol/Image.js b/src/ol/Image.js index 4fd1911146..bef1e6c89e 100644 --- a/src/ol/Image.js +++ b/src/ol/Image.js @@ -1,7 +1,7 @@ /** * @module ol/Image */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import ImageBase from './ImageBase.js'; import ImageState from './ImageState.js'; import {listenOnce, unlistenByKey} from './events.js'; diff --git a/src/ol/ImageBase.js b/src/ol/ImageBase.js index bb66b93f3f..a8a780d104 100644 --- a/src/ol/ImageBase.js +++ b/src/ol/ImageBase.js @@ -1,7 +1,7 @@ /** * @module ol/ImageBase */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import EventTarget from './events/EventTarget.js'; import EventType from './events/EventType.js'; diff --git a/src/ol/ImageCanvas.js b/src/ol/ImageCanvas.js index 55374de5a3..524d1fa754 100644 --- a/src/ol/ImageCanvas.js +++ b/src/ol/ImageCanvas.js @@ -1,7 +1,7 @@ /** * @module ol/ImageCanvas */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import ImageBase from './ImageBase.js'; import ImageState from './ImageState.js'; diff --git a/src/ol/ImageTile.js b/src/ol/ImageTile.js index aa7557f356..5e7d0d62db 100644 --- a/src/ol/ImageTile.js +++ b/src/ol/ImageTile.js @@ -1,7 +1,7 @@ /** * @module ol/ImageTile */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import Tile from './Tile.js'; import TileState from './TileState.js'; import {createCanvasContext2D} from './dom.js'; diff --git a/src/ol/Map.js b/src/ol/Map.js index a9b1e31f95..3fb24d0871 100644 --- a/src/ol/Map.js +++ b/src/ol/Map.js @@ -1,7 +1,7 @@ /** * @module ol/Map */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import PluggableMap from './PluggableMap.js'; import {defaults as defaultControls} from './control/util.js'; import {defaults as defaultInteractions} from './interaction.js'; diff --git a/src/ol/MapBrowserEvent.js b/src/ol/MapBrowserEvent.js index fdecce32ba..f326ceec64 100644 --- a/src/ol/MapBrowserEvent.js +++ b/src/ol/MapBrowserEvent.js @@ -1,7 +1,7 @@ /** * @module ol/MapBrowserEvent */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import MapEvent from './MapEvent.js'; /** diff --git a/src/ol/MapBrowserEventHandler.js b/src/ol/MapBrowserEventHandler.js index c4c39f040d..6718d1e556 100644 --- a/src/ol/MapBrowserEventHandler.js +++ b/src/ol/MapBrowserEventHandler.js @@ -1,7 +1,7 @@ /** * @module ol/MapBrowserEventHandler */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import {DEVICE_PIXEL_RATIO} from './has.js'; import MapBrowserEventType from './MapBrowserEventType.js'; import MapBrowserPointerEvent from './MapBrowserPointerEvent.js'; diff --git a/src/ol/MapBrowserPointerEvent.js b/src/ol/MapBrowserPointerEvent.js index 4f5aa00376..d956bd6c6a 100644 --- a/src/ol/MapBrowserPointerEvent.js +++ b/src/ol/MapBrowserPointerEvent.js @@ -1,7 +1,7 @@ /** * @module ol/MapBrowserPointerEvent */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import MapBrowserEvent from './MapBrowserEvent.js'; /** diff --git a/src/ol/MapEvent.js b/src/ol/MapEvent.js index 4ef008325c..ae02a3bc06 100644 --- a/src/ol/MapEvent.js +++ b/src/ol/MapEvent.js @@ -1,7 +1,7 @@ /** * @module ol/MapEvent */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import Event from './events/Event.js'; /** diff --git a/src/ol/Object.js b/src/ol/Object.js index 936b142342..8dc4adb4b6 100644 --- a/src/ol/Object.js +++ b/src/ol/Object.js @@ -1,7 +1,7 @@ /** * @module ol/Object */ -import {getUid, inherits} from './index.js'; +import {getUid, inherits} from './util.js'; import ObjectEventType from './ObjectEventType.js'; import Observable from './Observable.js'; import Event from './events/Event.js'; diff --git a/src/ol/Observable.js b/src/ol/Observable.js index 5b7c99c84d..a1052e3025 100644 --- a/src/ol/Observable.js +++ b/src/ol/Observable.js @@ -1,7 +1,7 @@ /** * @module ol/Observable */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import {listen, unlistenByKey, unlisten, listenOnce} from './events.js'; import EventTarget from './events/EventTarget.js'; import EventType from './events/EventType.js'; diff --git a/src/ol/Overlay.js b/src/ol/Overlay.js index e7bd570767..8b32f30e62 100644 --- a/src/ol/Overlay.js +++ b/src/ol/Overlay.js @@ -1,7 +1,7 @@ /** * @module ol/Overlay */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import MapEventType from './MapEventType.js'; import BaseObject, {getChangeEventType} from './Object.js'; import OverlayPositioning from './OverlayPositioning.js'; diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js index f8b2d8246a..c48e02aca3 100644 --- a/src/ol/PluggableMap.js +++ b/src/ol/PluggableMap.js @@ -1,7 +1,7 @@ /** * @module ol/PluggableMap */ -import {getUid, inherits} from './index.js'; +import {getUid, inherits} from './util.js'; import Collection from './Collection.js'; import CollectionEventType from './CollectionEventType.js'; import MapBrowserEvent from './MapBrowserEvent.js'; diff --git a/src/ol/Tile.js b/src/ol/Tile.js index 980cf039fd..b32f5d97cb 100644 --- a/src/ol/Tile.js +++ b/src/ol/Tile.js @@ -1,7 +1,7 @@ /** * @module ol/Tile */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import TileState from './TileState.js'; import {easeIn} from './easing.js'; import EventTarget from './events/EventTarget.js'; diff --git a/src/ol/TileCache.js b/src/ol/TileCache.js index a5ade7d6d1..3b12bbcf91 100644 --- a/src/ol/TileCache.js +++ b/src/ol/TileCache.js @@ -1,7 +1,7 @@ /** * @module ol/TileCache */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import LRUCache from './structs/LRUCache.js'; import {fromKey, getKey} from './tilecoord.js'; diff --git a/src/ol/TileQueue.js b/src/ol/TileQueue.js index 5403e1e1a0..d10dc223bf 100644 --- a/src/ol/TileQueue.js +++ b/src/ol/TileQueue.js @@ -1,7 +1,7 @@ /** * @module ol/TileQueue */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import TileState from './TileState.js'; import {listen, unlisten} from './events.js'; import EventType from './events/EventType.js'; diff --git a/src/ol/VectorImageTile.js b/src/ol/VectorImageTile.js index 2884f4d5e6..2fb5edda7a 100644 --- a/src/ol/VectorImageTile.js +++ b/src/ol/VectorImageTile.js @@ -1,7 +1,7 @@ /** * @module ol/VectorImageTile */ -import {getUid, inherits} from './index.js'; +import {getUid, inherits} from './util.js'; import Tile from './Tile.js'; import TileState from './TileState.js'; import {createCanvasContext2D} from './dom.js'; diff --git a/src/ol/VectorTile.js b/src/ol/VectorTile.js index f44d381803..15a2c09a72 100644 --- a/src/ol/VectorTile.js +++ b/src/ol/VectorTile.js @@ -1,7 +1,7 @@ /** * @module ol/VectorTile */ -import {getUid, inherits} from './index.js'; +import {getUid, inherits} from './util.js'; import Tile from './Tile.js'; import TileState from './TileState.js'; diff --git a/src/ol/View.js b/src/ol/View.js index 13a7dfeee2..d5a0242b76 100644 --- a/src/ol/View.js +++ b/src/ol/View.js @@ -2,7 +2,7 @@ * @module ol/View */ import {DEFAULT_TILE_SIZE} from './tilegrid/common.js'; -import {inherits, getUid} from './index.js'; +import {getUid, inherits} from './util.js'; import {UNDEFINED} from './functions.js'; import {createExtent, none as centerNone} from './centerconstraint.js'; import BaseObject from './Object.js'; diff --git a/src/ol/WebGLMap.js b/src/ol/WebGLMap.js index 16b109d280..b9a73c2396 100644 --- a/src/ol/WebGLMap.js +++ b/src/ol/WebGLMap.js @@ -1,7 +1,7 @@ /** * @module ol/WebGLMap */ -import {inherits} from './index.js'; +import {inherits} from './util.js'; import PluggableMap from './PluggableMap.js'; import {defaults as defaultControls} from './control.js'; import {defaults as defaultInteractions} from './interaction.js'; diff --git a/src/ol/control/Attribution.js b/src/ol/control/Attribution.js index 7d00eea388..64b7065ce8 100644 --- a/src/ol/control/Attribution.js +++ b/src/ol/control/Attribution.js @@ -1,7 +1,7 @@ /** * @module ol/control/Attribution */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {equals} from '../array.js'; import Control from '../control/Control.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_COLLAPSED} from '../css.js'; diff --git a/src/ol/control/Control.js b/src/ol/control/Control.js index 89791b506b..0d63ca7b6c 100644 --- a/src/ol/control/Control.js +++ b/src/ol/control/Control.js @@ -1,7 +1,7 @@ /** * @module ol/control/Control */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {UNDEFINED} from '../functions.js'; import MapEventType from '../MapEventType.js'; import BaseObject from '../Object.js'; diff --git a/src/ol/control/FullScreen.js b/src/ol/control/FullScreen.js index 9ed4f543d1..2a1f7b2d1b 100644 --- a/src/ol/control/FullScreen.js +++ b/src/ol/control/FullScreen.js @@ -1,7 +1,7 @@ /** * @module ol/control/FullScreen */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Control from '../control/Control.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_UNSUPPORTED} from '../css.js'; import {replaceNode} from '../dom.js'; diff --git a/src/ol/control/MousePosition.js b/src/ol/control/MousePosition.js index e2c26ce950..811d7b7170 100644 --- a/src/ol/control/MousePosition.js +++ b/src/ol/control/MousePosition.js @@ -2,7 +2,7 @@ * @module ol/control/MousePosition */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {listen} from '../events.js'; import EventType from '../events/EventType.js'; import {getChangeEventType} from '../Object.js'; diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index f77dff54d2..46878ca856 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -1,7 +1,7 @@ /** * @module ol/control/OverviewMap */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Collection from '../Collection.js'; import Map from '../Map.js'; import MapEventType from '../MapEventType.js'; diff --git a/src/ol/control/Rotate.js b/src/ol/control/Rotate.js index 8ba9063613..3ef8d413f6 100644 --- a/src/ol/control/Rotate.js +++ b/src/ol/control/Rotate.js @@ -7,7 +7,7 @@ import {CLASS_CONTROL, CLASS_HIDDEN, CLASS_UNSELECTABLE} from '../css.js'; import {easeOut} from '../easing.js'; import {listen} from '../events.js'; import EventType from '../events/EventType.js'; -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; /** diff --git a/src/ol/control/ScaleLine.js b/src/ol/control/ScaleLine.js index 629acb252d..57287dd5f7 100644 --- a/src/ol/control/ScaleLine.js +++ b/src/ol/control/ScaleLine.js @@ -1,7 +1,7 @@ /** * @module ol/control/ScaleLine */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {getChangeEventType} from '../Object.js'; import {assert} from '../asserts.js'; import Control from '../control/Control.js'; diff --git a/src/ol/control/Zoom.js b/src/ol/control/Zoom.js index 02b6b0ca83..09bb800c1c 100644 --- a/src/ol/control/Zoom.js +++ b/src/ol/control/Zoom.js @@ -1,7 +1,7 @@ /** * @module ol/control/Zoom */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {listen} from '../events.js'; import EventType from '../events/EventType.js'; import Control from '../control/Control.js'; diff --git a/src/ol/control/ZoomSlider.js b/src/ol/control/ZoomSlider.js index d56d1b10cd..567c4bd660 100644 --- a/src/ol/control/ZoomSlider.js +++ b/src/ol/control/ZoomSlider.js @@ -1,7 +1,7 @@ /** * @module ol/control/ZoomSlider */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ViewHint from '../ViewHint.js'; import Control from '../control/Control.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js'; diff --git a/src/ol/control/ZoomToExtent.js b/src/ol/control/ZoomToExtent.js index 34f0a30cf5..5007605f09 100644 --- a/src/ol/control/ZoomToExtent.js +++ b/src/ol/control/ZoomToExtent.js @@ -1,7 +1,7 @@ /** * @module ol/control/ZoomToExtent */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {listen} from '../events.js'; import EventType from '../events/EventType.js'; import Control from '../control/Control.js'; diff --git a/src/ol/events/EventTarget.js b/src/ol/events/EventTarget.js index 87703732d6..1eaae0d5a0 100644 --- a/src/ol/events/EventTarget.js +++ b/src/ol/events/EventTarget.js @@ -1,7 +1,7 @@ /** * @module ol/events/EventTarget */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Disposable from '../Disposable.js'; import {unlistenAll} from '../events.js'; import {UNDEFINED} from '../functions.js'; diff --git a/src/ol/format/EsriJSON.js b/src/ol/format/EsriJSON.js index 0f29a0919e..0ea7cd55a5 100644 --- a/src/ol/format/EsriJSON.js +++ b/src/ol/format/EsriJSON.js @@ -1,7 +1,7 @@ /** * @module ol/format/EsriJSON */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Feature from '../Feature.js'; import {assert} from '../asserts.js'; import {containsExtent} from '../extent.js'; diff --git a/src/ol/format/GML2.js b/src/ol/format/GML2.js index 171801e2bc..0cdd72c3ea 100644 --- a/src/ol/format/GML2.js +++ b/src/ol/format/GML2.js @@ -1,7 +1,7 @@ /** * @module ol/format/GML2 */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {createOrUpdate} from '../extent.js'; import {transformWithOptions} from '../format/Feature.js'; import GMLBase, {GMLNS} from '../format/GMLBase.js'; diff --git a/src/ol/format/GML3.js b/src/ol/format/GML3.js index d753c221f5..a001f4aef1 100644 --- a/src/ol/format/GML3.js +++ b/src/ol/format/GML3.js @@ -1,7 +1,7 @@ /** * @module ol/format/GML3 */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend} from '../array.js'; import {createOrUpdate} from '../extent.js'; import {transformWithOptions} from '../format/Feature.js'; diff --git a/src/ol/format/GMLBase.js b/src/ol/format/GMLBase.js index 66def16ed6..ebed2d9c00 100644 --- a/src/ol/format/GMLBase.js +++ b/src/ol/format/GMLBase.js @@ -4,7 +4,7 @@ // FIXME Envelopes should not be treated as geometries! readEnvelope_ is part // of GEOMETRY_PARSERS_ and methods using GEOMETRY_PARSERS_ do not expect // envelopes/extents, only geometries! -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend} from '../array.js'; import Feature from '../Feature.js'; import {transformWithOptions} from '../format/Feature.js'; diff --git a/src/ol/format/GPX.js b/src/ol/format/GPX.js index 3b4cdb4a85..4a405c2ab5 100644 --- a/src/ol/format/GPX.js +++ b/src/ol/format/GPX.js @@ -1,7 +1,7 @@ /** * @module ol/format/GPX */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Feature from '../Feature.js'; import {includes} from '../array.js'; import {transformWithOptions} from '../format/Feature.js'; diff --git a/src/ol/format/GeoJSON.js b/src/ol/format/GeoJSON.js index b162ed1988..dadfc2ab1e 100644 --- a/src/ol/format/GeoJSON.js +++ b/src/ol/format/GeoJSON.js @@ -4,7 +4,7 @@ // TODO: serialize dataProjection as crs member when writing // see https://github.com/openlayers/openlayers/issues/2078 -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {assert} from '../asserts.js'; import Feature from '../Feature.js'; import {transformWithOptions} from '../format/Feature.js'; diff --git a/src/ol/format/IGC.js b/src/ol/format/IGC.js index b09d8a1bca..a25404d4a3 100644 --- a/src/ol/format/IGC.js +++ b/src/ol/format/IGC.js @@ -1,7 +1,7 @@ /** * @module ol/format/IGC */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Feature from '../Feature.js'; import {transformWithOptions} from '../format/Feature.js'; import TextFeature from '../format/TextFeature.js'; diff --git a/src/ol/format/JSONFeature.js b/src/ol/format/JSONFeature.js index 1d0fb48b7d..35e1033969 100644 --- a/src/ol/format/JSONFeature.js +++ b/src/ol/format/JSONFeature.js @@ -1,7 +1,7 @@ /** * @module ol/format/JSONFeature */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import FeatureFormat from '../format/Feature.js'; import FormatType from '../format/FormatType.js'; diff --git a/src/ol/format/KML.js b/src/ol/format/KML.js index c2a70183f0..6a54cd3d75 100644 --- a/src/ol/format/KML.js +++ b/src/ol/format/KML.js @@ -1,7 +1,7 @@ /** * @module ol/format/KML */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Feature from '../Feature.js'; import {extend, includes} from '../array.js'; import {assert} from '../asserts.js'; diff --git a/src/ol/format/MVT.js b/src/ol/format/MVT.js index 057c0fb7bc..ab15c226df 100644 --- a/src/ol/format/MVT.js +++ b/src/ol/format/MVT.js @@ -3,7 +3,7 @@ */ //FIXME Implement projection handling -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {assert} from '../asserts.js'; import PBF from 'pbf'; import FeatureFormat, {transformWithOptions} from '../format/Feature.js'; diff --git a/src/ol/format/OSMXML.js b/src/ol/format/OSMXML.js index 867abfed0c..f613c53d18 100644 --- a/src/ol/format/OSMXML.js +++ b/src/ol/format/OSMXML.js @@ -2,7 +2,7 @@ * @module ol/format/OSMXML */ // FIXME add typedef for stack state objects -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend} from '../array.js'; import Feature from '../Feature.js'; import {transformWithOptions} from '../format/Feature.js'; diff --git a/src/ol/format/OWS.js b/src/ol/format/OWS.js index 66c3f76b4b..d78b893fdc 100644 --- a/src/ol/format/OWS.js +++ b/src/ol/format/OWS.js @@ -1,7 +1,7 @@ /** * @module ol/format/OWS */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {readHref} from '../format/XLink.js'; import XML from '../format/XML.js'; import {readString} from '../format/xsd.js'; diff --git a/src/ol/format/Polyline.js b/src/ol/format/Polyline.js index 4cf8884b9d..ed7267de69 100644 --- a/src/ol/format/Polyline.js +++ b/src/ol/format/Polyline.js @@ -1,7 +1,7 @@ /** * @module ol/format/Polyline */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {assert} from '../asserts.js'; import Feature from '../Feature.js'; import {transformWithOptions} from '../format/Feature.js'; diff --git a/src/ol/format/TextFeature.js b/src/ol/format/TextFeature.js index 3b674d0d07..33d6eac33d 100644 --- a/src/ol/format/TextFeature.js +++ b/src/ol/format/TextFeature.js @@ -1,7 +1,7 @@ /** * @module ol/format/TextFeature */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import FeatureFormat from '../format/Feature.js'; import FormatType from '../format/FormatType.js'; diff --git a/src/ol/format/TopoJSON.js b/src/ol/format/TopoJSON.js index 1fe14d9930..b2b761e524 100644 --- a/src/ol/format/TopoJSON.js +++ b/src/ol/format/TopoJSON.js @@ -1,7 +1,7 @@ /** * @module ol/format/TopoJSON */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Feature from '../Feature.js'; import {transformWithOptions} from '../format/Feature.js'; import JSONFeature from '../format/JSONFeature.js'; diff --git a/src/ol/format/WFS.js b/src/ol/format/WFS.js index ae45fcd966..0e6c27f86b 100644 --- a/src/ol/format/WFS.js +++ b/src/ol/format/WFS.js @@ -1,7 +1,7 @@ /** * @module ol/format/WFS */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {assert} from '../asserts.js'; import GML2 from '../format/GML2.js'; import GML3 from '../format/GML3.js'; diff --git a/src/ol/format/WKT.js b/src/ol/format/WKT.js index 9b3af1e951..be01fc0174 100644 --- a/src/ol/format/WKT.js +++ b/src/ol/format/WKT.js @@ -1,7 +1,7 @@ /** * @module ol/format/WKT */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Feature from '../Feature.js'; import {transformWithOptions} from '../format/Feature.js'; import TextFeature from '../format/TextFeature.js'; diff --git a/src/ol/format/WMSCapabilities.js b/src/ol/format/WMSCapabilities.js index d24dcaa786..59e43e9aa7 100644 --- a/src/ol/format/WMSCapabilities.js +++ b/src/ol/format/WMSCapabilities.js @@ -1,7 +1,7 @@ /** * @module ol/format/WMSCapabilities */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {readHref} from '../format/XLink.js'; import XML from '../format/XML.js'; import {readDecimalString, readString, readNonNegativeInteger, readDecimal, readBooleanString, readNonNegativeIntegerString} from '../format/xsd.js'; diff --git a/src/ol/format/WMSGetFeatureInfo.js b/src/ol/format/WMSGetFeatureInfo.js index 67efe07331..4591bbdc8a 100644 --- a/src/ol/format/WMSGetFeatureInfo.js +++ b/src/ol/format/WMSGetFeatureInfo.js @@ -1,7 +1,7 @@ /** * @module ol/format/WMSGetFeatureInfo */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend, includes} from '../array.js'; import GML2 from '../format/GML2.js'; import XMLFeature from '../format/XMLFeature.js'; diff --git a/src/ol/format/WMTSCapabilities.js b/src/ol/format/WMTSCapabilities.js index 281ddc1301..30463e93d7 100644 --- a/src/ol/format/WMTSCapabilities.js +++ b/src/ol/format/WMTSCapabilities.js @@ -1,7 +1,7 @@ /** * @module ol/format/WMTSCapabilities */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {boundingExtent} from '../extent.js'; import OWS from '../format/OWS.js'; import {readHref} from '../format/XLink.js'; diff --git a/src/ol/format/XMLFeature.js b/src/ol/format/XMLFeature.js index 0267161fd4..ec3adb5bf1 100644 --- a/src/ol/format/XMLFeature.js +++ b/src/ol/format/XMLFeature.js @@ -1,7 +1,7 @@ /** * @module ol/format/XMLFeature */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend} from '../array.js'; import FeatureFormat from '../format/Feature.js'; import FormatType from '../format/FormatType.js'; diff --git a/src/ol/format/filter/And.js b/src/ol/format/filter/And.js index b63376f638..c76a3ae80f 100644 --- a/src/ol/format/filter/And.js +++ b/src/ol/format/filter/And.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/And */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import LogicalNary from '../filter/LogicalNary.js'; /** diff --git a/src/ol/format/filter/Bbox.js b/src/ol/format/filter/Bbox.js index 44e3819f2e..b97ca862d2 100644 --- a/src/ol/format/filter/Bbox.js +++ b/src/ol/format/filter/Bbox.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/Bbox */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Filter from '../filter/Filter.js'; /** diff --git a/src/ol/format/filter/Comparison.js b/src/ol/format/filter/Comparison.js index 23c13d4f54..783a86179a 100644 --- a/src/ol/format/filter/Comparison.js +++ b/src/ol/format/filter/Comparison.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/Comparison */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Filter from '../filter/Filter.js'; /** diff --git a/src/ol/format/filter/ComparisonBinary.js b/src/ol/format/filter/ComparisonBinary.js index d7663b8521..10d34beabe 100644 --- a/src/ol/format/filter/ComparisonBinary.js +++ b/src/ol/format/filter/ComparisonBinary.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/ComparisonBinary */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Comparison from '../filter/Comparison.js'; /** diff --git a/src/ol/format/filter/Contains.js b/src/ol/format/filter/Contains.js index 48ca8ec36a..1af172a6bb 100644 --- a/src/ol/format/filter/Contains.js +++ b/src/ol/format/filter/Contains.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/Contains */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Spatial from '../filter/Spatial.js'; /** diff --git a/src/ol/format/filter/During.js b/src/ol/format/filter/During.js index dd189e9e93..588625dfbb 100644 --- a/src/ol/format/filter/During.js +++ b/src/ol/format/filter/During.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/During */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Comparison from '../filter/Comparison.js'; /** diff --git a/src/ol/format/filter/EqualTo.js b/src/ol/format/filter/EqualTo.js index 654f445b02..f56825f1f8 100644 --- a/src/ol/format/filter/EqualTo.js +++ b/src/ol/format/filter/EqualTo.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/EqualTo */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import ComparisonBinary from '../filter/ComparisonBinary.js'; /** diff --git a/src/ol/format/filter/GreaterThan.js b/src/ol/format/filter/GreaterThan.js index caebcd76be..5716001dee 100644 --- a/src/ol/format/filter/GreaterThan.js +++ b/src/ol/format/filter/GreaterThan.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/GreaterThan */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import ComparisonBinary from '../filter/ComparisonBinary.js'; /** diff --git a/src/ol/format/filter/GreaterThanOrEqualTo.js b/src/ol/format/filter/GreaterThanOrEqualTo.js index d0b0e5c48f..5e7e96f2ed 100644 --- a/src/ol/format/filter/GreaterThanOrEqualTo.js +++ b/src/ol/format/filter/GreaterThanOrEqualTo.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/GreaterThanOrEqualTo */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import ComparisonBinary from '../filter/ComparisonBinary.js'; /** diff --git a/src/ol/format/filter/Intersects.js b/src/ol/format/filter/Intersects.js index 0f2d672e1e..bcdcbf68e2 100644 --- a/src/ol/format/filter/Intersects.js +++ b/src/ol/format/filter/Intersects.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/Intersects */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Spatial from '../filter/Spatial.js'; /** diff --git a/src/ol/format/filter/IsBetween.js b/src/ol/format/filter/IsBetween.js index f4bd73850d..ac5e1a7f4b 100644 --- a/src/ol/format/filter/IsBetween.js +++ b/src/ol/format/filter/IsBetween.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/IsBetween */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Comparison from '../filter/Comparison.js'; /** diff --git a/src/ol/format/filter/IsLike.js b/src/ol/format/filter/IsLike.js index 4711386992..37d1f2466d 100644 --- a/src/ol/format/filter/IsLike.js +++ b/src/ol/format/filter/IsLike.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/IsLike */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Comparison from '../filter/Comparison.js'; /** diff --git a/src/ol/format/filter/IsNull.js b/src/ol/format/filter/IsNull.js index f63a95bda5..fad2b07c85 100644 --- a/src/ol/format/filter/IsNull.js +++ b/src/ol/format/filter/IsNull.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/IsNull */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Comparison from '../filter/Comparison.js'; /** diff --git a/src/ol/format/filter/LessThan.js b/src/ol/format/filter/LessThan.js index 0a9b9d7b43..e3f8ffc982 100644 --- a/src/ol/format/filter/LessThan.js +++ b/src/ol/format/filter/LessThan.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/LessThan */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import ComparisonBinary from '../filter/ComparisonBinary.js'; /** diff --git a/src/ol/format/filter/LessThanOrEqualTo.js b/src/ol/format/filter/LessThanOrEqualTo.js index 96989def36..2575334635 100644 --- a/src/ol/format/filter/LessThanOrEqualTo.js +++ b/src/ol/format/filter/LessThanOrEqualTo.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/LessThanOrEqualTo */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import ComparisonBinary from '../filter/ComparisonBinary.js'; /** diff --git a/src/ol/format/filter/LogicalNary.js b/src/ol/format/filter/LogicalNary.js index 719f8d1ae8..e86186756d 100644 --- a/src/ol/format/filter/LogicalNary.js +++ b/src/ol/format/filter/LogicalNary.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/LogicalNary */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {assert} from '../../asserts.js'; import Filter from '../filter/Filter.js'; diff --git a/src/ol/format/filter/Not.js b/src/ol/format/filter/Not.js index 7d2858d269..f8a37c875b 100644 --- a/src/ol/format/filter/Not.js +++ b/src/ol/format/filter/Not.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/Not */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Filter from '../filter/Filter.js'; /** diff --git a/src/ol/format/filter/NotEqualTo.js b/src/ol/format/filter/NotEqualTo.js index fbac07821a..533e570223 100644 --- a/src/ol/format/filter/NotEqualTo.js +++ b/src/ol/format/filter/NotEqualTo.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/NotEqualTo */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import ComparisonBinary from '../filter/ComparisonBinary.js'; /** diff --git a/src/ol/format/filter/Or.js b/src/ol/format/filter/Or.js index 6381081924..5267f3f5ac 100644 --- a/src/ol/format/filter/Or.js +++ b/src/ol/format/filter/Or.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/Or */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import LogicalNary from '../filter/LogicalNary.js'; /** diff --git a/src/ol/format/filter/Spatial.js b/src/ol/format/filter/Spatial.js index 13a3226cad..8e5260a819 100644 --- a/src/ol/format/filter/Spatial.js +++ b/src/ol/format/filter/Spatial.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/Spatial */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Filter from '../filter/Filter.js'; /** diff --git a/src/ol/format/filter/Within.js b/src/ol/format/filter/Within.js index 6537de2de7..e3dec4f9fb 100644 --- a/src/ol/format/filter/Within.js +++ b/src/ol/format/filter/Within.js @@ -1,7 +1,7 @@ /** * @module ol/format/filter/Within */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import Spatial from '../filter/Spatial.js'; /** diff --git a/src/ol/geom/Circle.js b/src/ol/geom/Circle.js index e861d72ca5..17d7914eb2 100644 --- a/src/ol/geom/Circle.js +++ b/src/ol/geom/Circle.js @@ -1,7 +1,7 @@ /** * @module ol/geom/Circle */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {createOrUpdate, forEachCorner, intersects} from '../extent.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryType from '../geom/GeometryType.js'; diff --git a/src/ol/geom/Geometry.js b/src/ol/geom/Geometry.js index 6f5f0b3449..9389ecc0ed 100644 --- a/src/ol/geom/Geometry.js +++ b/src/ol/geom/Geometry.js @@ -1,7 +1,7 @@ /** * @module ol/geom/Geometry */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import BaseObject from '../Object.js'; import {createEmpty, getHeight, returnOrUpdate} from '../extent.js'; import {FALSE} from '../functions.js'; diff --git a/src/ol/geom/GeometryCollection.js b/src/ol/geom/GeometryCollection.js index 942aad676a..6e4a1ee673 100644 --- a/src/ol/geom/GeometryCollection.js +++ b/src/ol/geom/GeometryCollection.js @@ -1,7 +1,7 @@ /** * @module ol/geom/GeometryCollection */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {listen, unlisten} from '../events.js'; import EventType from '../events/EventType.js'; import {createOrUpdateEmpty, closestSquaredDistanceXY, extend, getCenter} from '../extent.js'; diff --git a/src/ol/geom/LineString.js b/src/ol/geom/LineString.js index acdbe8efec..975c4bd9f0 100644 --- a/src/ol/geom/LineString.js +++ b/src/ol/geom/LineString.js @@ -1,7 +1,7 @@ /** * @module ol/geom/LineString */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend} from '../array.js'; import {closestSquaredDistanceXY} from '../extent.js'; import GeometryLayout from '../geom/GeometryLayout.js'; diff --git a/src/ol/geom/LinearRing.js b/src/ol/geom/LinearRing.js index 6c93fb662c..65ec5d4ba9 100644 --- a/src/ol/geom/LinearRing.js +++ b/src/ol/geom/LinearRing.js @@ -1,7 +1,7 @@ /** * @module ol/geom/LinearRing */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {closestSquaredDistanceXY} from '../extent.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryType from '../geom/GeometryType.js'; diff --git a/src/ol/geom/MultiLineString.js b/src/ol/geom/MultiLineString.js index 4f7d0e256e..8db64132d1 100644 --- a/src/ol/geom/MultiLineString.js +++ b/src/ol/geom/MultiLineString.js @@ -1,7 +1,7 @@ /** * @module ol/geom/MultiLineString */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend} from '../array.js'; import {closestSquaredDistanceXY} from '../extent.js'; import GeometryLayout from '../geom/GeometryLayout.js'; diff --git a/src/ol/geom/MultiPoint.js b/src/ol/geom/MultiPoint.js index 62a778710f..c69e250c31 100644 --- a/src/ol/geom/MultiPoint.js +++ b/src/ol/geom/MultiPoint.js @@ -1,7 +1,7 @@ /** * @module ol/geom/MultiPoint */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend} from '../array.js'; import {closestSquaredDistanceXY, containsXY} from '../extent.js'; import GeometryLayout from '../geom/GeometryLayout.js'; diff --git a/src/ol/geom/MultiPolygon.js b/src/ol/geom/MultiPolygon.js index aded289870..66ecda718d 100644 --- a/src/ol/geom/MultiPolygon.js +++ b/src/ol/geom/MultiPolygon.js @@ -1,7 +1,7 @@ /** * @module ol/geom/MultiPolygon */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend} from '../array.js'; import {closestSquaredDistanceXY} from '../extent.js'; import GeometryLayout from '../geom/GeometryLayout.js'; diff --git a/src/ol/geom/Point.js b/src/ol/geom/Point.js index 234be7dd01..88ac1f9907 100644 --- a/src/ol/geom/Point.js +++ b/src/ol/geom/Point.js @@ -1,7 +1,7 @@ /** * @module ol/geom/Point */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {createOrUpdateFromCoordinate, containsXY} from '../extent.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryType from '../geom/GeometryType.js'; diff --git a/src/ol/geom/Polygon.js b/src/ol/geom/Polygon.js index e8b6387d16..7833688150 100644 --- a/src/ol/geom/Polygon.js +++ b/src/ol/geom/Polygon.js @@ -1,7 +1,7 @@ /** * @module ol/geom/Polygon */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {extend} from '../array.js'; import {closestSquaredDistanceXY, getCenter} from '../extent.js'; import GeometryLayout from '../geom/GeometryLayout.js'; diff --git a/src/ol/geom/SimpleGeometry.js b/src/ol/geom/SimpleGeometry.js index a998239ca8..d8849f057e 100644 --- a/src/ol/geom/SimpleGeometry.js +++ b/src/ol/geom/SimpleGeometry.js @@ -1,7 +1,7 @@ /** * @module ol/geom/SimpleGeometry */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {FALSE} from '../functions.js'; import {createOrUpdateFromFlatCoordinates, getCenter} from '../extent.js'; import Geometry from '../geom/Geometry.js'; diff --git a/src/ol/has.js b/src/ol/has.js index fd7a2a6d28..c11852e4d5 100644 --- a/src/ol/has.js +++ b/src/ol/has.js @@ -1,7 +1,6 @@ /** * @module ol/has */ -import {HAS_WEBGL} from './index.js'; const ua = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase() : ''; @@ -90,10 +89,4 @@ export const POINTER = 'PointerEvent' in window; export const MSPOINTER = !!(navigator.msPointerEnabled); -/** - * True if both OpenLayers and browser support WebGL. - * @const - * @type {boolean} - * @api - */ -export const WEBGL = HAS_WEBGL; +export {HAS as WEBGL} from './webgl.js'; diff --git a/src/ol/index.js b/src/ol/index.js index 330e73fdf5..23ac05959f 100644 --- a/src/ol/index.js +++ b/src/ol/index.js @@ -2,8 +2,36 @@ * @module ol */ -import {getContext} from './webgl.js'; +export {default as AssertionError} from './AssertionError.js'; +export {default as Collection} from './Collection.js'; +export {default as Disposable} from './Disposable.js'; +export {default as Feature} from './Feature.js'; +export {default as Geolocation} from './Geolocation.js'; +export {default as Graticule} from './Graticule.js'; +export {default as Image} from './Image.js'; +export {default as ImageBase} from './ImageBase.js'; +export {default as ImageCanvas} from './ImageCanvas.js'; +export {default as ImageTile} from './ImageTile.js'; +export {default as Kinetic} from './Kinetic.js'; +export {default as Map} from './Map.js'; +export {default as MapBrowserEvent} from './MapBrowserEvent.js'; +export {default as MapBrowserEventHandler} from './MapBrowserEventHandler.js'; +export {default as MapBrowserPointerEvent} from './MapBrowserPointerEvent.js'; +export {default as MapEvent} from './MapEvent.js'; +export {default as Object} from './Object.js'; +export {default as Observable} from './Observable.js'; +export {default as Overlay} from './Overlay.js'; +export {default as PluggableMap} from './PluggableMap.js'; +export {default as Tile} from './Tile.js'; +export {default as TileCache} from './TileCache.js'; +export {default as TileQueue} from './TileQueue.js'; +export {default as TileRange} from './TileRange.js'; +export {default as VectorImageTile} from './VectorImageTile.js'; +export {default as VectorTile} from './VectorTile.js'; +export {default as View} from './View.js'; +export {default as WebGLMap} from './WebGLMap.js'; +export {getUid, inherits, VERSION} from './util.js'; /** * An array with two elements, representing a pixel. The first element is the @@ -11,109 +39,3 @@ import {getContext} from './webgl.js'; * @typedef {Array.} Pixel * @api */ - - -/** - * Include debuggable shader sources. Default is `true`. This should be set to - * `false` for production builds. - * TODO: move to a separate ol-webgl package - * @type {boolean} - */ -export const DEBUG_WEBGL = true; - - -/** - * TODO: move to a separate ol-webgl package - * The maximum supported WebGL texture size in pixels. If WebGL is not - * supported, the value is set to `undefined`. - * @type {number|undefined} - */ -let WEBGL_MAX_TEXTURE_SIZE; // value is set below - - -/** - * TODO: move to a separate ol-webgl package - * List of supported WebGL extensions. - * @type {Array.} - */ -let WEBGL_EXTENSIONS; // value is set below - - -/** - * TODO: move to a separate ol-webgl package - * WebGL is available. - * @type {boolean} - */ -let HAS_WEBGL = false; - - -if (typeof window !== 'undefined' && 'WebGLRenderingContext' in window) { - try { - const canvas = /** @type {HTMLCanvasElement} */ (document.createElement('CANVAS')); - const gl = getContext(canvas, {failIfMajorPerformanceCaveat: true}); - if (gl) { - HAS_WEBGL = true; - WEBGL_MAX_TEXTURE_SIZE = /** @type {number} */ (gl.getParameter(gl.MAX_TEXTURE_SIZE)); - WEBGL_EXTENSIONS = gl.getSupportedExtensions(); - } - } catch (e) { - // pass - } -} - -export {HAS_WEBGL, WEBGL_MAX_TEXTURE_SIZE, WEBGL_EXTENSIONS}; - - -/** - * OpenLayers version. - * @type {string} - */ -export const VERSION = '5.0.0-beta.14'; - - -/** - * Inherit the prototype methods from one constructor into another. - * - * Usage: - * - * function ParentClass(a, b) { } - * ParentClass.prototype.foo = function(a) { } - * - * function ChildClass(a, b, c) { - * // Call parent constructor - * ParentClass.call(this, a, b); - * } - * inherits(ChildClass, ParentClass); - * - * var child = new ChildClass('a', 'b', 'see'); - * child.foo(); // This works. - * - * @param {!Function} childCtor Child constructor. - * @param {!Function} parentCtor Parent constructor. - * @function - * @api - */ -export function inherits(childCtor, parentCtor) { - childCtor.prototype = Object.create(parentCtor.prototype); - childCtor.prototype.constructor = childCtor; -} - - -/** - * Counter for getUid. - * @type {number} - * @private - */ -let uidCounter_ = 0; - -/** - * Gets a unique ID for an object. This mutates the object so that further calls - * with the same object as a parameter returns the same value. Unique IDs are generated - * as a strictly increasing sequence. Adapted from goog.getUid. - * - * @param {Object} obj The object to get the unique ID for. - * @return {number} The unique ID for the object. - */ -export function getUid(obj) { - return obj.ol_uid || (obj.ol_uid = ++uidCounter_); -} diff --git a/src/ol/interaction/DoubleClickZoom.js b/src/ol/interaction/DoubleClickZoom.js index 8b8a90a1dd..ef663c97d3 100644 --- a/src/ol/interaction/DoubleClickZoom.js +++ b/src/ol/interaction/DoubleClickZoom.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/DoubleClickZoom */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import MapBrowserEventType from '../MapBrowserEventType.js'; import Interaction, {zoomByDelta} from '../interaction/Interaction.js'; diff --git a/src/ol/interaction/DragAndDrop.js b/src/ol/interaction/DragAndDrop.js index 49a5c88e53..42db71deb2 100644 --- a/src/ol/interaction/DragAndDrop.js +++ b/src/ol/interaction/DragAndDrop.js @@ -3,7 +3,7 @@ */ // FIXME should handle all geo-referenced data, not just vector data -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {TRUE} from '../functions.js'; import {listen, unlistenByKey} from '../events.js'; import Event from '../events/Event.js'; diff --git a/src/ol/interaction/DragBox.js b/src/ol/interaction/DragBox.js index 75916deeb5..e5f38f5e32 100644 --- a/src/ol/interaction/DragBox.js +++ b/src/ol/interaction/DragBox.js @@ -3,7 +3,7 @@ */ // FIXME draw drag box import Event from '../events/Event.js'; -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {always, mouseOnly, mouseActionButton} from '../events/condition.js'; import {UNDEFINED} from '../functions.js'; import PointerInteraction from '../interaction/Pointer.js'; diff --git a/src/ol/interaction/DragPan.js b/src/ol/interaction/DragPan.js index b2bb30bc16..b39f8e7e35 100644 --- a/src/ol/interaction/DragPan.js +++ b/src/ol/interaction/DragPan.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/DragPan */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ViewHint from '../ViewHint.js'; import {scale as scaleCoordinate, rotate as rotateCoordinate, add as addCoordinate} from '../coordinate.js'; import {easeOut} from '../easing.js'; diff --git a/src/ol/interaction/DragRotate.js b/src/ol/interaction/DragRotate.js index 1c7d066588..71104ed096 100644 --- a/src/ol/interaction/DragRotate.js +++ b/src/ol/interaction/DragRotate.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/DragRotate */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {disable} from '../rotationconstraint.js'; import ViewHint from '../ViewHint.js'; import {altShiftKeysOnly, mouseOnly, mouseActionButton} from '../events/condition.js'; diff --git a/src/ol/interaction/DragRotateAndZoom.js b/src/ol/interaction/DragRotateAndZoom.js index a108d8bff7..79615db556 100644 --- a/src/ol/interaction/DragRotateAndZoom.js +++ b/src/ol/interaction/DragRotateAndZoom.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/DragRotateAndZoom */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {disable} from '../rotationconstraint.js'; import ViewHint from '../ViewHint.js'; import {shiftKeyOnly, mouseOnly} from '../events/condition.js'; diff --git a/src/ol/interaction/DragZoom.js b/src/ol/interaction/DragZoom.js index af8cccdddb..eb7e312b93 100644 --- a/src/ol/interaction/DragZoom.js +++ b/src/ol/interaction/DragZoom.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/DragZoom */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {easeOut} from '../easing.js'; import {shiftKeyOnly} from '../events/condition.js'; import {createOrUpdateFromCoordinates, getBottomLeft, getCenter, getTopRight, scaleFromCenter} from '../extent.js'; diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index 37f702373f..3400ba3171 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/Draw */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import EventType from '../events/EventType.js'; import Feature from '../Feature.js'; import MapBrowserEventType from '../MapBrowserEventType.js'; diff --git a/src/ol/interaction/Extent.js b/src/ol/interaction/Extent.js index febef3dc8f..3520decb0e 100644 --- a/src/ol/interaction/Extent.js +++ b/src/ol/interaction/Extent.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/Extent */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Feature from '../Feature.js'; import MapBrowserEventType from '../MapBrowserEventType.js'; import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js'; diff --git a/src/ol/interaction/Interaction.js b/src/ol/interaction/Interaction.js index 7b27d0ee75..df61855b82 100644 --- a/src/ol/interaction/Interaction.js +++ b/src/ol/interaction/Interaction.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/Interaction */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import BaseObject from '../Object.js'; import {easeOut, linear} from '../easing.js'; import InteractionProperty from '../interaction/Property.js'; diff --git a/src/ol/interaction/KeyboardPan.js b/src/ol/interaction/KeyboardPan.js index 21dc210d65..87cab8384c 100644 --- a/src/ol/interaction/KeyboardPan.js +++ b/src/ol/interaction/KeyboardPan.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/KeyboardPan */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {rotate as rotateCoordinate} from '../coordinate.js'; import EventType from '../events/EventType.js'; import KeyCode from '../events/KeyCode.js'; diff --git a/src/ol/interaction/KeyboardZoom.js b/src/ol/interaction/KeyboardZoom.js index 58a06e8d37..4741ca5c37 100644 --- a/src/ol/interaction/KeyboardZoom.js +++ b/src/ol/interaction/KeyboardZoom.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/KeyboardZoom */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import EventType from '../events/EventType.js'; import {targetNotEditable} from '../events/condition.js'; import Interaction, {zoomByDelta} from '../interaction/Interaction.js'; diff --git a/src/ol/interaction/Modify.js b/src/ol/interaction/Modify.js index ee8fb21f03..f1d2f8d005 100644 --- a/src/ol/interaction/Modify.js +++ b/src/ol/interaction/Modify.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/Modify */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import Collection from '../Collection.js'; import CollectionEventType from '../CollectionEventType.js'; import Feature from '../Feature.js'; diff --git a/src/ol/interaction/MouseWheelZoom.js b/src/ol/interaction/MouseWheelZoom.js index 4027b3b9e8..d22e004721 100644 --- a/src/ol/interaction/MouseWheelZoom.js +++ b/src/ol/interaction/MouseWheelZoom.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/MouseWheelZoom */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ViewHint from '../ViewHint.js'; import {always} from '../events/condition.js'; import {easeOut} from '../easing.js'; diff --git a/src/ol/interaction/PinchRotate.js b/src/ol/interaction/PinchRotate.js index 096762f9c4..d882f3383a 100644 --- a/src/ol/interaction/PinchRotate.js +++ b/src/ol/interaction/PinchRotate.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/PinchRotate */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ViewHint from '../ViewHint.js'; import {FALSE} from '../functions.js'; import {rotate, rotateWithoutConstraints} from '../interaction/Interaction.js'; diff --git a/src/ol/interaction/PinchZoom.js b/src/ol/interaction/PinchZoom.js index 573a267293..639bca1de9 100644 --- a/src/ol/interaction/PinchZoom.js +++ b/src/ol/interaction/PinchZoom.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/PinchZoom */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ViewHint from '../ViewHint.js'; import {FALSE} from '../functions.js'; import {zoom, zoomWithoutConstraints} from '../interaction/Interaction.js'; diff --git a/src/ol/interaction/Pointer.js b/src/ol/interaction/Pointer.js index 6560f1687e..c0a2f4df51 100644 --- a/src/ol/interaction/Pointer.js +++ b/src/ol/interaction/Pointer.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/Pointer */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {FALSE, UNDEFINED} from '../functions.js'; import MapBrowserEventType from '../MapBrowserEventType.js'; import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js'; diff --git a/src/ol/interaction/Select.js b/src/ol/interaction/Select.js index 5e46ec5f8a..d42403da7d 100644 --- a/src/ol/interaction/Select.js +++ b/src/ol/interaction/Select.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/Select */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import CollectionEventType from '../CollectionEventType.js'; import {extend, includes} from '../array.js'; import {listen} from '../events.js'; diff --git a/src/ol/interaction/Snap.js b/src/ol/interaction/Snap.js index 2b9ec9a9ba..f8eff9024d 100644 --- a/src/ol/interaction/Snap.js +++ b/src/ol/interaction/Snap.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/Snap */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import {CollectionEvent} from '../Collection.js'; import CollectionEventType from '../CollectionEventType.js'; import {distance as coordinateDistance, squaredDistance as squaredCoordinateDistance, closestOnCircle, closestOnSegment, squaredDistanceToSegment} from '../coordinate.js'; diff --git a/src/ol/interaction/Translate.js b/src/ol/interaction/Translate.js index 0504bc590b..2e0c71a09f 100644 --- a/src/ol/interaction/Translate.js +++ b/src/ol/interaction/Translate.js @@ -1,7 +1,7 @@ /** * @module ol/interaction/Translate */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Collection from '../Collection.js'; import {getChangeEventType} from '../Object.js'; import {listen} from '../events.js'; diff --git a/src/ol/layer/Base.js b/src/ol/layer/Base.js index f48bd698f5..71c414b432 100644 --- a/src/ol/layer/Base.js +++ b/src/ol/layer/Base.js @@ -1,7 +1,7 @@ /** * @module ol/layer/Base */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import BaseObject from '../Object.js'; import LayerProperty from '../layer/Property.js'; import {clamp} from '../math.js'; diff --git a/src/ol/layer/Group.js b/src/ol/layer/Group.js index 392c0652b8..bb39810349 100644 --- a/src/ol/layer/Group.js +++ b/src/ol/layer/Group.js @@ -1,7 +1,7 @@ /** * @module ol/layer/Group */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import Collection from '../Collection.js'; import CollectionEventType from '../CollectionEventType.js'; import {getChangeEventType} from '../Object.js'; diff --git a/src/ol/layer/Heatmap.js b/src/ol/layer/Heatmap.js index 8abc57f9d2..d245320d26 100644 --- a/src/ol/layer/Heatmap.js +++ b/src/ol/layer/Heatmap.js @@ -2,7 +2,7 @@ * @module ol/layer/Heatmap */ import {listen} from '../events.js'; -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {getChangeEventType} from '../Object.js'; import {createCanvasContext2D} from '../dom.js'; import VectorLayer from '../layer/Vector.js'; diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js index 04742c5a5b..6f67096260 100644 --- a/src/ol/layer/Image.js +++ b/src/ol/layer/Image.js @@ -1,7 +1,7 @@ /** * @module ol/layer/Image */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import LayerType from '../LayerType.js'; import Layer from '../layer/Layer.js'; diff --git a/src/ol/layer/Layer.js b/src/ol/layer/Layer.js index 22dba72354..8654a63550 100644 --- a/src/ol/layer/Layer.js +++ b/src/ol/layer/Layer.js @@ -3,7 +3,7 @@ */ import {listen, unlistenByKey} from '../events.js'; import EventType from '../events/EventType.js'; -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import {getChangeEventType} from '../Object.js'; import BaseLayer from '../layer/Base.js'; import LayerProperty from '../layer/Property.js'; diff --git a/src/ol/layer/Tile.js b/src/ol/layer/Tile.js index 9a293be109..fa0529039f 100644 --- a/src/ol/layer/Tile.js +++ b/src/ol/layer/Tile.js @@ -1,7 +1,7 @@ /** * @module ol/layer/Tile */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import LayerType from '../LayerType.js'; import Layer from '../layer/Layer.js'; import TileProperty from '../layer/TileProperty.js'; diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js index acc1fbf414..7d1d56c304 100644 --- a/src/ol/layer/Vector.js +++ b/src/ol/layer/Vector.js @@ -1,7 +1,7 @@ /** * @module ol/layer/Vector */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import LayerType from '../LayerType.js'; import Layer from '../layer/Layer.js'; import VectorRenderType from '../layer/VectorRenderType.js'; diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js index 73ed78813d..265435afec 100644 --- a/src/ol/layer/VectorTile.js +++ b/src/ol/layer/VectorTile.js @@ -1,7 +1,7 @@ /** * @module ol/layer/VectorTile */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import LayerType from '../LayerType.js'; import {assert} from '../asserts.js'; import TileProperty from '../layer/TileProperty.js'; diff --git a/src/ol/net.js b/src/ol/net.js index e7aac3b9d9..753834aefa 100644 --- a/src/ol/net.js +++ b/src/ol/net.js @@ -1,7 +1,7 @@ /** * @module ol/net */ -import {getUid} from './index.js'; +import {getUid} from './util.js'; /** diff --git a/src/ol/pointer/MouseSource.js b/src/ol/pointer/MouseSource.js index 7703b473f8..8db1313423 100644 --- a/src/ol/pointer/MouseSource.js +++ b/src/ol/pointer/MouseSource.js @@ -31,7 +31,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import EventSource from '../pointer/EventSource.js'; /** diff --git a/src/ol/pointer/MsSource.js b/src/ol/pointer/MsSource.js index 09f4a941d0..a8ad9d64e2 100644 --- a/src/ol/pointer/MsSource.js +++ b/src/ol/pointer/MsSource.js @@ -31,7 +31,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import EventSource from '../pointer/EventSource.js'; /** diff --git a/src/ol/pointer/NativeSource.js b/src/ol/pointer/NativeSource.js index e974c4e866..a745900ba0 100644 --- a/src/ol/pointer/NativeSource.js +++ b/src/ol/pointer/NativeSource.js @@ -31,7 +31,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import EventSource from '../pointer/EventSource.js'; /** diff --git a/src/ol/pointer/PointerEvent.js b/src/ol/pointer/PointerEvent.js index 2f03a3a5f7..079cfc1e40 100644 --- a/src/ol/pointer/PointerEvent.js +++ b/src/ol/pointer/PointerEvent.js @@ -31,7 +31,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Event from '../events/Event.js'; /** diff --git a/src/ol/pointer/PointerEventHandler.js b/src/ol/pointer/PointerEventHandler.js index 588d168e8e..ffa139d290 100644 --- a/src/ol/pointer/PointerEventHandler.js +++ b/src/ol/pointer/PointerEventHandler.js @@ -31,7 +31,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {listen, unlisten} from '../events.js'; import EventTarget from '../events/EventTarget.js'; import {POINTER, MSPOINTER, TOUCH} from '../has.js'; diff --git a/src/ol/pointer/TouchSource.js b/src/ol/pointer/TouchSource.js index ae9919e654..8615e1242c 100644 --- a/src/ol/pointer/TouchSource.js +++ b/src/ol/pointer/TouchSource.js @@ -31,7 +31,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {remove} from '../array.js'; import EventSource from '../pointer/EventSource.js'; import {POINTER_ID} from '../pointer/MouseSource.js'; diff --git a/src/ol/proj/epsg3857.js b/src/ol/proj/epsg3857.js index d66f0aa017..f47d4e8ba7 100644 --- a/src/ol/proj/epsg3857.js +++ b/src/ol/proj/epsg3857.js @@ -1,7 +1,7 @@ /** * @module ol/proj/epsg3857 */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {cosh} from '../math.js'; import Projection from '../proj/Projection.js'; import Units from '../proj/Units.js'; diff --git a/src/ol/proj/epsg4326.js b/src/ol/proj/epsg4326.js index 76b47a1488..2f7ea2a80c 100644 --- a/src/ol/proj/epsg4326.js +++ b/src/ol/proj/epsg4326.js @@ -1,7 +1,7 @@ /** * @module ol/proj/epsg4326 */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Projection from '../proj/Projection.js'; import Units from '../proj/Units.js'; diff --git a/src/ol/render/Box.js b/src/ol/render/Box.js index f83e736163..31f0811328 100644 --- a/src/ol/render/Box.js +++ b/src/ol/render/Box.js @@ -3,7 +3,7 @@ */ // FIXME add rotation -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Disposable from '../Disposable.js'; import Polygon from '../geom/Polygon.js'; diff --git a/src/ol/render/Event.js b/src/ol/render/Event.js index 77c3b81342..bd64e18c58 100644 --- a/src/ol/render/Event.js +++ b/src/ol/render/Event.js @@ -1,7 +1,7 @@ /** * @module ol/render/Event */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Event from '../events/Event.js'; /** diff --git a/src/ol/render/canvas/ImageReplay.js b/src/ol/render/canvas/ImageReplay.js index 78fd42b3be..27f5b80f9c 100644 --- a/src/ol/render/canvas/ImageReplay.js +++ b/src/ol/render/canvas/ImageReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/canvas/ImageReplay */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import CanvasInstruction from '../canvas/Instruction.js'; import CanvasReplay from '../canvas/Replay.js'; diff --git a/src/ol/render/canvas/Immediate.js b/src/ol/render/canvas/Immediate.js index d0af2ea3a1..c3e3b94782 100644 --- a/src/ol/render/canvas/Immediate.js +++ b/src/ol/render/canvas/Immediate.js @@ -5,7 +5,7 @@ // FIXME need to handle large thick features (where pixel size matters) // FIXME add offset and end to ol/geom/flat/transform~transform2D? -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {equals} from '../../array.js'; import {asColorLike} from '../../colorlike.js'; import {intersects} from '../../extent.js'; diff --git a/src/ol/render/canvas/LineStringReplay.js b/src/ol/render/canvas/LineStringReplay.js index f0d78b575d..c68da1b111 100644 --- a/src/ol/render/canvas/LineStringReplay.js +++ b/src/ol/render/canvas/LineStringReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/canvas/LineStringReplay */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import CanvasInstruction, {strokeInstruction, beginPathInstruction} from '../canvas/Instruction.js'; import CanvasReplay from '../canvas/Replay.js'; diff --git a/src/ol/render/canvas/PolygonReplay.js b/src/ol/render/canvas/PolygonReplay.js index 3c0d5626d5..c758621ee4 100644 --- a/src/ol/render/canvas/PolygonReplay.js +++ b/src/ol/render/canvas/PolygonReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/canvas/PolygonReplay */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {asString} from '../../color.js'; import {snap} from '../../geom/flat/simplify.js'; import {defaultFillStyle} from '../canvas.js'; diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js index ec6dbc6523..e252521dd4 100644 --- a/src/ol/render/canvas/Replay.js +++ b/src/ol/render/canvas/Replay.js @@ -1,7 +1,7 @@ /** * @module ol/render/canvas/Replay */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import {UNDEFINED} from '../../functions.js'; import {equals, reverseSubArray} from '../../array.js'; import {asColorLike} from '../../colorlike.js'; diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/ReplayGroup.js index a06e341582..2096b6d6c5 100644 --- a/src/ol/render/canvas/ReplayGroup.js +++ b/src/ol/render/canvas/ReplayGroup.js @@ -1,7 +1,7 @@ /** * @module ol/render/canvas/ReplayGroup */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {numberSafeCompareFunction} from '../../array.js'; import {createCanvasContext2D} from '../../dom.js'; import {buffer, createEmpty, extendCoordinate} from '../../extent.js'; diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextReplay.js index 3e63709b6d..f398b7d196 100644 --- a/src/ol/render/canvas/TextReplay.js +++ b/src/ol/render/canvas/TextReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/canvas/TextReplay */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import {asColorLike} from '../../colorlike.js'; import {createCanvasContext2D} from '../../dom.js'; import {intersects} from '../../extent.js'; diff --git a/src/ol/render/webgl/CircleReplay.js b/src/ol/render/webgl/CircleReplay.js index e9a708b153..2be78ff8e4 100644 --- a/src/ol/render/webgl/CircleReplay.js +++ b/src/ol/render/webgl/CircleReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/webgl/CircleReplay */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import {equals} from '../../array.js'; import {asArray} from '../../color.js'; import {intersects} from '../../extent.js'; diff --git a/src/ol/render/webgl/ImageReplay.js b/src/ol/render/webgl/ImageReplay.js index 91e26a94ea..111454549c 100644 --- a/src/ol/render/webgl/ImageReplay.js +++ b/src/ol/render/webgl/ImageReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/webgl/ImageReplay */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import WebGLTextureReplay from '../webgl/TextureReplay.js'; import WebGLBuffer from '../../webgl/Buffer.js'; diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js index 24cf41c001..c50614b697 100644 --- a/src/ol/render/webgl/Immediate.js +++ b/src/ol/render/webgl/Immediate.js @@ -1,7 +1,7 @@ /** * @module ol/render/webgl/Immediate */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {intersects} from '../../extent.js'; import GeometryType from '../../geom/GeometryType.js'; import ReplayType from '../ReplayType.js'; diff --git a/src/ol/render/webgl/LineStringReplay.js b/src/ol/render/webgl/LineStringReplay.js index 139af5d95b..c5932a5baf 100644 --- a/src/ol/render/webgl/LineStringReplay.js +++ b/src/ol/render/webgl/LineStringReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/webgl/LineStringReplay */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import {equals} from '../../array.js'; import {asArray} from '../../color.js'; import {intersects} from '../../extent.js'; diff --git a/src/ol/render/webgl/PolygonReplay.js b/src/ol/render/webgl/PolygonReplay.js index 25db69a264..580363bd88 100644 --- a/src/ol/render/webgl/PolygonReplay.js +++ b/src/ol/render/webgl/PolygonReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/webgl/PolygonReplay */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import {equals} from '../../array.js'; import {asArray} from '../../color.js'; import {intersects} from '../../extent.js'; diff --git a/src/ol/render/webgl/Replay.js b/src/ol/render/webgl/Replay.js index 2c6282fb28..339b8eeefe 100644 --- a/src/ol/render/webgl/Replay.js +++ b/src/ol/render/webgl/Replay.js @@ -1,7 +1,7 @@ /** * @module ol/render/webgl/Replay */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {getCenter} from '../../extent.js'; import VectorContext from '../VectorContext.js'; import { diff --git a/src/ol/render/webgl/ReplayGroup.js b/src/ol/render/webgl/ReplayGroup.js index 7a162080fa..1589f03193 100644 --- a/src/ol/render/webgl/ReplayGroup.js +++ b/src/ol/render/webgl/ReplayGroup.js @@ -1,7 +1,7 @@ /** * @module ol/render/webgl/ReplayGroup */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {numberSafeCompareFunction} from '../../array.js'; import {buffer, createOrUpdateFromCoordinate} from '../../extent.js'; import {isEmpty} from '../../obj.js'; diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js index ce9bff1378..13094b9946 100644 --- a/src/ol/render/webgl/TextReplay.js +++ b/src/ol/render/webgl/TextReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/webgl/TextReplay */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import {asColorLike} from '../../colorlike.js'; import {createCanvasContext2D} from '../../dom.js'; import GeometryType from '../../geom/GeometryType.js'; diff --git a/src/ol/render/webgl/TextureReplay.js b/src/ol/render/webgl/TextureReplay.js index 3f2b0009eb..c98812d1fc 100644 --- a/src/ol/render/webgl/TextureReplay.js +++ b/src/ol/render/webgl/TextureReplay.js @@ -1,7 +1,7 @@ /** * @module ol/render/webgl/TextureReplay */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import {intersects} from '../../extent.js'; import {isEmpty} from '../../obj.js'; import {fragment, vertex} from '../webgl/texturereplay/defaultshader.js'; diff --git a/src/ol/render/webgl/circlereplay/defaultshader.js b/src/ol/render/webgl/circlereplay/defaultshader.js index 6e1cf97d5f..1fabb9f7b0 100644 --- a/src/ol/render/webgl/circlereplay/defaultshader.js +++ b/src/ol/render/webgl/circlereplay/defaultshader.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit. // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../webgl.js'; import WebGLFragment from '../../../webgl/Fragment.js'; import WebGLVertex from '../../../webgl/Vertex.js'; diff --git a/src/ol/render/webgl/circlereplay/defaultshader/Locations.js b/src/ol/render/webgl/circlereplay/defaultshader/Locations.js index 3e1ee02d66..dd87ac0ceb 100644 --- a/src/ol/render/webgl/circlereplay/defaultshader/Locations.js +++ b/src/ol/render/webgl/circlereplay/defaultshader/Locations.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../../webgl.js'; /** * @constructor diff --git a/src/ol/render/webgl/linestringreplay/defaultshader.js b/src/ol/render/webgl/linestringreplay/defaultshader.js index b0de052e5a..c7ab2d1ddf 100644 --- a/src/ol/render/webgl/linestringreplay/defaultshader.js +++ b/src/ol/render/webgl/linestringreplay/defaultshader.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit. // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../webgl.js'; import WebGLFragment from '../../../webgl/Fragment.js'; import WebGLVertex from '../../../webgl/Vertex.js'; diff --git a/src/ol/render/webgl/linestringreplay/defaultshader/Locations.js b/src/ol/render/webgl/linestringreplay/defaultshader/Locations.js index e29d4783e0..cbe7a09dff 100644 --- a/src/ol/render/webgl/linestringreplay/defaultshader/Locations.js +++ b/src/ol/render/webgl/linestringreplay/defaultshader/Locations.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../../webgl.js'; /** * @constructor diff --git a/src/ol/render/webgl/polygonreplay/defaultshader.js b/src/ol/render/webgl/polygonreplay/defaultshader.js index 6d36aef720..b9a955aeb5 100644 --- a/src/ol/render/webgl/polygonreplay/defaultshader.js +++ b/src/ol/render/webgl/polygonreplay/defaultshader.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit. // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../webgl.js'; import WebGLFragment from '../../../webgl/Fragment.js'; import WebGLVertex from '../../../webgl/Vertex.js'; diff --git a/src/ol/render/webgl/polygonreplay/defaultshader/Locations.js b/src/ol/render/webgl/polygonreplay/defaultshader/Locations.js index c62e58c5fb..f2abb411f4 100644 --- a/src/ol/render/webgl/polygonreplay/defaultshader/Locations.js +++ b/src/ol/render/webgl/polygonreplay/defaultshader/Locations.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../../webgl.js'; /** * @constructor diff --git a/src/ol/render/webgl/texturereplay/defaultshader.js b/src/ol/render/webgl/texturereplay/defaultshader.js index e439eed48a..96c5a8a96a 100644 --- a/src/ol/render/webgl/texturereplay/defaultshader.js +++ b/src/ol/render/webgl/texturereplay/defaultshader.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit. // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../webgl.js'; import WebGLFragment from '../../../webgl/Fragment.js'; import WebGLVertex from '../../../webgl/Vertex.js'; diff --git a/src/ol/render/webgl/texturereplay/defaultshader/Locations.js b/src/ol/render/webgl/texturereplay/defaultshader/Locations.js index 48ce0bf31f..1d5bdddac8 100644 --- a/src/ol/render/webgl/texturereplay/defaultshader/Locations.js +++ b/src/ol/render/webgl/texturereplay/defaultshader/Locations.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../../webgl.js'; /** * @constructor diff --git a/src/ol/renderer/Layer.js b/src/ol/renderer/Layer.js index cb21971f2d..5e23741585 100644 --- a/src/ol/renderer/Layer.js +++ b/src/ol/renderer/Layer.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/Layer */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import ImageState from '../ImageState.js'; import Observable from '../Observable.js'; import TileState from '../TileState.js'; diff --git a/src/ol/renderer/Map.js b/src/ol/renderer/Map.js index 5c8f99e405..530c910476 100644 --- a/src/ol/renderer/Map.js +++ b/src/ol/renderer/Map.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/Map */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import Disposable from '../Disposable.js'; import {listen, unlistenByKey} from '../events.js'; import EventType from '../events/EventType.js'; diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index 1100fc22d5..a9f4b414b6 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -2,7 +2,7 @@ * @module ol/renderer/canvas/ImageLayer */ import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import ImageCanvas from '../../ImageCanvas.js'; import LayerType from '../../LayerType.js'; import ViewHint from '../../ViewHint.js'; diff --git a/src/ol/renderer/canvas/IntermediateCanvas.js b/src/ol/renderer/canvas/IntermediateCanvas.js index 42047c9e50..adf64c6bf3 100644 --- a/src/ol/renderer/canvas/IntermediateCanvas.js +++ b/src/ol/renderer/canvas/IntermediateCanvas.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/canvas/IntermediateCanvas */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {scale as scaleCoordinate} from '../../coordinate.js'; import {createCanvasContext2D} from '../../dom.js'; import {containsExtent, intersects} from '../../extent.js'; diff --git a/src/ol/renderer/canvas/Layer.js b/src/ol/renderer/canvas/Layer.js index 84be6decd2..5decbcd76e 100644 --- a/src/ol/renderer/canvas/Layer.js +++ b/src/ol/renderer/canvas/Layer.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/canvas/Layer */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../../extent.js'; import {TRUE} from '../../functions.js'; import RenderEvent from '../../render/Event.js'; diff --git a/src/ol/renderer/canvas/Map.js b/src/ol/renderer/canvas/Map.js index 4d96e1c97c..83c947288b 100644 --- a/src/ol/renderer/canvas/Map.js +++ b/src/ol/renderer/canvas/Map.js @@ -2,7 +2,7 @@ * @module ol/renderer/canvas/Map */ import {create as createTransform, apply as applyTransform, compose as composeTransform} from '../../transform.js'; -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {includes, stableSort} from '../../array.js'; import {CLASS_UNSELECTABLE} from '../../css.js'; import {createCanvasContext2D} from '../../dom.js'; diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index 9f1c5f8916..68d6423880 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/canvas/TileLayer */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import LayerType from '../../LayerType.js'; import TileRange from '../../TileRange.js'; import TileState from '../../TileState.js'; diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 97162bb004..8ca5e7874f 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/canvas/VectorLayer */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import LayerType from '../../LayerType.js'; import ViewHint from '../../ViewHint.js'; import {createCanvasContext2D} from '../../dom.js'; diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index 0ec433cdc9..4c0455d568 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/canvas/VectorTileLayer */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import LayerType from '../../LayerType.js'; import TileState from '../../TileState.js'; import {createCanvasContext2D} from '../../dom.js'; diff --git a/src/ol/renderer/vector.js b/src/ol/renderer/vector.js index 8600c69cb9..de3ca3b9cd 100644 --- a/src/ol/renderer/vector.js +++ b/src/ol/renderer/vector.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/vector */ -import {getUid} from '../index.js'; +import {getUid} from '../util.js'; import ImageState from '../ImageState.js'; import GeometryType from '../geom/GeometryType.js'; import ReplayType from '../render/ReplayType.js'; diff --git a/src/ol/renderer/webgl/ImageLayer.js b/src/ol/renderer/webgl/ImageLayer.js index 6616a3a349..68bd42b483 100644 --- a/src/ol/renderer/webgl/ImageLayer.js +++ b/src/ol/renderer/webgl/ImageLayer.js @@ -2,7 +2,7 @@ * @module ol/renderer/webgl/ImageLayer */ import {ENABLE_RASTER_REPROJECTION} from '../../reproj/common.js'; -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {TRUE, UNDEFINED} from '../../functions.js'; import LayerType from '../../LayerType.js'; import ViewHint from '../../ViewHint.js'; diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js index 8a822879c0..6f15a1779e 100644 --- a/src/ol/renderer/webgl/Layer.js +++ b/src/ol/renderer/webgl/Layer.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/webgl/Layer */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import RenderEvent from '../../render/Event.js'; import RenderEventType from '../../render/EventType.js'; import WebGLImmediateRenderer from '../../render/webgl/Immediate.js'; diff --git a/src/ol/renderer/webgl/Map.js b/src/ol/renderer/webgl/Map.js index f838006e7f..1e3e668d37 100644 --- a/src/ol/renderer/webgl/Map.js +++ b/src/ol/renderer/webgl/Map.js @@ -2,7 +2,7 @@ * @module ol/renderer/webgl/Map */ -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import {stableSort} from '../../array.js'; import {CLASS_UNSELECTABLE} from '../../css.js'; import {createCanvasContext2D} from '../../dom.js'; diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index 99abeed883..265408e816 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -4,7 +4,7 @@ // FIXME large resolutions lead to too large framebuffers :-( // FIXME animated shaders! check in redraw -import {inherits} from '../../index.js'; +import {inherits} from '../../util.js'; import LayerType from '../../LayerType.js'; import TileRange from '../../TileRange.js'; import TileState from '../../TileState.js'; diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js index bd654d6b29..bf4a5d2476 100644 --- a/src/ol/renderer/webgl/VectorLayer.js +++ b/src/ol/renderer/webgl/VectorLayer.js @@ -1,7 +1,7 @@ /** * @module ol/renderer/webgl/VectorLayer */ -import {getUid, inherits} from '../../index.js'; +import {getUid, inherits} from '../../util.js'; import LayerType from '../../LayerType.js'; import ViewHint from '../../ViewHint.js'; import {buffer, containsExtent, createEmpty} from '../../extent.js'; diff --git a/src/ol/renderer/webgl/defaultmapshader.js b/src/ol/renderer/webgl/defaultmapshader.js index 317a41063a..040140d506 100644 --- a/src/ol/renderer/webgl/defaultmapshader.js +++ b/src/ol/renderer/webgl/defaultmapshader.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit. // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../webgl.js'; import WebGLFragment from '../../webgl/Fragment.js'; import WebGLVertex from '../../webgl/Vertex.js'; diff --git a/src/ol/renderer/webgl/defaultmapshader/Locations.js b/src/ol/renderer/webgl/defaultmapshader/Locations.js index 1a7845528c..573efe0aaa 100644 --- a/src/ol/renderer/webgl/defaultmapshader/Locations.js +++ b/src/ol/renderer/webgl/defaultmapshader/Locations.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../webgl.js'; /** * @constructor diff --git a/src/ol/renderer/webgl/tilelayershader.js b/src/ol/renderer/webgl/tilelayershader.js index b03dd30dfa..6b5a026f74 100644 --- a/src/ol/renderer/webgl/tilelayershader.js +++ b/src/ol/renderer/webgl/tilelayershader.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit. // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../webgl.js'; import WebGLFragment from '../../webgl/Fragment.js'; import WebGLVertex from '../../webgl/Vertex.js'; diff --git a/src/ol/renderer/webgl/tilelayershader/Locations.js b/src/ol/renderer/webgl/tilelayershader/Locations.js index db9123e41c..636f0d0fd2 100644 --- a/src/ol/renderer/webgl/tilelayershader/Locations.js +++ b/src/ol/renderer/webgl/tilelayershader/Locations.js @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../webgl.js'; /** * @constructor diff --git a/src/ol/reproj/Image.js b/src/ol/reproj/Image.js index dcb464a841..f73ad9915f 100644 --- a/src/ol/reproj/Image.js +++ b/src/ol/reproj/Image.js @@ -2,7 +2,7 @@ * @module ol/reproj/Image */ import {ERROR_THRESHOLD} from './common.js'; -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ImageBase from '../ImageBase.js'; import ImageState from '../ImageState.js'; import {listen, unlistenByKey} from '../events.js'; diff --git a/src/ol/reproj/Tile.js b/src/ol/reproj/Tile.js index 2c517ba57b..81c3bd2907 100644 --- a/src/ol/reproj/Tile.js +++ b/src/ol/reproj/Tile.js @@ -2,7 +2,7 @@ * @module ol/reproj/Tile */ import {ERROR_THRESHOLD} from './common.js'; -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Tile from '../Tile.js'; import TileState from '../TileState.js'; import {listen, unlistenByKey} from '../events.js'; diff --git a/src/ol/source/BingMaps.js b/src/ol/source/BingMaps.js index a85be415ba..414d971ebc 100644 --- a/src/ol/source/BingMaps.js +++ b/src/ol/source/BingMaps.js @@ -1,7 +1,7 @@ /** * @module ol/source/BingMaps */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {createFromTileUrlFunctions} from '../tileurlfunction.js'; import {applyTransform, intersects} from '../extent.js'; import {jsonp as requestJSONP} from '../net.js'; diff --git a/src/ol/source/CartoDB.js b/src/ol/source/CartoDB.js index 6928fc7a09..a23cb38a55 100644 --- a/src/ol/source/CartoDB.js +++ b/src/ol/source/CartoDB.js @@ -1,7 +1,7 @@ /** * @module ol/source/CartoDB */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {assign} from '../obj.js'; import SourceState from '../source/State.js'; import XYZ from '../source/XYZ.js'; diff --git a/src/ol/source/Cluster.js b/src/ol/source/Cluster.js index 5a06fb7e0d..0dd242e719 100644 --- a/src/ol/source/Cluster.js +++ b/src/ol/source/Cluster.js @@ -2,7 +2,7 @@ * @module ol/source/Cluster */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import {assert} from '../asserts.js'; import Feature from '../Feature.js'; import {scale as scaleCoordinate, add as addCoordinate} from '../coordinate.js'; diff --git a/src/ol/source/Image.js b/src/ol/source/Image.js index eb37e0af8d..75a63b7136 100644 --- a/src/ol/source/Image.js +++ b/src/ol/source/Image.js @@ -2,7 +2,7 @@ * @module ol/source/Image */ import {ENABLE_RASTER_REPROJECTION} from '../reproj/common.js'; -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ImageState from '../ImageState.js'; import {linearFindNearest} from '../array.js'; import Event from '../events/Event.js'; diff --git a/src/ol/source/ImageArcGISRest.js b/src/ol/source/ImageArcGISRest.js index 462ef4671f..6c5af41d6c 100644 --- a/src/ol/source/ImageArcGISRest.js +++ b/src/ol/source/ImageArcGISRest.js @@ -1,7 +1,7 @@ /** * @module ol/source/ImageArcGISRest */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ImageWrapper from '../Image.js'; import {assert} from '../asserts.js'; import {listen} from '../events.js'; diff --git a/src/ol/source/ImageCanvas.js b/src/ol/source/ImageCanvas.js index b1782e1e13..dcf48da40e 100644 --- a/src/ol/source/ImageCanvas.js +++ b/src/ol/source/ImageCanvas.js @@ -1,7 +1,7 @@ /** * @module ol/source/ImageCanvas */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ImageCanvas from '../ImageCanvas.js'; import {containsExtent, getHeight, getWidth, scaleFromCenter} from '../extent.js'; import ImageSource from '../source/Image.js'; diff --git a/src/ol/source/ImageMapGuide.js b/src/ol/source/ImageMapGuide.js index 2e10a17056..84470ce419 100644 --- a/src/ol/source/ImageMapGuide.js +++ b/src/ol/source/ImageMapGuide.js @@ -1,7 +1,7 @@ /** * @module ol/source/ImageMapGuide */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ImageWrapper from '../Image.js'; import {listen} from '../events.js'; import EventType from '../events/EventType.js'; diff --git a/src/ol/source/ImageStatic.js b/src/ol/source/ImageStatic.js index 73d1d39f49..6075a0271e 100644 --- a/src/ol/source/ImageStatic.js +++ b/src/ol/source/ImageStatic.js @@ -1,7 +1,7 @@ /** * @module ol/source/ImageStatic */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ImageWrapper from '../Image.js'; import ImageState from '../ImageState.js'; import {createCanvasContext2D} from '../dom.js'; diff --git a/src/ol/source/ImageWMS.js b/src/ol/source/ImageWMS.js index e4c42f5bcb..842578a950 100644 --- a/src/ol/source/ImageWMS.js +++ b/src/ol/source/ImageWMS.js @@ -3,7 +3,7 @@ */ import {DEFAULT_WMS_VERSION} from './common.js'; -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ImageWrapper from '../Image.js'; import {assert} from '../asserts.js'; import {listen} from '../events.js'; diff --git a/src/ol/source/OSM.js b/src/ol/source/OSM.js index cecbce37ae..d46b6d1f25 100644 --- a/src/ol/source/OSM.js +++ b/src/ol/source/OSM.js @@ -1,7 +1,7 @@ /** * @module ol/source/OSM */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import XYZ from '../source/XYZ.js'; diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js index 6f488215eb..c848144181 100644 --- a/src/ol/source/Raster.js +++ b/src/ol/source/Raster.js @@ -1,7 +1,7 @@ /** * @module ol/source/Raster */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import ImageCanvas from '../ImageCanvas.js'; import TileQueue from '../TileQueue.js'; import {createCanvasContext2D} from '../dom.js'; diff --git a/src/ol/source/Source.js b/src/ol/source/Source.js index b647bd773f..a07c81c15f 100644 --- a/src/ol/source/Source.js +++ b/src/ol/source/Source.js @@ -1,7 +1,7 @@ /** * @module ol/source/Source */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {UNDEFINED} from '../functions.js'; import BaseObject from '../Object.js'; import {get as getProjection} from '../proj.js'; diff --git a/src/ol/source/Stamen.js b/src/ol/source/Stamen.js index 9b16b37833..ff907d8602 100644 --- a/src/ol/source/Stamen.js +++ b/src/ol/source/Stamen.js @@ -1,7 +1,7 @@ /** * @module ol/source/Stamen */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {ATTRIBUTION as OSM_ATTRIBUTION} from '../source/OSM.js'; import XYZ from '../source/XYZ.js'; diff --git a/src/ol/source/Tile.js b/src/ol/source/Tile.js index c2f53d1b0a..1f3d7f44ae 100644 --- a/src/ol/source/Tile.js +++ b/src/ol/source/Tile.js @@ -1,7 +1,7 @@ /** * @module ol/source/Tile */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {UNDEFINED} from '../functions.js'; import TileCache from '../TileCache.js'; import TileState from '../TileState.js'; diff --git a/src/ol/source/TileArcGISRest.js b/src/ol/source/TileArcGISRest.js index 8e1c78a042..5fa0056cbf 100644 --- a/src/ol/source/TileArcGISRest.js +++ b/src/ol/source/TileArcGISRest.js @@ -1,7 +1,7 @@ /** * @module ol/source/TileArcGISRest */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {createEmpty} from '../extent.js'; import {modulo} from '../math.js'; import {assign} from '../obj.js'; diff --git a/src/ol/source/TileDebug.js b/src/ol/source/TileDebug.js index 589d8f9288..4b78d9ecde 100644 --- a/src/ol/source/TileDebug.js +++ b/src/ol/source/TileDebug.js @@ -1,7 +1,7 @@ /** * @module ol/source/TileDebug */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Tile from '../Tile.js'; import TileState from '../TileState.js'; import {createCanvasContext2D} from '../dom.js'; diff --git a/src/ol/source/TileImage.js b/src/ol/source/TileImage.js index 8646ae915e..887412c2f8 100644 --- a/src/ol/source/TileImage.js +++ b/src/ol/source/TileImage.js @@ -2,7 +2,7 @@ * @module ol/source/TileImage */ import {ENABLE_RASTER_REPROJECTION} from '../reproj/common.js'; -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import ImageTile from '../ImageTile.js'; import TileCache from '../TileCache.js'; import TileState from '../TileState.js'; diff --git a/src/ol/source/TileJSON.js b/src/ol/source/TileJSON.js index 45a234bff0..0602f0f61a 100644 --- a/src/ol/source/TileJSON.js +++ b/src/ol/source/TileJSON.js @@ -7,7 +7,7 @@ * @see http://mapbox.com/developers/api/ */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {createFromTemplates} from '../tileurlfunction.js'; import {assert} from '../asserts.js'; import {applyTransform, intersects} from '../extent.js'; diff --git a/src/ol/source/TileWMS.js b/src/ol/source/TileWMS.js index 2637773df4..c1f40149a9 100644 --- a/src/ol/source/TileWMS.js +++ b/src/ol/source/TileWMS.js @@ -3,7 +3,7 @@ */ import {DEFAULT_WMS_VERSION} from './common.js'; -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {assert} from '../asserts.js'; import {buffer, createEmpty} from '../extent.js'; import {assign} from '../obj.js'; diff --git a/src/ol/source/UTFGrid.js b/src/ol/source/UTFGrid.js index 2007193766..f5f7490425 100644 --- a/src/ol/source/UTFGrid.js +++ b/src/ol/source/UTFGrid.js @@ -1,7 +1,7 @@ /** * @module ol/source/UTFGrid */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import Tile from '../Tile.js'; import TileState from '../TileState.js'; import {createFromTemplates, nullTileUrlFunction} from '../tileurlfunction.js'; diff --git a/src/ol/source/UrlTile.js b/src/ol/source/UrlTile.js index 8c5fbb4614..d8412a29f4 100644 --- a/src/ol/source/UrlTile.js +++ b/src/ol/source/UrlTile.js @@ -1,7 +1,7 @@ /** * @module ol/source/UrlTile */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import TileState from '../TileState.js'; import {expandUrl, createFromTemplates, nullTileUrlFunction} from '../tileurlfunction.js'; import TileSource, {TileSourceEvent} from '../source/Tile.js'; diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js index 8e8f1550a9..10fdb1226a 100644 --- a/src/ol/source/Vector.js +++ b/src/ol/source/Vector.js @@ -2,7 +2,7 @@ * @module ol/source/Vector */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import Collection from '../Collection.js'; import CollectionEventType from '../CollectionEventType.js'; import ObjectEventType from '../ObjectEventType.js'; diff --git a/src/ol/source/VectorTile.js b/src/ol/source/VectorTile.js index 662803be63..2e088a31b8 100644 --- a/src/ol/source/VectorTile.js +++ b/src/ol/source/VectorTile.js @@ -1,7 +1,7 @@ /** * @module ol/source/VectorTile */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import TileState from '../TileState.js'; import VectorImageTile, {defaultLoadFunction} from '../VectorImageTile.js'; import Tile from '../VectorTile.js'; diff --git a/src/ol/source/WMTS.js b/src/ol/source/WMTS.js index acb0b9c2b8..61579c0ed7 100644 --- a/src/ol/source/WMTS.js +++ b/src/ol/source/WMTS.js @@ -1,7 +1,7 @@ /** * @module ol/source/WMTS */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {expandUrl, createFromTileUrlFunctions, nullTileUrlFunction} from '../tileurlfunction.js'; import {find, findIndex, includes} from '../array.js'; import {containsExtent} from '../extent.js'; diff --git a/src/ol/source/XYZ.js b/src/ol/source/XYZ.js index 69e60d2672..a0212b9ec6 100644 --- a/src/ol/source/XYZ.js +++ b/src/ol/source/XYZ.js @@ -1,7 +1,7 @@ /** * @module ol/source/XYZ */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import TileImage from '../source/TileImage.js'; import {createXYZ, extentFromProjection} from '../tilegrid.js'; diff --git a/src/ol/source/Zoomify.js b/src/ol/source/Zoomify.js index cbc93b98bc..d7ef97180b 100644 --- a/src/ol/source/Zoomify.js +++ b/src/ol/source/Zoomify.js @@ -2,7 +2,7 @@ * @module ol/source/Zoomify */ import {DEFAULT_TILE_SIZE} from '../tilegrid/common.js'; -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import ImageTile from '../ImageTile.js'; import TileState from '../TileState.js'; import {expandUrl, createFromTileUrlFunctions} from '../tileurlfunction.js'; diff --git a/src/ol/structs/LRUCache.js b/src/ol/structs/LRUCache.js index c242e1e775..9a01971a51 100644 --- a/src/ol/structs/LRUCache.js +++ b/src/ol/structs/LRUCache.js @@ -1,7 +1,7 @@ /** * @module ol/structs/LRUCache */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {assert} from '../asserts.js'; import EventTarget from '../events/EventTarget.js'; import EventType from '../events/EventType.js'; diff --git a/src/ol/structs/RBush.js b/src/ol/structs/RBush.js index dceecb0712..abdd79ef34 100644 --- a/src/ol/structs/RBush.js +++ b/src/ol/structs/RBush.js @@ -1,7 +1,7 @@ /** * @module ol/structs/RBush */ -import {getUid} from '../index.js'; +import {getUid} from '../util.js'; import rbush from 'rbush'; import {createOrUpdate, equals} from '../extent.js'; import {isEmpty} from '../obj.js'; diff --git a/src/ol/style/AtlasManager.js b/src/ol/style/AtlasManager.js index 09fe03b476..cf0eb8f022 100644 --- a/src/ol/style/AtlasManager.js +++ b/src/ol/style/AtlasManager.js @@ -1,7 +1,7 @@ /** * @module ol/style/AtlasManager */ -import {WEBGL_MAX_TEXTURE_SIZE} from '../index.js'; +import {MAX_TEXTURE_SIZE as WEBGL_MAX_TEXTURE_SIZE} from '../webgl.js'; import {UNDEFINED} from '../functions.js'; import Atlas from '../style/Atlas.js'; @@ -10,7 +10,7 @@ import Atlas from '../style/Atlas.js'; * @typedef {Object} Options * @property {number} [initialSize=256] The size in pixels of the first atlas image. * @property {number} [maxSize] The maximum size in pixels of atlas images. Default is - * `WEBGL_MAX_TEXTURE_SIZE` or 2048 if WebGL is not supported. + * `webgl/MAX_TEXTURE_SIZE` or 2048 if WebGL is not supported. * @property {number} [space=1] The space in pixels between images. */ diff --git a/src/ol/style/Circle.js b/src/ol/style/Circle.js index 4424047146..912f07b79d 100644 --- a/src/ol/style/Circle.js +++ b/src/ol/style/Circle.js @@ -1,7 +1,7 @@ /** * @module ol/style/Circle */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import RegularShape from '../style/RegularShape.js'; diff --git a/src/ol/style/Fill.js b/src/ol/style/Fill.js index 620ae3761c..ef3a49af48 100644 --- a/src/ol/style/Fill.js +++ b/src/ol/style/Fill.js @@ -1,7 +1,7 @@ /** * @module ol/style/Fill */ -import {getUid} from '../index.js'; +import {getUid} from '../util.js'; import {asString} from '../color.js'; diff --git a/src/ol/style/Icon.js b/src/ol/style/Icon.js index a36445700d..d9857d44a2 100644 --- a/src/ol/style/Icon.js +++ b/src/ol/style/Icon.js @@ -1,7 +1,7 @@ /** * @module ol/style/Icon */ -import {getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; import ImageState from '../ImageState.js'; import {assert} from '../asserts.js'; import {asArray} from '../color.js'; diff --git a/src/ol/style/IconImage.js b/src/ol/style/IconImage.js index 73fad3364b..65286a9356 100644 --- a/src/ol/style/IconImage.js +++ b/src/ol/style/IconImage.js @@ -1,7 +1,7 @@ /** * @module ol/style/IconImage */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {createCanvasContext2D} from '../dom.js'; import {listenOnce, unlistenByKey} from '../events.js'; import EventTarget from '../events/EventTarget.js'; diff --git a/src/ol/style/RegularShape.js b/src/ol/style/RegularShape.js index 61ebce4dde..a26e89ef95 100644 --- a/src/ol/style/RegularShape.js +++ b/src/ol/style/RegularShape.js @@ -1,7 +1,7 @@ /** * @module ol/style/RegularShape */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {asColorLike} from '../colorlike.js'; import {createCanvasContext2D} from '../dom.js'; import {CANVAS_LINE_DASH} from '../has.js'; diff --git a/src/ol/style/Stroke.js b/src/ol/style/Stroke.js index 51b287af8d..5cd465c04b 100644 --- a/src/ol/style/Stroke.js +++ b/src/ol/style/Stroke.js @@ -1,7 +1,7 @@ /** * @module ol/style/Stroke */ -import {getUid} from '../index.js'; +import {getUid} from '../util.js'; /** diff --git a/src/ol/tilegrid/WMTS.js b/src/ol/tilegrid/WMTS.js index c0c0dfaf83..5b6899184f 100644 --- a/src/ol/tilegrid/WMTS.js +++ b/src/ol/tilegrid/WMTS.js @@ -1,7 +1,7 @@ /** * @module ol/tilegrid/WMTS */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {find} from '../array.js'; import {get as getProjection} from '../proj.js'; import TileGrid from '../tilegrid/TileGrid.js'; diff --git a/src/ol/util.js b/src/ol/util.js new file mode 100644 index 0000000000..92dd9493c9 --- /dev/null +++ b/src/ol/util.js @@ -0,0 +1,55 @@ +/** + * @module ol/util + */ + +/** + * Inherit the prototype methods from one constructor into another. + * + * Usage: + * + * function ParentClass(a, b) { } + * ParentClass.prototype.foo = function(a) { } + * + * function ChildClass(a, b, c) { + * // Call parent constructor + * ParentClass.call(this, a, b); + * } + * inherits(ChildClass, ParentClass); + * + * var child = new ChildClass('a', 'b', 'see'); + * child.foo(); // This works. + * + * @param {!Function} childCtor Child constructor. + * @param {!Function} parentCtor Parent constructor. + * @function module:ol.inherits + * @api + */ +export function inherits(childCtor, parentCtor) { + childCtor.prototype = Object.create(parentCtor.prototype); + childCtor.prototype.constructor = childCtor; +} + +/** + * Counter for getUid. + * @type {number} + * @private + */ +let uidCounter_ = 0; + +/** + * Gets a unique ID for an object. This mutates the object so that further calls + * with the same object as a parameter returns the same value. Unique IDs are generated + * as a strictly increasing sequence. Adapted from goog.getUid. + * + * @param {Object} obj The object to get the unique ID for. + * @return {number} The unique ID for the object. + */ +export function getUid(obj) { + return obj.ol_uid || (obj.ol_uid = ++uidCounter_); +} + +/** + * OpenLayers version. + * @type {string} + */ +export const VERSION = '5.0.0-beta.14'; diff --git a/src/ol/webgl.js b/src/ol/webgl.js index 67789414c7..05d5efb56e 100644 --- a/src/ol/webgl.js +++ b/src/ol/webgl.js @@ -2,6 +2,7 @@ * @module ol/webgl */ + /** * Constants taken from goog.webgl */ @@ -287,3 +288,52 @@ export function getContext(canvas, opt_attributes) { } return null; } + + +/** + * Include debuggable shader sources. Default is `true`. This should be set to + * `false` for production builds. + * @type {boolean} + */ +export const DEBUG = true; + + +/** + * The maximum supported WebGL texture size in pixels. If WebGL is not + * supported, the value is set to `undefined`. + * @type {number|undefined} + */ +let MAX_TEXTURE_SIZE; // value is set below + + +/** + * List of supported WebGL extensions. + * @type {Array.} + */ +let EXTENSIONS; // value is set below + + +/** + * True if both OpenLayers and browser support WebGL. + * @const ol/has.WEBGL + * @type {boolean} + * @api + */ +let HAS = false; + +//TODO Remove side effects +if (typeof window !== 'undefined' && 'WebGLRenderingContext' in window) { + try { + const canvas = /** @type {HTMLCanvasElement} */ (document.createElement('CANVAS')); + const gl = getContext(canvas, {failIfMajorPerformanceCaveat: true}); + if (gl) { + HAS = true; + MAX_TEXTURE_SIZE = /** @type {number} */ (gl.getParameter(gl.MAX_TEXTURE_SIZE)); + EXTENSIONS = gl.getSupportedExtensions(); + } + } catch (e) { + // pass + } +} + +export {HAS, MAX_TEXTURE_SIZE, EXTENSIONS}; diff --git a/src/ol/webgl/Context.js b/src/ol/webgl/Context.js index 3b6a6abe86..2d17f8feda 100644 --- a/src/ol/webgl/Context.js +++ b/src/ol/webgl/Context.js @@ -1,7 +1,8 @@ /** * @module ol/webgl/Context */ -import {WEBGL_EXTENSIONS, getUid, inherits} from '../index.js'; +import {getUid, inherits} from '../util.js'; +import {EXTENSIONS as WEBGL_EXTENSIONS} from '../webgl.js'; import Disposable from '../Disposable.js'; import {includes} from '../array.js'; import {listen, unlistenAll} from '../events.js'; diff --git a/src/ol/webgl/Fragment.js b/src/ol/webgl/Fragment.js index 8221ba1761..460e43baee 100644 --- a/src/ol/webgl/Fragment.js +++ b/src/ol/webgl/Fragment.js @@ -1,7 +1,7 @@ /** * @module ol/webgl/Fragment */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {FRAGMENT_SHADER} from '../webgl.js'; import WebGLShader from '../webgl/Shader.js'; diff --git a/src/ol/webgl/Vertex.js b/src/ol/webgl/Vertex.js index 4f7a0ff7f6..138ac78751 100644 --- a/src/ol/webgl/Vertex.js +++ b/src/ol/webgl/Vertex.js @@ -1,7 +1,7 @@ /** * @module ol/webgl/Vertex */ -import {inherits} from '../index.js'; +import {inherits} from '../util.js'; import {VERTEX_SHADER} from '../webgl.js'; import WebGLShader from '../webgl/Shader.js'; diff --git a/src/ol/webgl/shader.mustache b/src/ol/webgl/shader.mustache index b37c64ea2d..a821f72181 100644 --- a/src/ol/webgl/shader.mustache +++ b/src/ol/webgl/shader.mustache @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit. // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../webgl.js'; import WebGLFragment from '../../../webgl/Fragment.js'; import WebGLVertex from '../../../webgl/Vertex.js'; diff --git a/src/ol/webgl/shaderlocations.mustache b/src/ol/webgl/shaderlocations.mustache index 61277e2951..1b0b87d9b5 100644 --- a/src/ol/webgl/shaderlocations.mustache +++ b/src/ol/webgl/shaderlocations.mustache @@ -4,7 +4,7 @@ // This file is automatically generated, do not edit // Run `make shaders` to generate, and commit the result. -import {DEBUG_WEBGL} from '../../../../index.js'; +import {DEBUG as DEBUG_WEBGL} from '../../../../webgl.js'; /** * @constructor diff --git a/tasks/set-version.js b/tasks/set-version.js index 004f8bb9ec..db84c5210a 100644 --- a/tasks/set-version.js +++ b/tasks/set-version.js @@ -1,7 +1,7 @@ const fs = require('fs'); const pkg = require('../package.json'); -const index = require.resolve('../src/ol/index'); +const index = require.resolve('../src/ol/util'); const lines = fs.readFileSync(index, 'utf-8').split('\n'); const versionRegEx = /const VERSION = '(.*)';$/;