diff --git a/src/ol/control/Attribution.js b/src/ol/control/Attribution.js index 5f043ea2f7..e69ff13892 100644 --- a/src/ol/control/Attribution.js +++ b/src/ol/control/Attribution.js @@ -2,7 +2,7 @@ * @module ol/control/Attribution */ import {equals} from '../array.js'; -import Control from '../control/Control.js'; +import Control from './Control.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_COLLAPSED} from '../css.js'; import {removeChildren, replaceNode} from '../dom.js'; import {listen} from '../events.js'; diff --git a/src/ol/control/FullScreen.js b/src/ol/control/FullScreen.js index 1ceec98141..ab0e40a1de 100644 --- a/src/ol/control/FullScreen.js +++ b/src/ol/control/FullScreen.js @@ -1,7 +1,7 @@ /** * @module ol/control/FullScreen */ -import Control from '../control/Control.js'; +import Control from './Control.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_UNSUPPORTED} from '../css.js'; import {replaceNode} from '../dom.js'; import {listen} from '../events.js'; diff --git a/src/ol/control/MousePosition.js b/src/ol/control/MousePosition.js index c0f9fd6516..8ba9f37cb1 100644 --- a/src/ol/control/MousePosition.js +++ b/src/ol/control/MousePosition.js @@ -4,7 +4,7 @@ import {listen} from '../events.js'; import EventType from '../events/EventType.js'; import {getChangeEventType} from '../Object.js'; -import Control from '../control/Control.js'; +import Control from './Control.js'; import {getTransformFromProjections, identityTransform, get as getProjection} from '../proj.js'; diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index 79faf74add..25e8bdd434 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -10,7 +10,7 @@ import ObjectEventType from '../ObjectEventType.js'; import Overlay from '../Overlay.js'; import OverlayPositioning from '../OverlayPositioning.js'; import ViewProperty from '../ViewProperty.js'; -import Control from '../control/Control.js'; +import Control from './Control.js'; import {rotate as rotateCoordinate, add as addCoordinate} from '../coordinate.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_COLLAPSED} from '../css.js'; import {replaceNode} from '../dom.js'; diff --git a/src/ol/control/Rotate.js b/src/ol/control/Rotate.js index e51c4e3c34..fc20aed4d8 100644 --- a/src/ol/control/Rotate.js +++ b/src/ol/control/Rotate.js @@ -1,7 +1,7 @@ /** * @module ol/control/Rotate */ -import Control from '../control/Control.js'; +import Control from './Control.js'; import {CLASS_CONTROL, CLASS_HIDDEN, CLASS_UNSELECTABLE} from '../css.js'; import {easeOut} from '../easing.js'; import {listen} from '../events.js'; diff --git a/src/ol/control/ScaleLine.js b/src/ol/control/ScaleLine.js index 1aacaa20f4..66dfb8f6ac 100644 --- a/src/ol/control/ScaleLine.js +++ b/src/ol/control/ScaleLine.js @@ -3,7 +3,7 @@ */ import {getChangeEventType} from '../Object.js'; import {assert} from '../asserts.js'; -import Control from '../control/Control.js'; +import Control from './Control.js'; import {CLASS_UNSELECTABLE} from '../css.js'; import {listen} from '../events.js'; import {getPointResolution, METERS_PER_UNIT} from '../proj.js'; diff --git a/src/ol/control/Zoom.js b/src/ol/control/Zoom.js index 311730bd74..5e016950a9 100644 --- a/src/ol/control/Zoom.js +++ b/src/ol/control/Zoom.js @@ -3,7 +3,7 @@ */ import {listen} from '../events.js'; import EventType from '../events/EventType.js'; -import Control from '../control/Control.js'; +import Control from './Control.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js'; import {easeOut} from '../easing.js'; diff --git a/src/ol/control/ZoomSlider.js b/src/ol/control/ZoomSlider.js index 869eb8ffc9..fa0b3560cb 100644 --- a/src/ol/control/ZoomSlider.js +++ b/src/ol/control/ZoomSlider.js @@ -2,7 +2,7 @@ * @module ol/control/ZoomSlider */ import ViewHint from '../ViewHint.js'; -import Control from '../control/Control.js'; +import Control from './Control.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js'; import {easeOut} from '../easing.js'; import {listen, unlistenByKey} from '../events.js'; diff --git a/src/ol/control/ZoomToExtent.js b/src/ol/control/ZoomToExtent.js index da287372e5..396bb31dc3 100644 --- a/src/ol/control/ZoomToExtent.js +++ b/src/ol/control/ZoomToExtent.js @@ -3,7 +3,7 @@ */ import {listen} from '../events.js'; import EventType from '../events/EventType.js'; -import Control from '../control/Control.js'; +import Control from './Control.js'; import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js'; diff --git a/src/ol/events/Target.js b/src/ol/events/Target.js index c9289f506e..23769dbe8d 100644 --- a/src/ol/events/Target.js +++ b/src/ol/events/Target.js @@ -4,7 +4,7 @@ import Disposable from '../Disposable.js'; import {unlistenAll} from '../events.js'; import {VOID} from '../functions.js'; -import Event from '../events/Event.js'; +import Event from './Event.js'; /** diff --git a/src/ol/format/EsriJSON.js b/src/ol/format/EsriJSON.js index 495d11833f..9aaf63c1c9 100644 --- a/src/ol/format/EsriJSON.js +++ b/src/ol/format/EsriJSON.js @@ -4,8 +4,8 @@ import Feature from '../Feature.js'; import {assert} from '../asserts.js'; import {containsExtent} from '../extent.js'; -import {transformWithOptions} from '../format/Feature.js'; -import JSONFeature from '../format/JSONFeature.js'; +import {transformWithOptions} from './Feature.js'; +import JSONFeature from './JSONFeature.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryType from '../geom/GeometryType.js'; import LineString from '../geom/LineString.js'; diff --git a/src/ol/format/GML.js b/src/ol/format/GML.js index 6c99f9ccc7..ee20cc4034 100644 --- a/src/ol/format/GML.js +++ b/src/ol/format/GML.js @@ -1,7 +1,7 @@ /** * @module ol/format/GML */ -import GML3 from '../format/GML3.js'; +import GML3 from './GML3.js'; /** * @classdesc diff --git a/src/ol/format/GML2.js b/src/ol/format/GML2.js index db8b417a09..1b2a7930e8 100644 --- a/src/ol/format/GML2.js +++ b/src/ol/format/GML2.js @@ -2,9 +2,9 @@ * @module ol/format/GML2 */ import {createOrUpdate} from '../extent.js'; -import {transformWithOptions} from '../format/Feature.js'; -import GMLBase, {GMLNS} from '../format/GMLBase.js'; -import {writeStringTextNode} from '../format/xsd.js'; +import {transformWithOptions} from './Feature.js'; +import GMLBase, {GMLNS} from './GMLBase.js'; +import {writeStringTextNode} from './xsd.js'; import {assign} from '../obj.js'; import {get as getProjection, transformExtent} from '../proj.js'; import {createElementNS, getAllTextContent, makeArrayPusher, makeChildAppender, diff --git a/src/ol/format/GML3.js b/src/ol/format/GML3.js index fb96ad509d..71e35a2b03 100644 --- a/src/ol/format/GML3.js +++ b/src/ol/format/GML3.js @@ -3,9 +3,9 @@ */ import {extend} from '../array.js'; import {createOrUpdate} from '../extent.js'; -import {transformWithOptions} from '../format/Feature.js'; -import GMLBase, {GMLNS} from '../format/GMLBase.js'; -import {readNonNegativeIntegerString, writeStringTextNode} from '../format/xsd.js'; +import {transformWithOptions} from './Feature.js'; +import GMLBase, {GMLNS} from './GMLBase.js'; +import {readNonNegativeIntegerString, writeStringTextNode} from './xsd.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; import MultiLineString from '../geom/MultiLineString.js'; diff --git a/src/ol/format/GMLBase.js b/src/ol/format/GMLBase.js index daffb8dcd5..410c09c2f6 100644 --- a/src/ol/format/GMLBase.js +++ b/src/ol/format/GMLBase.js @@ -6,8 +6,8 @@ // envelopes/extents, only geometries! import {extend} from '../array.js'; import Feature from '../Feature.js'; -import {transformWithOptions} from '../format/Feature.js'; -import XMLFeature from '../format/XMLFeature.js'; +import {transformWithOptions} from './Feature.js'; +import XMLFeature from './XMLFeature.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; import LinearRing from '../geom/LinearRing.js'; diff --git a/src/ol/format/GPX.js b/src/ol/format/GPX.js index c90ff72990..98018c5267 100644 --- a/src/ol/format/GPX.js +++ b/src/ol/format/GPX.js @@ -3,9 +3,9 @@ */ import Feature from '../Feature.js'; import {includes} from '../array.js'; -import {transformWithOptions} from '../format/Feature.js'; -import XMLFeature from '../format/XMLFeature.js'; -import {readString, readDecimal, readNonNegativeInteger, readDateTime, writeStringTextNode, writeNonNegativeIntegerTextNode, writeDecimalTextNode, writeDateTimeTextNode} from '../format/xsd.js'; +import {transformWithOptions} from './Feature.js'; +import XMLFeature from './XMLFeature.js'; +import {readString, readDecimal, readNonNegativeInteger, readDateTime, writeStringTextNode, writeNonNegativeIntegerTextNode, writeDecimalTextNode, writeDateTimeTextNode} from './xsd.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryType from '../geom/GeometryType.js'; import LineString from '../geom/LineString.js'; diff --git a/src/ol/format/GeoJSON.js b/src/ol/format/GeoJSON.js index 6d53add2a1..c73cb17b95 100644 --- a/src/ol/format/GeoJSON.js +++ b/src/ol/format/GeoJSON.js @@ -4,8 +4,8 @@ import {assert} from '../asserts.js'; import Feature from '../Feature.js'; -import {transformWithOptions} from '../format/Feature.js'; -import JSONFeature from '../format/JSONFeature.js'; +import {transformWithOptions} from './Feature.js'; +import JSONFeature from './JSONFeature.js'; import GeometryCollection from '../geom/GeometryCollection.js'; import LineString from '../geom/LineString.js'; import MultiLineString from '../geom/MultiLineString.js'; diff --git a/src/ol/format/IGC.js b/src/ol/format/IGC.js index 3ad90029c1..17c2f6accf 100644 --- a/src/ol/format/IGC.js +++ b/src/ol/format/IGC.js @@ -2,8 +2,8 @@ * @module ol/format/IGC */ import Feature from '../Feature.js'; -import {transformWithOptions} from '../format/Feature.js'; -import TextFeature from '../format/TextFeature.js'; +import {transformWithOptions} from './Feature.js'; +import TextFeature from './TextFeature.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; import {get as getProjection} from '../proj.js'; diff --git a/src/ol/format/JSONFeature.js b/src/ol/format/JSONFeature.js index 8677fad1d9..2186befc84 100644 --- a/src/ol/format/JSONFeature.js +++ b/src/ol/format/JSONFeature.js @@ -2,8 +2,8 @@ * @module ol/format/JSONFeature */ import {abstract} from '../util.js'; -import FeatureFormat from '../format/Feature.js'; -import FormatType from '../format/FormatType.js'; +import FeatureFormat from './Feature.js'; +import FormatType from './FormatType.js'; /** * @classdesc diff --git a/src/ol/format/KML.js b/src/ol/format/KML.js index 28a27ab7f6..672d7f267e 100644 --- a/src/ol/format/KML.js +++ b/src/ol/format/KML.js @@ -5,9 +5,9 @@ import Feature from '../Feature.js'; import {extend, includes} from '../array.js'; import {assert} from '../asserts.js'; import {asArray} from '../color.js'; -import {transformWithOptions} from '../format/Feature.js'; -import XMLFeature from '../format/XMLFeature.js'; -import {readDecimal, readBoolean, readString, writeStringTextNode, writeCDATASection, writeDecimalTextNode, writeBooleanTextNode} from '../format/xsd.js'; +import {transformWithOptions} from './Feature.js'; +import XMLFeature from './XMLFeature.js'; +import {readDecimal, readBoolean, readString, writeStringTextNode, writeCDATASection, writeDecimalTextNode, writeBooleanTextNode} from './xsd.js'; import GeometryCollection from '../geom/GeometryCollection.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryType from '../geom/GeometryType.js'; diff --git a/src/ol/format/OSMXML.js b/src/ol/format/OSMXML.js index 952b91f690..7ffe0bf6b0 100644 --- a/src/ol/format/OSMXML.js +++ b/src/ol/format/OSMXML.js @@ -4,8 +4,8 @@ // FIXME add typedef for stack state objects import {extend} from '../array.js'; import Feature from '../Feature.js'; -import {transformWithOptions} from '../format/Feature.js'; -import XMLFeature from '../format/XMLFeature.js'; +import {transformWithOptions} from './Feature.js'; +import XMLFeature from './XMLFeature.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; import Point from '../geom/Point.js'; diff --git a/src/ol/format/OWS.js b/src/ol/format/OWS.js index 3d8e98c09f..5b287621c9 100644 --- a/src/ol/format/OWS.js +++ b/src/ol/format/OWS.js @@ -1,9 +1,9 @@ /** * @module ol/format/OWS */ -import {readHref} from '../format/XLink.js'; -import XML from '../format/XML.js'; -import {readString} from '../format/xsd.js'; +import {readHref} from './XLink.js'; +import XML from './XML.js'; +import {readString} from './xsd.js'; import {makeObjectPropertyPusher, makeObjectPropertySetter, makeStructureNS, pushParseAndPop} from '../xml.js'; diff --git a/src/ol/format/Polyline.js b/src/ol/format/Polyline.js index 65fdce36af..e92c3defc4 100644 --- a/src/ol/format/Polyline.js +++ b/src/ol/format/Polyline.js @@ -3,8 +3,8 @@ */ import {assert} from '../asserts.js'; import Feature from '../Feature.js'; -import {transformWithOptions} from '../format/Feature.js'; -import TextFeature from '../format/TextFeature.js'; +import {transformWithOptions} from './Feature.js'; +import TextFeature from './TextFeature.js'; import GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; import {getStrideForLayout} from '../geom/SimpleGeometry.js'; diff --git a/src/ol/format/TopoJSON.js b/src/ol/format/TopoJSON.js index 152c0b82b3..d5f2bb2e9f 100644 --- a/src/ol/format/TopoJSON.js +++ b/src/ol/format/TopoJSON.js @@ -2,8 +2,8 @@ * @module ol/format/TopoJSON */ import Feature from '../Feature.js'; -import {transformWithOptions} from '../format/Feature.js'; -import JSONFeature from '../format/JSONFeature.js'; +import {transformWithOptions} from './Feature.js'; +import JSONFeature from './JSONFeature.js'; import LineString from '../geom/LineString.js'; import MultiLineString from '../geom/MultiLineString.js'; import MultiPoint from '../geom/MultiPoint.js'; diff --git a/src/ol/format/WFS.js b/src/ol/format/WFS.js index aa36383f58..1480b43fe9 100644 --- a/src/ol/format/WFS.js +++ b/src/ol/format/WFS.js @@ -2,12 +2,12 @@ * @module ol/format/WFS */ import {assert} from '../asserts.js'; -import GML2 from '../format/GML2.js'; -import GML3 from '../format/GML3.js'; -import GMLBase, {GMLNS} from '../format/GMLBase.js'; -import {and as andFilter, bbox as bboxFilter} from '../format/filter.js'; -import XMLFeature from '../format/XMLFeature.js'; -import {readNonNegativeIntegerString, readNonNegativeInteger, writeStringTextNode} from '../format/xsd.js'; +import GML2 from './GML2.js'; +import GML3 from './GML3.js'; +import GMLBase, {GMLNS} from './GMLBase.js'; +import {and as andFilter, bbox as bboxFilter} from './filter.js'; +import XMLFeature from './XMLFeature.js'; +import {readNonNegativeIntegerString, readNonNegativeInteger, writeStringTextNode} from './xsd.js'; import {assign} from '../obj.js'; import {get as getProjection} from '../proj.js'; import {createElementNS, isDocument, makeArrayPusher, makeChildAppender, diff --git a/src/ol/format/WKT.js b/src/ol/format/WKT.js index 9ac6e212ce..284dadeef0 100644 --- a/src/ol/format/WKT.js +++ b/src/ol/format/WKT.js @@ -2,8 +2,8 @@ * @module ol/format/WKT */ import Feature from '../Feature.js'; -import {transformWithOptions} from '../format/Feature.js'; -import TextFeature from '../format/TextFeature.js'; +import {transformWithOptions} from './Feature.js'; +import TextFeature from './TextFeature.js'; import GeometryCollection from '../geom/GeometryCollection.js'; import GeometryType from '../geom/GeometryType.js'; import GeometryLayout from '../geom/GeometryLayout.js'; diff --git a/src/ol/format/WMSCapabilities.js b/src/ol/format/WMSCapabilities.js index 37e1b446d4..e68f78b55c 100644 --- a/src/ol/format/WMSCapabilities.js +++ b/src/ol/format/WMSCapabilities.js @@ -1,9 +1,9 @@ /** * @module ol/format/WMSCapabilities */ -import {readHref} from '../format/XLink.js'; -import XML from '../format/XML.js'; -import {readDecimalString, readString, readNonNegativeInteger, readDecimal, readBooleanString, readNonNegativeIntegerString} from '../format/xsd.js'; +import {readHref} from './XLink.js'; +import XML from './XML.js'; +import {readDecimalString, readString, readNonNegativeInteger, readDecimal, readBooleanString, readNonNegativeIntegerString} from './xsd.js'; import {makeArrayPusher, makeObjectPropertyPusher, makeObjectPropertySetter, makeStructureNS, pushParseAndPop} from '../xml.js'; diff --git a/src/ol/format/WMSGetFeatureInfo.js b/src/ol/format/WMSGetFeatureInfo.js index cd3582d7da..68e44be739 100644 --- a/src/ol/format/WMSGetFeatureInfo.js +++ b/src/ol/format/WMSGetFeatureInfo.js @@ -2,8 +2,8 @@ * @module ol/format/WMSGetFeatureInfo */ import {extend, includes} from '../array.js'; -import GML2 from '../format/GML2.js'; -import XMLFeature from '../format/XMLFeature.js'; +import GML2 from './GML2.js'; +import XMLFeature from './XMLFeature.js'; import {assign} from '../obj.js'; import {makeArrayPusher, makeStructureNS, pushParseAndPop} from '../xml.js'; diff --git a/src/ol/format/WMTSCapabilities.js b/src/ol/format/WMTSCapabilities.js index db2a1b0922..03f53fcdb5 100644 --- a/src/ol/format/WMTSCapabilities.js +++ b/src/ol/format/WMTSCapabilities.js @@ -2,10 +2,10 @@ * @module ol/format/WMTSCapabilities */ import {boundingExtent} from '../extent.js'; -import OWS from '../format/OWS.js'; -import {readHref} from '../format/XLink.js'; -import XML from '../format/XML.js'; -import {readString, readNonNegativeInteger, readDecimal} from '../format/xsd.js'; +import OWS from './OWS.js'; +import {readHref} from './XLink.js'; +import XML from './XML.js'; +import {readString, readNonNegativeInteger, readDecimal} from './xsd.js'; import {pushParseAndPop, makeStructureNS, makeObjectPropertySetter, makeObjectPropertyPusher, makeArrayPusher} from '../xml.js'; diff --git a/src/ol/format/filter.js b/src/ol/format/filter.js index 9bf251cd43..536da0497c 100644 --- a/src/ol/format/filter.js +++ b/src/ol/format/filter.js @@ -1,23 +1,23 @@ /** * @module ol/format/filter */ -import And from '../format/filter/And.js'; -import Bbox from '../format/filter/Bbox.js'; -import Contains from '../format/filter/Contains.js'; -import During from '../format/filter/During.js'; -import EqualTo from '../format/filter/EqualTo.js'; -import GreaterThan from '../format/filter/GreaterThan.js'; -import GreaterThanOrEqualTo from '../format/filter/GreaterThanOrEqualTo.js'; -import Intersects from '../format/filter/Intersects.js'; -import IsBetween from '../format/filter/IsBetween.js'; -import IsLike from '../format/filter/IsLike.js'; -import IsNull from '../format/filter/IsNull.js'; -import LessThan from '../format/filter/LessThan.js'; -import LessThanOrEqualTo from '../format/filter/LessThanOrEqualTo.js'; -import Not from '../format/filter/Not.js'; -import NotEqualTo from '../format/filter/NotEqualTo.js'; -import Or from '../format/filter/Or.js'; -import Within from '../format/filter/Within.js'; +import And from './filter/And.js'; +import Bbox from './filter/Bbox.js'; +import Contains from './filter/Contains.js'; +import During from './filter/During.js'; +import EqualTo from './filter/EqualTo.js'; +import GreaterThan from './filter/GreaterThan.js'; +import GreaterThanOrEqualTo from './filter/GreaterThanOrEqualTo.js'; +import Intersects from './filter/Intersects.js'; +import IsBetween from './filter/IsBetween.js'; +import IsLike from './filter/IsLike.js'; +import IsNull from './filter/IsNull.js'; +import LessThan from './filter/LessThan.js'; +import LessThanOrEqualTo from './filter/LessThanOrEqualTo.js'; +import Not from './filter/Not.js'; +import NotEqualTo from './filter/NotEqualTo.js'; +import Or from './filter/Or.js'; +import Within from './filter/Within.js'; /** diff --git a/src/ol/format/filter/And.js b/src/ol/format/filter/And.js index ccb63c397e..0da673d157 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 LogicalNary from '../filter/LogicalNary.js'; +import LogicalNary from './LogicalNary.js'; /** * @classdesc diff --git a/src/ol/format/filter/Bbox.js b/src/ol/format/filter/Bbox.js index 5813204fd5..04455a28df 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 Filter from '../filter/Filter.js'; +import Filter from './Filter.js'; /** * @classdesc diff --git a/src/ol/format/filter/Comparison.js b/src/ol/format/filter/Comparison.js index 138f490459..ebbdd65fa9 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 Filter from '../filter/Filter.js'; +import Filter from './Filter.js'; /** * @classdesc diff --git a/src/ol/format/filter/ComparisonBinary.js b/src/ol/format/filter/ComparisonBinary.js index d4d5d4f1b2..85fa1abbdb 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 Comparison from '../filter/Comparison.js'; +import Comparison from './Comparison.js'; /** * @classdesc diff --git a/src/ol/format/filter/Contains.js b/src/ol/format/filter/Contains.js index 82aa68554d..99b87ffa81 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 Spatial from '../filter/Spatial.js'; +import Spatial from './Spatial.js'; /** * @classdesc diff --git a/src/ol/format/filter/During.js b/src/ol/format/filter/During.js index a1989a5bc9..1c8260c6f1 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 Comparison from '../filter/Comparison.js'; +import Comparison from './Comparison.js'; /** * @classdesc diff --git a/src/ol/format/filter/EqualTo.js b/src/ol/format/filter/EqualTo.js index c192906ded..733ee39f4c 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 ComparisonBinary from '../filter/ComparisonBinary.js'; +import ComparisonBinary from './ComparisonBinary.js'; /** * @classdesc diff --git a/src/ol/format/filter/GreaterThan.js b/src/ol/format/filter/GreaterThan.js index ec8eb2da62..2d720aff28 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 ComparisonBinary from '../filter/ComparisonBinary.js'; +import ComparisonBinary from './ComparisonBinary.js'; /** * @classdesc diff --git a/src/ol/format/filter/GreaterThanOrEqualTo.js b/src/ol/format/filter/GreaterThanOrEqualTo.js index 8af0ec7a87..5ef179372b 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 ComparisonBinary from '../filter/ComparisonBinary.js'; +import ComparisonBinary from './ComparisonBinary.js'; /** * @classdesc diff --git a/src/ol/format/filter/Intersects.js b/src/ol/format/filter/Intersects.js index 0594db8fde..e2911cf7cf 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 Spatial from '../filter/Spatial.js'; +import Spatial from './Spatial.js'; /** * @classdesc diff --git a/src/ol/format/filter/IsBetween.js b/src/ol/format/filter/IsBetween.js index f5f097d310..99b22845e0 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 Comparison from '../filter/Comparison.js'; +import Comparison from './Comparison.js'; /** * @classdesc diff --git a/src/ol/format/filter/IsLike.js b/src/ol/format/filter/IsLike.js index eb73ba9812..a1fc172a07 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 Comparison from '../filter/Comparison.js'; +import Comparison from './Comparison.js'; /** * @classdesc diff --git a/src/ol/format/filter/IsNull.js b/src/ol/format/filter/IsNull.js index bc22613952..1c9e3be7f4 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 Comparison from '../filter/Comparison.js'; +import Comparison from './Comparison.js'; /** * @classdesc diff --git a/src/ol/format/filter/LessThan.js b/src/ol/format/filter/LessThan.js index fd66b4b1f9..dff1e027ca 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 ComparisonBinary from '../filter/ComparisonBinary.js'; +import ComparisonBinary from './ComparisonBinary.js'; /** * @classdesc diff --git a/src/ol/format/filter/LessThanOrEqualTo.js b/src/ol/format/filter/LessThanOrEqualTo.js index 7129f1db9d..e222cd6eda 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 ComparisonBinary from '../filter/ComparisonBinary.js'; +import ComparisonBinary from './ComparisonBinary.js'; /** * @classdesc diff --git a/src/ol/format/filter/LogicalNary.js b/src/ol/format/filter/LogicalNary.js index d785e411b9..081a8475c9 100644 --- a/src/ol/format/filter/LogicalNary.js +++ b/src/ol/format/filter/LogicalNary.js @@ -2,7 +2,7 @@ * @module ol/format/filter/LogicalNary */ import {assert} from '../../asserts.js'; -import Filter from '../filter/Filter.js'; +import Filter from './Filter.js'; /** * @classdesc diff --git a/src/ol/format/filter/Not.js b/src/ol/format/filter/Not.js index c63e0c0da0..7b64a2986c 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 Filter from '../filter/Filter.js'; +import Filter from './Filter.js'; /** * @classdesc diff --git a/src/ol/format/filter/NotEqualTo.js b/src/ol/format/filter/NotEqualTo.js index 2f0f082629..2ec68228e3 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 ComparisonBinary from '../filter/ComparisonBinary.js'; +import ComparisonBinary from './ComparisonBinary.js'; /** * @classdesc diff --git a/src/ol/format/filter/Or.js b/src/ol/format/filter/Or.js index 545ad4d196..39dd5d4764 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 LogicalNary from '../filter/LogicalNary.js'; +import LogicalNary from './LogicalNary.js'; /** * @classdesc diff --git a/src/ol/format/filter/Spatial.js b/src/ol/format/filter/Spatial.js index 4b45cb5f91..74cf3128bb 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 Filter from '../filter/Filter.js'; +import Filter from './Filter.js'; /** * @classdesc diff --git a/src/ol/format/filter/Within.js b/src/ol/format/filter/Within.js index 138593d868..c906c89fea 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 Spatial from '../filter/Spatial.js'; +import Spatial from './Spatial.js'; /** * @classdesc diff --git a/src/ol/geom/Circle.js b/src/ol/geom/Circle.js index c59ee86b16..5b38988a77 100644 --- a/src/ol/geom/Circle.js +++ b/src/ol/geom/Circle.js @@ -2,9 +2,9 @@ * @module ol/geom/Circle */ import {createOrUpdate, forEachCorner, intersects} from '../extent.js'; -import GeometryType from '../geom/GeometryType.js'; -import SimpleGeometry from '../geom/SimpleGeometry.js'; -import {deflateCoordinate} from '../geom/flat/deflate.js'; +import GeometryType from './GeometryType.js'; +import SimpleGeometry from './SimpleGeometry.js'; +import {deflateCoordinate} from './flat/deflate.js'; /** * @classdesc diff --git a/src/ol/geom/Geometry.js b/src/ol/geom/Geometry.js index 846c53ff54..540559670d 100644 --- a/src/ol/geom/Geometry.js +++ b/src/ol/geom/Geometry.js @@ -4,7 +4,7 @@ import {abstract} from '../util.js'; import BaseObject from '../Object.js'; import {createEmpty, getHeight, returnOrUpdate} from '../extent.js'; -import {transform2D} from '../geom/flat/transform.js'; +import {transform2D} from './flat/transform.js'; import {get as getProjection, getTransform} from '../proj.js'; import Units from '../proj/Units.js'; import {create as createTransform, compose as composeTransform} from '../transform.js'; diff --git a/src/ol/geom/GeometryCollection.js b/src/ol/geom/GeometryCollection.js index 6e362e09d3..cd0b2136a6 100644 --- a/src/ol/geom/GeometryCollection.js +++ b/src/ol/geom/GeometryCollection.js @@ -4,8 +4,8 @@ import {listen, unlisten} from '../events.js'; import EventType from '../events/EventType.js'; import {createOrUpdateEmpty, closestSquaredDistanceXY, extend, getCenter} from '../extent.js'; -import Geometry from '../geom/Geometry.js'; -import GeometryType from '../geom/GeometryType.js'; +import Geometry from './Geometry.js'; +import GeometryType from './GeometryType.js'; import {clear} from '../obj.js'; /** diff --git a/src/ol/geom/LineString.js b/src/ol/geom/LineString.js index 09ea967e8f..0fe7da857b 100644 --- a/src/ol/geom/LineString.js +++ b/src/ol/geom/LineString.js @@ -3,17 +3,17 @@ */ import {extend} from '../array.js'; import {closestSquaredDistanceXY} from '../extent.js'; -import GeometryLayout from '../geom/GeometryLayout.js'; -import GeometryType from '../geom/GeometryType.js'; -import SimpleGeometry from '../geom/SimpleGeometry.js'; -import {assignClosestPoint, maxSquaredDelta} from '../geom/flat/closest.js'; -import {deflateCoordinates} from '../geom/flat/deflate.js'; -import {inflateCoordinates} from '../geom/flat/inflate.js'; -import {interpolatePoint, lineStringCoordinateAtM} from '../geom/flat/interpolate.js'; -import {intersectsLineString} from '../geom/flat/intersectsextent.js'; -import {lineStringLength} from '../geom/flat/length.js'; -import {forEach as forEachSegment} from '../geom/flat/segments.js'; -import {douglasPeucker} from '../geom/flat/simplify.js'; +import GeometryLayout from './GeometryLayout.js'; +import GeometryType from './GeometryType.js'; +import SimpleGeometry from './SimpleGeometry.js'; +import {assignClosestPoint, maxSquaredDelta} from './flat/closest.js'; +import {deflateCoordinates} from './flat/deflate.js'; +import {inflateCoordinates} from './flat/inflate.js'; +import {interpolatePoint, lineStringCoordinateAtM} from './flat/interpolate.js'; +import {intersectsLineString} from './flat/intersectsextent.js'; +import {lineStringLength} from './flat/length.js'; +import {forEach as forEachSegment} from './flat/segments.js'; +import {douglasPeucker} from './flat/simplify.js'; /** * @classdesc diff --git a/src/ol/geom/LinearRing.js b/src/ol/geom/LinearRing.js index b4a361cd9e..40f99071a9 100644 --- a/src/ol/geom/LinearRing.js +++ b/src/ol/geom/LinearRing.js @@ -2,14 +2,14 @@ * @module ol/geom/LinearRing */ import {closestSquaredDistanceXY} from '../extent.js'; -import GeometryLayout from '../geom/GeometryLayout.js'; -import GeometryType from '../geom/GeometryType.js'; -import SimpleGeometry from '../geom/SimpleGeometry.js'; -import {linearRing as linearRingArea} from '../geom/flat/area.js'; -import {assignClosestPoint, maxSquaredDelta} from '../geom/flat/closest.js'; -import {deflateCoordinates} from '../geom/flat/deflate.js'; -import {inflateCoordinates} from '../geom/flat/inflate.js'; -import {douglasPeucker} from '../geom/flat/simplify.js'; +import GeometryLayout from './GeometryLayout.js'; +import GeometryType from './GeometryType.js'; +import SimpleGeometry from './SimpleGeometry.js'; +import {linearRing as linearRingArea} from './flat/area.js'; +import {assignClosestPoint, maxSquaredDelta} from './flat/closest.js'; +import {deflateCoordinates} from './flat/deflate.js'; +import {inflateCoordinates} from './flat/inflate.js'; +import {douglasPeucker} from './flat/simplify.js'; /** * @classdesc diff --git a/src/ol/geom/MultiLineString.js b/src/ol/geom/MultiLineString.js index 33f7273d43..449338bf1b 100644 --- a/src/ol/geom/MultiLineString.js +++ b/src/ol/geom/MultiLineString.js @@ -3,16 +3,16 @@ */ import {extend} from '../array.js'; import {closestSquaredDistanceXY} from '../extent.js'; -import GeometryLayout from '../geom/GeometryLayout.js'; -import GeometryType from '../geom/GeometryType.js'; -import LineString from '../geom/LineString.js'; -import SimpleGeometry from '../geom/SimpleGeometry.js'; -import {assignClosestArrayPoint, arrayMaxSquaredDelta} from '../geom/flat/closest.js'; -import {deflateCoordinatesArray} from '../geom/flat/deflate.js'; -import {inflateCoordinatesArray} from '../geom/flat/inflate.js'; -import {interpolatePoint, lineStringsCoordinateAtM} from '../geom/flat/interpolate.js'; -import {intersectsLineStringArray} from '../geom/flat/intersectsextent.js'; -import {douglasPeuckerArray} from '../geom/flat/simplify.js'; +import GeometryLayout from './GeometryLayout.js'; +import GeometryType from './GeometryType.js'; +import LineString from './LineString.js'; +import SimpleGeometry from './SimpleGeometry.js'; +import {assignClosestArrayPoint, arrayMaxSquaredDelta} from './flat/closest.js'; +import {deflateCoordinatesArray} from './flat/deflate.js'; +import {inflateCoordinatesArray} from './flat/inflate.js'; +import {interpolatePoint, lineStringsCoordinateAtM} from './flat/interpolate.js'; +import {intersectsLineStringArray} from './flat/intersectsextent.js'; +import {douglasPeuckerArray} from './flat/simplify.js'; /** * @classdesc diff --git a/src/ol/geom/MultiPoint.js b/src/ol/geom/MultiPoint.js index 7788a37d93..e433e51bf3 100644 --- a/src/ol/geom/MultiPoint.js +++ b/src/ol/geom/MultiPoint.js @@ -3,11 +3,11 @@ */ import {extend} from '../array.js'; import {closestSquaredDistanceXY, containsXY} from '../extent.js'; -import GeometryType from '../geom/GeometryType.js'; -import Point from '../geom/Point.js'; -import SimpleGeometry from '../geom/SimpleGeometry.js'; -import {deflateCoordinates} from '../geom/flat/deflate.js'; -import {inflateCoordinates} from '../geom/flat/inflate.js'; +import GeometryType from './GeometryType.js'; +import Point from './Point.js'; +import SimpleGeometry from './SimpleGeometry.js'; +import {deflateCoordinates} from './flat/deflate.js'; +import {inflateCoordinates} from './flat/inflate.js'; import {squaredDistance as squaredDx} from '../math.js'; /** diff --git a/src/ol/geom/MultiPolygon.js b/src/ol/geom/MultiPolygon.js index cc172491af..97393ef2f2 100644 --- a/src/ol/geom/MultiPolygon.js +++ b/src/ol/geom/MultiPolygon.js @@ -3,21 +3,21 @@ */ import {extend} from '../array.js'; import {closestSquaredDistanceXY} from '../extent.js'; -import GeometryLayout from '../geom/GeometryLayout.js'; -import GeometryType from '../geom/GeometryType.js'; -import MultiPoint from '../geom/MultiPoint.js'; -import Polygon from '../geom/Polygon.js'; -import SimpleGeometry from '../geom/SimpleGeometry.js'; -import {linearRingss as linearRingssArea} from '../geom/flat/area.js'; -import {linearRingss as linearRingssCenter} from '../geom/flat/center.js'; -import {assignClosestMultiArrayPoint, multiArrayMaxSquaredDelta} from '../geom/flat/closest.js'; -import {linearRingssContainsXY} from '../geom/flat/contains.js'; -import {deflateMultiCoordinatesArray} from '../geom/flat/deflate.js'; -import {inflateMultiCoordinatesArray} from '../geom/flat/inflate.js'; -import {getInteriorPointsOfMultiArray} from '../geom/flat/interiorpoint.js'; -import {intersectsLinearRingMultiArray} from '../geom/flat/intersectsextent.js'; -import {linearRingsAreOriented, orientLinearRingsArray} from '../geom/flat/orient.js'; -import {quantizeMultiArray} from '../geom/flat/simplify.js'; +import GeometryLayout from './GeometryLayout.js'; +import GeometryType from './GeometryType.js'; +import MultiPoint from './MultiPoint.js'; +import Polygon from './Polygon.js'; +import SimpleGeometry from './SimpleGeometry.js'; +import {linearRingss as linearRingssArea} from './flat/area.js'; +import {linearRingss as linearRingssCenter} from './flat/center.js'; +import {assignClosestMultiArrayPoint, multiArrayMaxSquaredDelta} from './flat/closest.js'; +import {linearRingssContainsXY} from './flat/contains.js'; +import {deflateMultiCoordinatesArray} from './flat/deflate.js'; +import {inflateMultiCoordinatesArray} from './flat/inflate.js'; +import {getInteriorPointsOfMultiArray} from './flat/interiorpoint.js'; +import {intersectsLinearRingMultiArray} from './flat/intersectsextent.js'; +import {linearRingsAreOriented, orientLinearRingsArray} from './flat/orient.js'; +import {quantizeMultiArray} from './flat/simplify.js'; /** * @classdesc diff --git a/src/ol/geom/Point.js b/src/ol/geom/Point.js index 66f89516cc..92b27d6a0e 100644 --- a/src/ol/geom/Point.js +++ b/src/ol/geom/Point.js @@ -2,9 +2,9 @@ * @module ol/geom/Point */ import {createOrUpdateFromCoordinate, containsXY} from '../extent.js'; -import GeometryType from '../geom/GeometryType.js'; -import SimpleGeometry from '../geom/SimpleGeometry.js'; -import {deflateCoordinate} from '../geom/flat/deflate.js'; +import GeometryType from './GeometryType.js'; +import SimpleGeometry from './SimpleGeometry.js'; +import {deflateCoordinate} from './flat/deflate.js'; import {squaredDistance as squaredDx} from '../math.js'; /** diff --git a/src/ol/geom/Polygon.js b/src/ol/geom/Polygon.js index e84bd66380..bc240593e1 100644 --- a/src/ol/geom/Polygon.js +++ b/src/ol/geom/Polygon.js @@ -3,21 +3,21 @@ */ import {extend} from '../array.js'; import {closestSquaredDistanceXY, getCenter} from '../extent.js'; -import GeometryLayout from '../geom/GeometryLayout.js'; -import GeometryType from '../geom/GeometryType.js'; -import LinearRing from '../geom/LinearRing.js'; -import Point from '../geom/Point.js'; -import SimpleGeometry from '../geom/SimpleGeometry.js'; +import GeometryLayout from './GeometryLayout.js'; +import GeometryType from './GeometryType.js'; +import LinearRing from './LinearRing.js'; +import Point from './Point.js'; +import SimpleGeometry from './SimpleGeometry.js'; import {offset as sphereOffset} from '../sphere.js'; -import {linearRings as linearRingsArea} from '../geom/flat/area.js'; -import {assignClosestArrayPoint, arrayMaxSquaredDelta} from '../geom/flat/closest.js'; -import {linearRingsContainsXY} from '../geom/flat/contains.js'; -import {deflateCoordinatesArray} from '../geom/flat/deflate.js'; -import {inflateCoordinatesArray} from '../geom/flat/inflate.js'; -import {getInteriorPointOfArray} from '../geom/flat/interiorpoint.js'; -import {intersectsLinearRingArray} from '../geom/flat/intersectsextent.js'; -import {linearRingIsOriented, orientLinearRings} from '../geom/flat/orient.js'; -import {quantizeArray} from '../geom/flat/simplify.js'; +import {linearRings as linearRingsArea} from './flat/area.js'; +import {assignClosestArrayPoint, arrayMaxSquaredDelta} from './flat/closest.js'; +import {linearRingsContainsXY} from './flat/contains.js'; +import {deflateCoordinatesArray} from './flat/deflate.js'; +import {inflateCoordinatesArray} from './flat/inflate.js'; +import {getInteriorPointOfArray} from './flat/interiorpoint.js'; +import {intersectsLinearRingArray} from './flat/intersectsextent.js'; +import {linearRingIsOriented, orientLinearRings} from './flat/orient.js'; +import {quantizeArray} from './flat/simplify.js'; import {modulo} from '../math.js'; /** diff --git a/src/ol/geom/SimpleGeometry.js b/src/ol/geom/SimpleGeometry.js index e9be66396e..58eddeefb8 100644 --- a/src/ol/geom/SimpleGeometry.js +++ b/src/ol/geom/SimpleGeometry.js @@ -3,9 +3,9 @@ */ import {abstract} from '../util.js'; import {createOrUpdateFromFlatCoordinates, getCenter} from '../extent.js'; -import Geometry from '../geom/Geometry.js'; -import GeometryLayout from '../geom/GeometryLayout.js'; -import {rotate, scale, translate, transform2D} from '../geom/flat/transform.js'; +import Geometry from './Geometry.js'; +import GeometryLayout from './GeometryLayout.js'; +import {rotate, scale, translate, transform2D} from './flat/transform.js'; import {clear} from '../obj.js'; /** diff --git a/src/ol/geom/flat/interiorpoint.js b/src/ol/geom/flat/interiorpoint.js index 07b5e20c81..5c33eed550 100644 --- a/src/ol/geom/flat/interiorpoint.js +++ b/src/ol/geom/flat/interiorpoint.js @@ -2,7 +2,7 @@ * @module ol/geom/flat/interiorpoint */ import {numberSafeCompareFunction} from '../../array.js'; -import {linearRingsContainsXY} from '../flat/contains.js'; +import {linearRingsContainsXY} from './contains.js'; /** diff --git a/src/ol/geom/flat/intersectsextent.js b/src/ol/geom/flat/intersectsextent.js index 4c26b4d791..740da34727 100644 --- a/src/ol/geom/flat/intersectsextent.js +++ b/src/ol/geom/flat/intersectsextent.js @@ -2,8 +2,8 @@ * @module ol/geom/flat/intersectsextent */ import {containsExtent, createEmpty, extendFlatCoordinates, intersects, intersectsSegment} from '../../extent.js'; -import {linearRingContainsXY, linearRingContainsExtent} from '../flat/contains.js'; -import {forEach as forEachSegment} from '../flat/segments.js'; +import {linearRingContainsXY, linearRingContainsExtent} from './contains.js'; +import {forEach as forEachSegment} from './segments.js'; /** diff --git a/src/ol/geom/flat/orient.js b/src/ol/geom/flat/orient.js index c7ba89bb03..1ef11c2438 100644 --- a/src/ol/geom/flat/orient.js +++ b/src/ol/geom/flat/orient.js @@ -1,7 +1,7 @@ /** * @module ol/geom/flat/orient */ -import {coordinates as reverseCoordinates} from '../flat/reverse.js'; +import {coordinates as reverseCoordinates} from './reverse.js'; /** diff --git a/src/ol/geom/flat/topology.js b/src/ol/geom/flat/topology.js index 4149a4c24b..d0fa844335 100644 --- a/src/ol/geom/flat/topology.js +++ b/src/ol/geom/flat/topology.js @@ -1,7 +1,7 @@ /** * @module ol/geom/flat/topology */ -import {linearRing as linearRingArea} from '../flat/area.js'; +import {linearRing as linearRingArea} from './area.js'; /** * Check if the linestring is a boundary. diff --git a/src/ol/interaction/DoubleClickZoom.js b/src/ol/interaction/DoubleClickZoom.js index 4958842443..fd80b0af38 100644 --- a/src/ol/interaction/DoubleClickZoom.js +++ b/src/ol/interaction/DoubleClickZoom.js @@ -2,7 +2,7 @@ * @module ol/interaction/DoubleClickZoom */ import MapBrowserEventType from '../MapBrowserEventType.js'; -import Interaction, {zoomByDelta} from '../interaction/Interaction.js'; +import Interaction, {zoomByDelta} from './Interaction.js'; /** diff --git a/src/ol/interaction/DragAndDrop.js b/src/ol/interaction/DragAndDrop.js index 989f2dbf18..755c7b8963 100644 --- a/src/ol/interaction/DragAndDrop.js +++ b/src/ol/interaction/DragAndDrop.js @@ -7,7 +7,7 @@ import {TRUE} from '../functions.js'; import {listen, unlistenByKey} from '../events.js'; import Event from '../events/Event.js'; import EventType from '../events/EventType.js'; -import Interaction from '../interaction/Interaction.js'; +import Interaction from './Interaction.js'; import {get as getProjection} from '../proj.js'; diff --git a/src/ol/interaction/DragBox.js b/src/ol/interaction/DragBox.js index beb78a65c0..e08cb7f1a2 100644 --- a/src/ol/interaction/DragBox.js +++ b/src/ol/interaction/DragBox.js @@ -5,7 +5,7 @@ import Event from '../events/Event.js'; import {always, mouseOnly, mouseActionButton} from '../events/condition.js'; import {VOID} from '../functions.js'; -import PointerInteraction from '../interaction/Pointer.js'; +import PointerInteraction from './Pointer.js'; import RenderBox from '../render/Box.js'; diff --git a/src/ol/interaction/DragPan.js b/src/ol/interaction/DragPan.js index 575e2af08d..d889830f33 100644 --- a/src/ol/interaction/DragPan.js +++ b/src/ol/interaction/DragPan.js @@ -6,7 +6,7 @@ import {scale as scaleCoordinate, rotate as rotateCoordinate, add as addCoordina import {easeOut} from '../easing.js'; import {noModifierKeys} from '../events/condition.js'; import {FALSE} from '../functions.js'; -import PointerInteraction, {centroid as centroidFromPointers} from '../interaction/Pointer.js'; +import PointerInteraction, {centroid as centroidFromPointers} from './Pointer.js'; /** diff --git a/src/ol/interaction/DragRotate.js b/src/ol/interaction/DragRotate.js index a630fda14d..68995ccf08 100644 --- a/src/ol/interaction/DragRotate.js +++ b/src/ol/interaction/DragRotate.js @@ -5,8 +5,8 @@ import {disable} from '../rotationconstraint.js'; import ViewHint from '../ViewHint.js'; import {altShiftKeysOnly, mouseOnly, mouseActionButton} from '../events/condition.js'; import {FALSE} from '../functions.js'; -import {rotate, rotateWithoutConstraints} from '../interaction/Interaction.js'; -import PointerInteraction from '../interaction/Pointer.js'; +import {rotate, rotateWithoutConstraints} from './Interaction.js'; +import PointerInteraction from './Pointer.js'; /** diff --git a/src/ol/interaction/DragRotateAndZoom.js b/src/ol/interaction/DragRotateAndZoom.js index 7463ce9f1b..cf04606327 100644 --- a/src/ol/interaction/DragRotateAndZoom.js +++ b/src/ol/interaction/DragRotateAndZoom.js @@ -4,8 +4,8 @@ import {disable} from '../rotationconstraint.js'; import ViewHint from '../ViewHint.js'; import {shiftKeyOnly, mouseOnly} from '../events/condition.js'; -import {rotate, rotateWithoutConstraints, zoom, zoomWithoutConstraints} from '../interaction/Interaction.js'; -import PointerInteraction from '../interaction/Pointer.js'; +import {rotate, rotateWithoutConstraints, zoom, zoomWithoutConstraints} from './Interaction.js'; +import PointerInteraction from './Pointer.js'; /** diff --git a/src/ol/interaction/DragZoom.js b/src/ol/interaction/DragZoom.js index a3f0a3d702..83b70c5b47 100644 --- a/src/ol/interaction/DragZoom.js +++ b/src/ol/interaction/DragZoom.js @@ -4,7 +4,7 @@ import {easeOut} from '../easing.js'; import {shiftKeyOnly} from '../events/condition.js'; import {createOrUpdateFromCoordinates, getBottomLeft, getCenter, getTopRight, scaleFromCenter} from '../extent.js'; -import DragBox from '../interaction/DragBox.js'; +import DragBox from './DragBox.js'; /** diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index 001c9259a2..4ef5e4f717 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -21,8 +21,8 @@ import MultiPolygon from '../geom/MultiPolygon.js'; import {POINTER_TYPE} from '../pointer/MouseSource.js'; import Point from '../geom/Point.js'; import Polygon, {fromCircle, makeRegular} from '../geom/Polygon.js'; -import PointerInteraction from '../interaction/Pointer.js'; -import InteractionProperty from '../interaction/Property.js'; +import PointerInteraction from './Pointer.js'; +import InteractionProperty from './Property.js'; import VectorLayer from '../layer/Vector.js'; import VectorSource from '../source/Vector.js'; import {createEditingStyle} from '../style/Style.js'; diff --git a/src/ol/interaction/Extent.js b/src/ol/interaction/Extent.js index 630ec46039..1d130c9f91 100644 --- a/src/ol/interaction/Extent.js +++ b/src/ol/interaction/Extent.js @@ -9,7 +9,7 @@ import {boundingExtent, getArea} from '../extent.js'; import GeometryType from '../geom/GeometryType.js'; import Point from '../geom/Point.js'; import {fromExtent as polygonFromExtent} from '../geom/Polygon.js'; -import PointerInteraction from '../interaction/Pointer.js'; +import PointerInteraction from './Pointer.js'; import VectorLayer from '../layer/Vector.js'; import VectorSource from '../source/Vector.js'; import {createEditingStyle} from '../style/Style.js'; diff --git a/src/ol/interaction/Interaction.js b/src/ol/interaction/Interaction.js index eeaba15d55..7b741b1353 100644 --- a/src/ol/interaction/Interaction.js +++ b/src/ol/interaction/Interaction.js @@ -3,7 +3,7 @@ */ import BaseObject from '../Object.js'; import {easeOut, linear} from '../easing.js'; -import InteractionProperty from '../interaction/Property.js'; +import InteractionProperty from './Property.js'; import {clamp} from '../math.js'; diff --git a/src/ol/interaction/KeyboardPan.js b/src/ol/interaction/KeyboardPan.js index b2721aa123..6363ed9a5b 100644 --- a/src/ol/interaction/KeyboardPan.js +++ b/src/ol/interaction/KeyboardPan.js @@ -5,7 +5,7 @@ import {rotate as rotateCoordinate} from '../coordinate.js'; import EventType from '../events/EventType.js'; import KeyCode from '../events/KeyCode.js'; import {noModifierKeys, targetNotEditable} from '../events/condition.js'; -import Interaction, {pan} from '../interaction/Interaction.js'; +import Interaction, {pan} from './Interaction.js'; /** diff --git a/src/ol/interaction/KeyboardZoom.js b/src/ol/interaction/KeyboardZoom.js index 04c4e4057d..38e281a955 100644 --- a/src/ol/interaction/KeyboardZoom.js +++ b/src/ol/interaction/KeyboardZoom.js @@ -3,7 +3,7 @@ */ import EventType from '../events/EventType.js'; import {targetNotEditable} from '../events/condition.js'; -import Interaction, {zoomByDelta} from '../interaction/Interaction.js'; +import Interaction, {zoomByDelta} from './Interaction.js'; /** diff --git a/src/ol/interaction/Modify.js b/src/ol/interaction/Modify.js index 5ed11e3f1e..ba0b7ed285 100644 --- a/src/ol/interaction/Modify.js +++ b/src/ol/interaction/Modify.js @@ -15,7 +15,7 @@ import {always, primaryAction, altKeyOnly, singleClick} from '../events/conditio import {boundingExtent, buffer, createOrUpdateFromCoordinate} from '../extent.js'; import GeometryType from '../geom/GeometryType.js'; import Point from '../geom/Point.js'; -import PointerInteraction from '../interaction/Pointer.js'; +import PointerInteraction from './Pointer.js'; import VectorLayer from '../layer/Vector.js'; import VectorSource from '../source/Vector.js'; import VectorEventType from '../source/VectorEventType.js'; diff --git a/src/ol/interaction/MouseWheelZoom.js b/src/ol/interaction/MouseWheelZoom.js index 3d7c75d5a9..726ee1ba62 100644 --- a/src/ol/interaction/MouseWheelZoom.js +++ b/src/ol/interaction/MouseWheelZoom.js @@ -6,7 +6,7 @@ import {always} from '../events/condition.js'; import {easeOut} from '../easing.js'; import EventType from '../events/EventType.js'; import {DEVICE_PIXEL_RATIO, FIREFOX, SAFARI} from '../has.js'; -import Interaction, {zoomByDelta} from '../interaction/Interaction.js'; +import Interaction, {zoomByDelta} from './Interaction.js'; import {clamp} from '../math.js'; diff --git a/src/ol/interaction/PinchRotate.js b/src/ol/interaction/PinchRotate.js index fbd99ecebb..82f8c254e5 100644 --- a/src/ol/interaction/PinchRotate.js +++ b/src/ol/interaction/PinchRotate.js @@ -3,8 +3,8 @@ */ import ViewHint from '../ViewHint.js'; import {FALSE} from '../functions.js'; -import {rotate, rotateWithoutConstraints} from '../interaction/Interaction.js'; -import PointerInteraction, {centroid as centroidFromPointers} from '../interaction/Pointer.js'; +import {rotate, rotateWithoutConstraints} from './Interaction.js'; +import PointerInteraction, {centroid as centroidFromPointers} from './Pointer.js'; import {disable} from '../rotationconstraint.js'; diff --git a/src/ol/interaction/PinchZoom.js b/src/ol/interaction/PinchZoom.js index 6114870fdf..ed9446e318 100644 --- a/src/ol/interaction/PinchZoom.js +++ b/src/ol/interaction/PinchZoom.js @@ -3,8 +3,8 @@ */ import ViewHint from '../ViewHint.js'; import {FALSE} from '../functions.js'; -import {zoom, zoomWithoutConstraints} from '../interaction/Interaction.js'; -import PointerInteraction, {centroid as centroidFromPointers} from '../interaction/Pointer.js'; +import {zoom, zoomWithoutConstraints} from './Interaction.js'; +import PointerInteraction, {centroid as centroidFromPointers} from './Pointer.js'; /** diff --git a/src/ol/interaction/Pointer.js b/src/ol/interaction/Pointer.js index ecaf8df1d2..02a5636ea5 100644 --- a/src/ol/interaction/Pointer.js +++ b/src/ol/interaction/Pointer.js @@ -2,7 +2,7 @@ * @module ol/interaction/Pointer */ import MapBrowserEventType from '../MapBrowserEventType.js'; -import Interaction from '../interaction/Interaction.js'; +import Interaction from './Interaction.js'; import {getValues} from '../obj.js'; diff --git a/src/ol/interaction/Select.js b/src/ol/interaction/Select.js index a68a65430e..28dcb5ed7b 100644 --- a/src/ol/interaction/Select.js +++ b/src/ol/interaction/Select.js @@ -9,7 +9,7 @@ import Event from '../events/Event.js'; import {singleClick, never, shiftKeyOnly, pointerMove} from '../events/condition.js'; import {TRUE} from '../functions.js'; import GeometryType from '../geom/GeometryType.js'; -import Interaction from '../interaction/Interaction.js'; +import Interaction from './Interaction.js'; import VectorLayer from '../layer/Vector.js'; import {clear} from '../obj.js'; import VectorSource from '../source/Vector.js'; diff --git a/src/ol/interaction/Snap.js b/src/ol/interaction/Snap.js index 944f18387a..59c06bace1 100644 --- a/src/ol/interaction/Snap.js +++ b/src/ol/interaction/Snap.js @@ -10,7 +10,7 @@ import {boundingExtent, createEmpty} from '../extent.js'; import {TRUE, FALSE} from '../functions.js'; import GeometryType from '../geom/GeometryType.js'; import {fromCircle} from '../geom/Polygon.js'; -import PointerInteraction from '../interaction/Pointer.js'; +import PointerInteraction from './Pointer.js'; import {getValues} from '../obj.js'; import VectorEventType from '../source/VectorEventType.js'; import RBush from '../structs/RBush.js'; diff --git a/src/ol/interaction/Translate.js b/src/ol/interaction/Translate.js index 73b843ce02..9d180a5ddd 100644 --- a/src/ol/interaction/Translate.js +++ b/src/ol/interaction/Translate.js @@ -7,8 +7,8 @@ import {listen} from '../events.js'; import Event from '../events/Event.js'; import {TRUE} from '../functions.js'; import {includes} from '../array.js'; -import PointerInteraction from '../interaction/Pointer.js'; -import InteractionProperty from '../interaction/Property.js'; +import PointerInteraction from './Pointer.js'; +import InteractionProperty from './Property.js'; /** diff --git a/src/ol/layer/Base.js b/src/ol/layer/Base.js index ad478e9652..f733eb2421 100644 --- a/src/ol/layer/Base.js +++ b/src/ol/layer/Base.js @@ -3,7 +3,7 @@ */ import {abstract} from '../util.js'; import BaseObject from '../Object.js'; -import LayerProperty from '../layer/Property.js'; +import LayerProperty from './Property.js'; import {clamp} from '../math.js'; import {assign} from '../obj.js'; diff --git a/src/ol/layer/Group.js b/src/ol/layer/Group.js index ce765b103a..7878961535 100644 --- a/src/ol/layer/Group.js +++ b/src/ol/layer/Group.js @@ -10,7 +10,7 @@ import {assert} from '../asserts.js'; import {listen, unlistenByKey} from '../events.js'; import EventType from '../events/EventType.js'; import {getIntersection} from '../extent.js'; -import BaseLayer from '../layer/Base.js'; +import BaseLayer from './Base.js'; import {assign, clear} from '../obj.js'; import SourceState from '../source/State.js'; diff --git a/src/ol/layer/Heatmap.js b/src/ol/layer/Heatmap.js index fcaa49bafd..db062774c7 100644 --- a/src/ol/layer/Heatmap.js +++ b/src/ol/layer/Heatmap.js @@ -4,7 +4,7 @@ import {listen} from '../events.js'; import {getChangeEventType} from '../Object.js'; import {createCanvasContext2D} from '../dom.js'; -import VectorLayer from '../layer/Vector.js'; +import VectorLayer from './Vector.js'; import {clamp} from '../math.js'; import {assign} from '../obj.js'; import RenderEventType from '../render/EventType.js'; diff --git a/src/ol/layer/Image.js b/src/ol/layer/Image.js index 6b44fc36e2..221c2d1a97 100644 --- a/src/ol/layer/Image.js +++ b/src/ol/layer/Image.js @@ -2,7 +2,7 @@ * @module ol/layer/Image */ import LayerType from '../LayerType.js'; -import Layer from '../layer/Layer.js'; +import Layer from './Layer.js'; /** diff --git a/src/ol/layer/Layer.js b/src/ol/layer/Layer.js index 1d890159be..8ef367acd4 100644 --- a/src/ol/layer/Layer.js +++ b/src/ol/layer/Layer.js @@ -5,8 +5,8 @@ import {listen, unlistenByKey} from '../events.js'; import EventType from '../events/EventType.js'; import {getUid} from '../util.js'; import {getChangeEventType} from '../Object.js'; -import BaseLayer from '../layer/Base.js'; -import LayerProperty from '../layer/Property.js'; +import BaseLayer from './Base.js'; +import LayerProperty from './Property.js'; import {assign} from '../obj.js'; import RenderEventType from '../render/EventType.js'; import SourceState from '../source/State.js'; diff --git a/src/ol/layer/Tile.js b/src/ol/layer/Tile.js index 24e618760a..36833297cd 100644 --- a/src/ol/layer/Tile.js +++ b/src/ol/layer/Tile.js @@ -2,8 +2,8 @@ * @module ol/layer/Tile */ import LayerType from '../LayerType.js'; -import Layer from '../layer/Layer.js'; -import TileProperty from '../layer/TileProperty.js'; +import Layer from './Layer.js'; +import TileProperty from './TileProperty.js'; import {assign} from '../obj.js'; diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js index ea4cea88c4..bdf0c62344 100644 --- a/src/ol/layer/Vector.js +++ b/src/ol/layer/Vector.js @@ -2,8 +2,8 @@ * @module ol/layer/Vector */ import LayerType from '../LayerType.js'; -import Layer from '../layer/Layer.js'; -import VectorRenderType from '../layer/VectorRenderType.js'; +import Layer from './Layer.js'; +import VectorRenderType from './VectorRenderType.js'; import {assign} from '../obj.js'; import {createDefaultStyle, toFunction as toStyleFunction} from '../style/Style.js'; diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js index d755399db6..1397dd14cb 100644 --- a/src/ol/layer/VectorTile.js +++ b/src/ol/layer/VectorTile.js @@ -3,9 +3,9 @@ */ import LayerType from '../LayerType.js'; import {assert} from '../asserts.js'; -import TileProperty from '../layer/TileProperty.js'; -import VectorLayer from '../layer/Vector.js'; -import VectorTileRenderType from '../layer/VectorTileRenderType.js'; +import TileProperty from './TileProperty.js'; +import VectorLayer from './Vector.js'; +import VectorTileRenderType from './VectorTileRenderType.js'; import {assign} from '../obj.js'; diff --git a/src/ol/pointer/MouseSource.js b/src/ol/pointer/MouseSource.js index 169e4b55a6..3e27401259 100644 --- a/src/ol/pointer/MouseSource.js +++ b/src/ol/pointer/MouseSource.js @@ -32,7 +32,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 EventSource from '../pointer/EventSource.js'; +import EventSource from './EventSource.js'; /** diff --git a/src/ol/pointer/MsSource.js b/src/ol/pointer/MsSource.js index 385590222d..30131a365b 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 EventSource from '../pointer/EventSource.js'; +import EventSource from './EventSource.js'; /** diff --git a/src/ol/pointer/NativeSource.js b/src/ol/pointer/NativeSource.js index 2fa0fb0b0f..4e133f5998 100644 --- a/src/ol/pointer/NativeSource.js +++ b/src/ol/pointer/NativeSource.js @@ -32,7 +32,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 EventSource from '../pointer/EventSource.js'; +import EventSource from './EventSource.js'; /** * Handler for `pointerdown`. diff --git a/src/ol/pointer/PointerEventHandler.js b/src/ol/pointer/PointerEventHandler.js index 46636d4c3d..6f3014905c 100644 --- a/src/ol/pointer/PointerEventHandler.js +++ b/src/ol/pointer/PointerEventHandler.js @@ -35,12 +35,12 @@ import {listen, unlisten} from '../events.js'; import EventTarget from '../events/Target.js'; import {POINTER, MSPOINTER, TOUCH} from '../has.js'; -import PointerEventType from '../pointer/EventType.js'; -import MouseSource, {prepareEvent as prepareMouseEvent} from '../pointer/MouseSource.js'; -import MsSource from '../pointer/MsSource.js'; -import NativeSource from '../pointer/NativeSource.js'; -import PointerEvent from '../pointer/PointerEvent.js'; -import TouchSource from '../pointer/TouchSource.js'; +import PointerEventType from './EventType.js'; +import MouseSource, {prepareEvent as prepareMouseEvent} from './MouseSource.js'; +import MsSource from './MsSource.js'; +import NativeSource from './NativeSource.js'; +import PointerEvent from './PointerEvent.js'; +import TouchSource from './TouchSource.js'; /** diff --git a/src/ol/pointer/TouchSource.js b/src/ol/pointer/TouchSource.js index 332bd051aa..0e9ea52ff9 100644 --- a/src/ol/pointer/TouchSource.js +++ b/src/ol/pointer/TouchSource.js @@ -33,8 +33,8 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import {remove} from '../array.js'; -import EventSource from '../pointer/EventSource.js'; -import {POINTER_ID} from '../pointer/MouseSource.js'; +import EventSource from './EventSource.js'; +import {POINTER_ID} from './MouseSource.js'; /** diff --git a/src/ol/proj/Projection.js b/src/ol/proj/Projection.js index c5fc066a2f..ce4b2cb305 100644 --- a/src/ol/proj/Projection.js +++ b/src/ol/proj/Projection.js @@ -1,7 +1,7 @@ /** * @module ol/proj/Projection */ -import {METERS_PER_UNIT} from '../proj/Units.js'; +import {METERS_PER_UNIT} from './Units.js'; /** diff --git a/src/ol/proj/epsg3857.js b/src/ol/proj/epsg3857.js index 89deca11ef..28366ecdc9 100644 --- a/src/ol/proj/epsg3857.js +++ b/src/ol/proj/epsg3857.js @@ -2,8 +2,8 @@ * @module ol/proj/epsg3857 */ import {cosh} from '../math.js'; -import Projection from '../proj/Projection.js'; -import Units from '../proj/Units.js'; +import Projection from './Projection.js'; +import Units from './Units.js'; /** diff --git a/src/ol/proj/epsg4326.js b/src/ol/proj/epsg4326.js index 4d946e4d4b..a5e3b2652e 100644 --- a/src/ol/proj/epsg4326.js +++ b/src/ol/proj/epsg4326.js @@ -1,8 +1,8 @@ /** * @module ol/proj/epsg4326 */ -import Projection from '../proj/Projection.js'; -import Units from '../proj/Units.js'; +import Projection from './Projection.js'; +import Units from './Units.js'; /** diff --git a/src/ol/render/canvas/ImageReplay.js b/src/ol/render/canvas/ImageReplay.js index 28eb715195..807ea149c4 100644 --- a/src/ol/render/canvas/ImageReplay.js +++ b/src/ol/render/canvas/ImageReplay.js @@ -1,8 +1,8 @@ /** * @module ol/render/canvas/ImageReplay */ -import CanvasInstruction from '../canvas/Instruction.js'; -import CanvasReplay from '../canvas/Replay.js'; +import CanvasInstruction from './Instruction.js'; +import CanvasReplay from './Replay.js'; class CanvasImageReplay extends CanvasReplay { /** diff --git a/src/ol/render/canvas/LineStringReplay.js b/src/ol/render/canvas/LineStringReplay.js index 9470b17c50..57822418ae 100644 --- a/src/ol/render/canvas/LineStringReplay.js +++ b/src/ol/render/canvas/LineStringReplay.js @@ -1,8 +1,8 @@ /** * @module ol/render/canvas/LineStringReplay */ -import CanvasInstruction, {strokeInstruction, beginPathInstruction} from '../canvas/Instruction.js'; -import CanvasReplay from '../canvas/Replay.js'; +import CanvasInstruction, {strokeInstruction, beginPathInstruction} from './Instruction.js'; +import CanvasReplay from './Replay.js'; class CanvasLineStringReplay extends CanvasReplay { /** diff --git a/src/ol/render/canvas/PolygonReplay.js b/src/ol/render/canvas/PolygonReplay.js index 1d75374de5..1175a58fde 100644 --- a/src/ol/render/canvas/PolygonReplay.js +++ b/src/ol/render/canvas/PolygonReplay.js @@ -6,8 +6,8 @@ import {snap} from '../../geom/flat/simplify.js'; import {defaultFillStyle} from '../canvas.js'; import CanvasInstruction, { fillInstruction, strokeInstruction, beginPathInstruction, closePathInstruction -} from '../canvas/Instruction.js'; -import CanvasReplay from '../canvas/Replay.js'; +} from './Instruction.js'; +import CanvasReplay from './Replay.js'; class CanvasPolygonReplay extends CanvasReplay { diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js index 23fedc1cb8..079f60575a 100644 --- a/src/ol/render/canvas/Replay.js +++ b/src/ol/render/canvas/Replay.js @@ -18,7 +18,7 @@ import VectorContext from '../VectorContext.js'; import {drawImage, resetTransform, defaultPadding, defaultFillStyle, defaultStrokeStyle, defaultMiterLimit, defaultLineWidth, defaultLineJoin, defaultLineDashOffset, defaultLineDash, defaultLineCap} from '../canvas.js'; -import CanvasInstruction from '../canvas/Instruction.js'; +import CanvasInstruction from './Instruction.js'; import {TEXT_ALIGN} from '../replay.js'; import { create as createTransform, diff --git a/src/ol/render/canvas/ReplayGroup.js b/src/ol/render/canvas/ReplayGroup.js index ed1dda0060..5d055a7cdf 100644 --- a/src/ol/render/canvas/ReplayGroup.js +++ b/src/ol/render/canvas/ReplayGroup.js @@ -9,11 +9,11 @@ import {transform2D} from '../../geom/flat/transform.js'; import {isEmpty} from '../../obj.js'; import ReplayGroup from '../ReplayGroup.js'; import ReplayType from '../ReplayType.js'; -import CanvasReplay from '../canvas/Replay.js'; -import CanvasImageReplay from '../canvas/ImageReplay.js'; -import CanvasLineStringReplay from '../canvas/LineStringReplay.js'; -import CanvasPolygonReplay from '../canvas/PolygonReplay.js'; -import CanvasTextReplay from '../canvas/TextReplay.js'; +import CanvasReplay from './Replay.js'; +import CanvasImageReplay from './ImageReplay.js'; +import CanvasLineStringReplay from './LineStringReplay.js'; +import CanvasPolygonReplay from './PolygonReplay.js'; +import CanvasTextReplay from './TextReplay.js'; import {ORDER} from '../replay.js'; import {create as createTransform, compose as composeTransform} from '../../transform.js'; diff --git a/src/ol/render/canvas/TextReplay.js b/src/ol/render/canvas/TextReplay.js index e9cf45e306..e740f4a122 100644 --- a/src/ol/render/canvas/TextReplay.js +++ b/src/ol/render/canvas/TextReplay.js @@ -9,8 +9,8 @@ import {matchingChunk} from '../../geom/flat/straightchunk.js'; import GeometryType from '../../geom/GeometryType.js'; import {CANVAS_LINE_DASH} from '../../has.js'; import {labelCache, measureTextWidth, defaultTextAlign, measureTextHeight, defaultPadding, defaultLineCap, defaultLineDashOffset, defaultLineDash, defaultLineJoin, defaultFillStyle, checkFont, defaultFont, defaultLineWidth, defaultMiterLimit, defaultStrokeStyle, defaultTextBaseline} from '../canvas.js'; -import CanvasInstruction from '../canvas/Instruction.js'; -import CanvasReplay from '../canvas/Replay.js'; +import CanvasInstruction from './Instruction.js'; +import CanvasReplay from './Replay.js'; import {TEXT_ALIGN} from '../replay.js'; import TextPlacement from '../../style/TextPlacement.js'; diff --git a/src/ol/render/replay.js b/src/ol/render/replay.js index b761c58293..fbb15a69fb 100644 --- a/src/ol/render/replay.js +++ b/src/ol/render/replay.js @@ -1,7 +1,7 @@ /** * @module ol/render/replay */ -import ReplayType from '../render/ReplayType.js'; +import ReplayType from './ReplayType.js'; /** diff --git a/src/ol/render/webgl/CircleReplay.js b/src/ol/render/webgl/CircleReplay.js index 65af1041dd..e5251464f2 100644 --- a/src/ol/render/webgl/CircleReplay.js +++ b/src/ol/render/webgl/CircleReplay.js @@ -7,9 +7,9 @@ import {asArray} from '../../color.js'; import {intersects} from '../../extent.js'; import {isEmpty} from '../../obj.js'; import {translate} from '../../geom/flat/transform.js'; -import {fragment, vertex} from '../webgl/circlereplay/defaultshader.js'; -import Locations from '../webgl/circlereplay/defaultshader/Locations.js'; -import WebGLReplay from '../webgl/Replay.js'; +import {fragment, vertex} from './circlereplay/defaultshader.js'; +import Locations from './circlereplay/defaultshader/Locations.js'; +import WebGLReplay from './Replay.js'; import {DEFAULT_LINEDASH, DEFAULT_LINEDASHOFFSET, DEFAULT_STROKESTYLE, DEFAULT_FILLSTYLE, DEFAULT_LINEWIDTH} from '../webgl.js'; import {FLOAT} from '../../webgl.js'; diff --git a/src/ol/render/webgl/ImageReplay.js b/src/ol/render/webgl/ImageReplay.js index ad763dea23..23e966d480 100644 --- a/src/ol/render/webgl/ImageReplay.js +++ b/src/ol/render/webgl/ImageReplay.js @@ -2,7 +2,7 @@ * @module ol/render/webgl/ImageReplay */ import {getUid} from '../../util.js'; -import WebGLTextureReplay from '../webgl/TextureReplay.js'; +import WebGLTextureReplay from './TextureReplay.js'; import WebGLBuffer from '../../webgl/Buffer.js'; class WebGLImageReplay extends WebGLTextureReplay { diff --git a/src/ol/render/webgl/Immediate.js b/src/ol/render/webgl/Immediate.js index 05ddd8c26a..407cb843a7 100644 --- a/src/ol/render/webgl/Immediate.js +++ b/src/ol/render/webgl/Immediate.js @@ -6,7 +6,7 @@ import {intersects} from '../../extent.js'; import GeometryType from '../../geom/GeometryType.js'; import ReplayType from '../ReplayType.js'; import VectorContext from '../VectorContext.js'; -import WebGLReplayGroup from '../webgl/ReplayGroup.js'; +import WebGLReplayGroup from './ReplayGroup.js'; class WebGLImmediateRenderer extends VectorContext { /** diff --git a/src/ol/render/webgl/LineStringReplay.js b/src/ol/render/webgl/LineStringReplay.js index 15aa0a34ac..90c679f9e7 100644 --- a/src/ol/render/webgl/LineStringReplay.js +++ b/src/ol/render/webgl/LineStringReplay.js @@ -12,9 +12,9 @@ import {isEmpty} from '../../obj.js'; import {DEFAULT_LINECAP, DEFAULT_LINEDASH, DEFAULT_LINEDASHOFFSET, DEFAULT_LINEJOIN, DEFAULT_LINEWIDTH, DEFAULT_MITERLIMIT, DEFAULT_STROKESTYLE, triangleIsCounterClockwise} from '../webgl.js'; -import WebGLReplay from '../webgl/Replay.js'; -import {fragment, vertex} from '../webgl/linestringreplay/defaultshader.js'; -import Locations from '../webgl/linestringreplay/defaultshader/Locations.js'; +import WebGLReplay from './Replay.js'; +import {fragment, vertex} from './linestringreplay/defaultshader.js'; +import Locations from './linestringreplay/defaultshader/Locations.js'; import {FLOAT} from '../../webgl.js'; import WebGLBuffer from '../../webgl/Buffer.js'; diff --git a/src/ol/render/webgl/PolygonReplay.js b/src/ol/render/webgl/PolygonReplay.js index 5418b66edd..d72cfbe5ce 100644 --- a/src/ol/render/webgl/PolygonReplay.js +++ b/src/ol/render/webgl/PolygonReplay.js @@ -9,10 +9,10 @@ import {isEmpty} from '../../obj.js'; import {linearRingContainsXY} from '../../geom/flat/contains.js'; import {linearRingIsClockwise} from '../../geom/flat/orient.js'; import {translate} from '../../geom/flat/transform.js'; -import {fragment, vertex} from '../webgl/polygonreplay/defaultshader.js'; -import Locations from '../webgl/polygonreplay/defaultshader/Locations.js'; -import WebGLLineStringReplay from '../webgl/LineStringReplay.js'; -import WebGLReplay from '../webgl/Replay.js'; +import {fragment, vertex} from './polygonreplay/defaultshader.js'; +import Locations from './polygonreplay/defaultshader/Locations.js'; +import WebGLLineStringReplay from './LineStringReplay.js'; +import WebGLReplay from './Replay.js'; import {triangleIsCounterClockwise, EPSILON, DEFAULT_FILLSTYLE} from '../webgl.js'; import Stroke from '../../style/Stroke.js'; import LinkedList from '../../structs/LinkedList.js'; diff --git a/src/ol/render/webgl/ReplayGroup.js b/src/ol/render/webgl/ReplayGroup.js index 07528d59f9..16fa92713e 100644 --- a/src/ol/render/webgl/ReplayGroup.js +++ b/src/ol/render/webgl/ReplayGroup.js @@ -7,11 +7,11 @@ import {buffer, createOrUpdateFromCoordinate} from '../../extent.js'; import {isEmpty} from '../../obj.js'; import {ORDER} from '../replay.js'; import ReplayGroup from '../ReplayGroup.js'; -import WebGLCircleReplay from '../webgl/CircleReplay.js'; -import WebGLImageReplay from '../webgl/ImageReplay.js'; -import WebGLLineStringReplay from '../webgl/LineStringReplay.js'; -import WebGLPolygonReplay from '../webgl/PolygonReplay.js'; -import WebGLTextReplay from '../webgl/TextReplay.js'; +import WebGLCircleReplay from './CircleReplay.js'; +import WebGLImageReplay from './ImageReplay.js'; +import WebGLLineStringReplay from './LineStringReplay.js'; +import WebGLPolygonReplay from './PolygonReplay.js'; +import WebGLTextReplay from './TextReplay.js'; /** * @type {Array} diff --git a/src/ol/render/webgl/TextReplay.js b/src/ol/render/webgl/TextReplay.js index 9917cfefd0..8b2e195118 100644 --- a/src/ol/render/webgl/TextReplay.js +++ b/src/ol/render/webgl/TextReplay.js @@ -10,7 +10,7 @@ import {TEXT_ALIGN} from '../replay.js'; import {DEFAULT_FILLSTYLE, DEFAULT_FONT, DEFAULT_LINECAP, DEFAULT_LINEDASH, DEFAULT_LINEDASHOFFSET, DEFAULT_LINEJOIN, DEFAULT_LINEWIDTH, DEFAULT_MITERLIMIT, DEFAULT_STROKESTYLE, DEFAULT_TEXTALIGN, DEFAULT_TEXTBASELINE} from '../webgl.js'; -import WebGLTextureReplay from '../webgl/TextureReplay.js'; +import WebGLTextureReplay from './TextureReplay.js'; import AtlasManager from '../../style/AtlasManager.js'; import WebGLBuffer from '../../webgl/Buffer.js'; diff --git a/src/ol/render/webgl/TextureReplay.js b/src/ol/render/webgl/TextureReplay.js index 0e1f023716..3056c93ff3 100644 --- a/src/ol/render/webgl/TextureReplay.js +++ b/src/ol/render/webgl/TextureReplay.js @@ -4,9 +4,9 @@ import {abstract, getUid} from '../../util.js'; import {intersects} from '../../extent.js'; import {isEmpty} from '../../obj.js'; -import {fragment, vertex} from '../webgl/texturereplay/defaultshader.js'; -import Locations from '../webgl/texturereplay/defaultshader/Locations.js'; -import WebGLReplay from '../webgl/Replay.js'; +import {fragment, vertex} from './texturereplay/defaultshader.js'; +import Locations from './texturereplay/defaultshader/Locations.js'; +import WebGLReplay from './Replay.js'; import {CLAMP_TO_EDGE, FLOAT, TEXTURE_2D} from '../../webgl.js'; import {createTexture} from '../../webgl/Context.js'; diff --git a/src/ol/renderer/canvas/IntermediateCanvas.js b/src/ol/renderer/canvas/IntermediateCanvas.js index a4ca6bf514..2ce3c0c259 100644 --- a/src/ol/renderer/canvas/IntermediateCanvas.js +++ b/src/ol/renderer/canvas/IntermediateCanvas.js @@ -5,7 +5,7 @@ import {abstract} from '../../util.js'; import {scale as scaleCoordinate} from '../../coordinate.js'; import {createCanvasContext2D} from '../../dom.js'; import {containsExtent, intersects} from '../../extent.js'; -import CanvasLayerRenderer from '../canvas/Layer.js'; +import CanvasLayerRenderer from './Layer.js'; import {create as createTransform, apply as applyTransform} from '../../transform.js'; /** diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index 467fb52b33..4299e4d39f 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -8,7 +8,7 @@ import TileState from '../../TileState.js'; import ViewHint from '../../ViewHint.js'; import {createCanvasContext2D} from '../../dom.js'; import {containsExtent, createEmpty, equals, getIntersection, isEmpty} from '../../extent.js'; -import IntermediateCanvasRenderer from '../canvas/IntermediateCanvas.js'; +import IntermediateCanvasRenderer from './IntermediateCanvas.js'; import {create as createTransform, compose as composeTransform} from '../../transform.js'; /** diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 6af4ca10d4..5ecc53a56d 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -12,7 +12,7 @@ import {buffer, createEmpty, containsExtent, getWidth} from '../../extent.js'; import RenderEventType from '../../render/EventType.js'; import {labelCache, rotateAtOffset} from '../../render/canvas.js'; import CanvasReplayGroup from '../../render/canvas/ReplayGroup.js'; -import CanvasLayerRenderer from '../canvas/Layer.js'; +import CanvasLayerRenderer from './Layer.js'; import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js'; /** diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index f34afedfac..aa3c3ccf60 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -17,7 +17,7 @@ import ReplayType from '../../render/ReplayType.js'; import {labelCache, rotateAtOffset} from '../../render/canvas.js'; import CanvasReplayGroup, {replayDeclutter} from '../../render/canvas/ReplayGroup.js'; import {ORDER} from '../../render/replay.js'; -import CanvasTileLayerRenderer from '../canvas/TileLayer.js'; +import CanvasTileLayerRenderer from './TileLayer.js'; import {getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js'; import { create as createTransform, diff --git a/src/ol/renderer/webgl/ImageLayer.js b/src/ol/renderer/webgl/ImageLayer.js index 123a6c1872..cbd4378773 100644 --- a/src/ol/renderer/webgl/ImageLayer.js +++ b/src/ol/renderer/webgl/ImageLayer.js @@ -6,7 +6,7 @@ import LayerType from '../../LayerType.js'; import ViewHint from '../../ViewHint.js'; import {createCanvasContext2D} from '../../dom.js'; import {getIntersection, isEmpty} from '../../extent.js'; -import WebGLLayerRenderer from '../webgl/Layer.js'; +import WebGLLayerRenderer from './Layer.js'; import { create as createTransform, rotate as rotateTransform, diff --git a/src/ol/renderer/webgl/Layer.js b/src/ol/renderer/webgl/Layer.js index 457d6fb79e..3d26262a55 100644 --- a/src/ol/renderer/webgl/Layer.js +++ b/src/ol/renderer/webgl/Layer.js @@ -6,8 +6,8 @@ import RenderEvent from '../../render/Event.js'; import RenderEventType from '../../render/EventType.js'; import WebGLImmediateRenderer from '../../render/webgl/Immediate.js'; import LayerRenderer from '../Layer.js'; -import {fragment, vertex} from '../webgl/defaultmapshader.js'; -import Locations from '../webgl/defaultmapshader/Locations.js'; +import {fragment, vertex} from './defaultmapshader.js'; +import Locations from './defaultmapshader/Locations.js'; import {create as createTransform} from '../../transform.js'; import {create, fromTransform} from '../../vec/mat4.js'; import {ARRAY_BUFFER, FRAMEBUFFER, FLOAT, TEXTURE_2D, diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index 9c72597c9f..d59e263a99 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -12,9 +12,9 @@ import TileSource from '../../source/Tile.js'; import {numberSafeCompareFunction} from '../../array.js'; import {createEmpty, intersects} from '../../extent.js'; import {roundUpToPowerOfTwo} from '../../math.js'; -import WebGLLayerRenderer from '../webgl/Layer.js'; -import {fragment, vertex} from '../webgl/tilelayershader.js'; -import Locations from '../webgl/tilelayershader/Locations.js'; +import WebGLLayerRenderer from './Layer.js'; +import {fragment, vertex} from './tilelayershader.js'; +import Locations from './tilelayershader/Locations.js'; import {toSize} from '../../size.js'; import { reset as resetTransform, diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js index 2f8c96b5a8..1edba3559f 100644 --- a/src/ol/renderer/webgl/VectorLayer.js +++ b/src/ol/renderer/webgl/VectorLayer.js @@ -7,7 +7,7 @@ import ViewHint from '../../ViewHint.js'; import {buffer, containsExtent, createEmpty} from '../../extent.js'; import WebGLReplayGroup from '../../render/webgl/ReplayGroup.js'; import {defaultOrder as defaultRenderOrder, getTolerance as getRenderTolerance, getSquaredTolerance as getSquaredRenderTolerance, renderFeature} from '../vector.js'; -import WebGLLayerRenderer from '../webgl/Layer.js'; +import WebGLLayerRenderer from './Layer.js'; import {apply as applyTransform} from '../../transform.js'; diff --git a/src/ol/reproj/Image.js b/src/ol/reproj/Image.js index 2d96464165..dac00065a9 100644 --- a/src/ol/reproj/Image.js +++ b/src/ol/reproj/Image.js @@ -9,7 +9,7 @@ import {listen, unlistenByKey} from '../events.js'; import EventType from '../events/EventType.js'; import {getCenter, getIntersection, getHeight, getWidth} from '../extent.js'; import {calculateSourceResolution, render as renderReprojected} from '../reproj.js'; -import Triangulation from '../reproj/Triangulation.js'; +import Triangulation from './Triangulation.js'; /** diff --git a/src/ol/reproj/Tile.js b/src/ol/reproj/Tile.js index 986608b2ad..e2afe70093 100644 --- a/src/ol/reproj/Tile.js +++ b/src/ol/reproj/Tile.js @@ -10,7 +10,7 @@ import EventType from '../events/EventType.js'; import {getArea, getCenter, getIntersection} from '../extent.js'; import {clamp} from '../math.js'; import {calculateSourceResolution, render as renderReprojected} from '../reproj.js'; -import Triangulation from '../reproj/Triangulation.js'; +import Triangulation from './Triangulation.js'; /** diff --git a/src/ol/source/BingMaps.js b/src/ol/source/BingMaps.js index 01a8533118..0d6689b358 100644 --- a/src/ol/source/BingMaps.js +++ b/src/ol/source/BingMaps.js @@ -6,8 +6,8 @@ import {createFromTileUrlFunctions} from '../tileurlfunction.js'; import {applyTransform, intersects} from '../extent.js'; import {jsonp as requestJSONP} from '../net.js'; import {get as getProjection, getTransformFromProjections} from '../proj.js'; -import SourceState from '../source/State.js'; -import TileImage from '../source/TileImage.js'; +import SourceState from './State.js'; +import TileImage from './TileImage.js'; import {createOrUpdate, quadKey} from '../tilecoord.js'; import {createXYZ, extentFromProjection} from '../tilegrid.js'; diff --git a/src/ol/source/CartoDB.js b/src/ol/source/CartoDB.js index f52efef7df..313da49e7d 100644 --- a/src/ol/source/CartoDB.js +++ b/src/ol/source/CartoDB.js @@ -3,8 +3,8 @@ */ import {assign} from '../obj.js'; -import SourceState from '../source/State.js'; -import XYZ from '../source/XYZ.js'; +import SourceState from './State.js'; +import XYZ from './XYZ.js'; /** * @typedef {Object} Options diff --git a/src/ol/source/Cluster.js b/src/ol/source/Cluster.js index ccbbbe5968..60d9518187 100644 --- a/src/ol/source/Cluster.js +++ b/src/ol/source/Cluster.js @@ -11,7 +11,7 @@ import {listen} from '../events.js'; import EventType from '../events/EventType.js'; import {buffer, createEmpty, createOrUpdateFromCoordinate} from '../extent.js'; import Point from '../geom/Point.js'; -import VectorSource from '../source/Vector.js'; +import VectorSource from './Vector.js'; /** * @typedef {Object} Options diff --git a/src/ol/source/Image.js b/src/ol/source/Image.js index c12e3517e9..8f2164c0f2 100644 --- a/src/ol/source/Image.js +++ b/src/ol/source/Image.js @@ -9,7 +9,7 @@ import Event from '../events/Event.js'; import {equals} from '../extent.js'; import {equivalent} from '../proj.js'; import ReprojImage from '../reproj/Image.js'; -import Source from '../source/Source.js'; +import Source from './Source.js'; /** diff --git a/src/ol/source/ImageArcGISRest.js b/src/ol/source/ImageArcGISRest.js index a7ef921e35..efc52c495c 100644 --- a/src/ol/source/ImageArcGISRest.js +++ b/src/ol/source/ImageArcGISRest.js @@ -8,7 +8,7 @@ import {listen} from '../events.js'; import EventType from '../events/EventType.js'; import {containsExtent, getHeight, getWidth} from '../extent.js'; import {assign} from '../obj.js'; -import ImageSource, {defaultImageLoadFunction} from '../source/Image.js'; +import ImageSource, {defaultImageLoadFunction} from './Image.js'; import {appendParams} from '../uri.js'; diff --git a/src/ol/source/ImageCanvas.js b/src/ol/source/ImageCanvas.js index 2a12d9d8ac..f98a15d496 100644 --- a/src/ol/source/ImageCanvas.js +++ b/src/ol/source/ImageCanvas.js @@ -4,7 +4,7 @@ import ImageCanvas from '../ImageCanvas.js'; import {containsExtent, getHeight, getWidth, scaleFromCenter} from '../extent.js'; -import ImageSource from '../source/Image.js'; +import ImageSource from './Image.js'; /** diff --git a/src/ol/source/ImageMapGuide.js b/src/ol/source/ImageMapGuide.js index e5f4edb856..dae9163c81 100644 --- a/src/ol/source/ImageMapGuide.js +++ b/src/ol/source/ImageMapGuide.js @@ -7,7 +7,7 @@ import {listen} from '../events.js'; import EventType from '../events/EventType.js'; import {containsExtent, getCenter, getHeight, getWidth, scaleFromCenter} from '../extent.js'; import {assign} from '../obj.js'; -import ImageSource, {defaultImageLoadFunction} from '../source/Image.js'; +import ImageSource, {defaultImageLoadFunction} from './Image.js'; import {appendParams} from '../uri.js'; /** diff --git a/src/ol/source/ImageStatic.js b/src/ol/source/ImageStatic.js index d64ad1ece4..e5da1cd3e4 100644 --- a/src/ol/source/ImageStatic.js +++ b/src/ol/source/ImageStatic.js @@ -9,7 +9,7 @@ import {listen} from '../events.js'; import EventType from '../events/EventType.js'; import {intersects, getHeight, getWidth} from '../extent.js'; import {get as getProjection} from '../proj.js'; -import ImageSource, {defaultImageLoadFunction} from '../source/Image.js'; +import ImageSource, {defaultImageLoadFunction} from './Image.js'; /** * @typedef {Object} Options diff --git a/src/ol/source/ImageWMS.js b/src/ol/source/ImageWMS.js index 47b9fe1e8a..4d3bfb748e 100644 --- a/src/ol/source/ImageWMS.js +++ b/src/ol/source/ImageWMS.js @@ -12,8 +12,8 @@ import {containsExtent, getCenter, getForViewAndSize, getHeight, getWidth} from import {assign} from '../obj.js'; import {get as getProjection, transform} from '../proj.js'; import {calculateSourceResolution} from '../reproj.js'; -import ImageSource, {defaultImageLoadFunction} from '../source/Image.js'; -import WMSServerType from '../source/WMSServerType.js'; +import ImageSource, {defaultImageLoadFunction} from './Image.js'; +import WMSServerType from './WMSServerType.js'; import {compareVersions} from '../string.js'; import {appendParams} from '../uri.js'; diff --git a/src/ol/source/OSM.js b/src/ol/source/OSM.js index 8361484314..3026e01221 100644 --- a/src/ol/source/OSM.js +++ b/src/ol/source/OSM.js @@ -2,7 +2,7 @@ * @module ol/source/OSM */ -import XYZ from '../source/XYZ.js'; +import XYZ from './XYZ.js'; /** diff --git a/src/ol/source/Raster.js b/src/ol/source/Raster.js index a8534c2177..816d01db60 100644 --- a/src/ol/source/Raster.js +++ b/src/ol/source/Raster.js @@ -16,8 +16,8 @@ import TileLayer from '../layer/Tile.js'; import {assign} from '../obj.js'; import CanvasImageLayerRenderer from '../renderer/canvas/ImageLayer.js'; import CanvasTileLayerRenderer from '../renderer/canvas/TileLayer.js'; -import ImageSource from '../source/Image.js'; -import SourceState from '../source/State.js'; +import ImageSource from './Image.js'; +import SourceState from './State.js'; import {create as createTransform} from '../transform.js'; diff --git a/src/ol/source/Stamen.js b/src/ol/source/Stamen.js index b0d5d0a5af..cb76c5abf4 100644 --- a/src/ol/source/Stamen.js +++ b/src/ol/source/Stamen.js @@ -2,8 +2,8 @@ * @module ol/source/Stamen */ -import {ATTRIBUTION as OSM_ATTRIBUTION} from '../source/OSM.js'; -import XYZ from '../source/XYZ.js'; +import {ATTRIBUTION as OSM_ATTRIBUTION} from './OSM.js'; +import XYZ from './XYZ.js'; /** diff --git a/src/ol/source/Tile.js b/src/ol/source/Tile.js index 75b1952413..3b23563df1 100644 --- a/src/ol/source/Tile.js +++ b/src/ol/source/Tile.js @@ -7,7 +7,7 @@ import TileState from '../TileState.js'; import Event from '../events/Event.js'; import {equivalent} from '../proj.js'; import {toSize, scale as scaleSize} from '../size.js'; -import Source from '../source/Source.js'; +import Source from './Source.js'; import {getKeyZXY, withinExtentAndZ} from '../tilecoord.js'; import {wrapX, getForProjection as getTileGridForProjection} from '../tilegrid.js'; diff --git a/src/ol/source/TileArcGISRest.js b/src/ol/source/TileArcGISRest.js index 471042e227..66850e5943 100644 --- a/src/ol/source/TileArcGISRest.js +++ b/src/ol/source/TileArcGISRest.js @@ -6,7 +6,7 @@ import {createEmpty} from '../extent.js'; import {modulo} from '../math.js'; import {assign} from '../obj.js'; import {toSize, scale as scaleSize} from '../size.js'; -import TileImage from '../source/TileImage.js'; +import TileImage from './TileImage.js'; import {hash as tileCoordHash} from '../tilecoord.js'; import {appendParams} from '../uri.js'; diff --git a/src/ol/source/TileDebug.js b/src/ol/source/TileDebug.js index 0232c4f546..11b3bfc4aa 100644 --- a/src/ol/source/TileDebug.js +++ b/src/ol/source/TileDebug.js @@ -6,7 +6,7 @@ import Tile from '../Tile.js'; import TileState from '../TileState.js'; import {createCanvasContext2D} from '../dom.js'; import {toSize} from '../size.js'; -import TileSource from '../source/Tile.js'; +import TileSource from './Tile.js'; import {getKeyZXY} from '../tilecoord.js'; diff --git a/src/ol/source/TileImage.js b/src/ol/source/TileImage.js index 2cdb690904..9971a702c8 100644 --- a/src/ol/source/TileImage.js +++ b/src/ol/source/TileImage.js @@ -10,7 +10,7 @@ import {listen} from '../events.js'; import EventType from '../events/EventType.js'; import {equivalent, get as getProjection} from '../proj.js'; import ReprojTile from '../reproj/Tile.js'; -import UrlTile from '../source/UrlTile.js'; +import UrlTile from './UrlTile.js'; import {getKey, getKeyZXY} from '../tilecoord.js'; import {getForProjection as getTileGridForProjection} from '../tilegrid.js'; diff --git a/src/ol/source/TileJSON.js b/src/ol/source/TileJSON.js index 2461d19069..eaa3f89890 100644 --- a/src/ol/source/TileJSON.js +++ b/src/ol/source/TileJSON.js @@ -13,8 +13,8 @@ import {assert} from '../asserts.js'; import {applyTransform, intersects} from '../extent.js'; import {jsonp as requestJSONP} from '../net.js'; import {get as getProjection, getTransformFromProjections} from '../proj.js'; -import SourceState from '../source/State.js'; -import TileImage from '../source/TileImage.js'; +import SourceState from './State.js'; +import TileImage from './TileImage.js'; import {createXYZ, extentFromProjection} from '../tilegrid.js'; diff --git a/src/ol/source/TileWMS.js b/src/ol/source/TileWMS.js index a69f5518e8..6520fe604c 100644 --- a/src/ol/source/TileWMS.js +++ b/src/ol/source/TileWMS.js @@ -11,8 +11,8 @@ import {modulo} from '../math.js'; import {get as getProjection, transform, transformExtent} from '../proj.js'; import {calculateSourceResolution} from '../reproj.js'; import {toSize, buffer as bufferSize, scale as scaleSize} from '../size.js'; -import TileImage from '../source/TileImage.js'; -import WMSServerType from '../source/WMSServerType.js'; +import TileImage from './TileImage.js'; +import WMSServerType from './WMSServerType.js'; import {hash as tileCoordHash} from '../tilecoord.js'; import {compareVersions} from '../string.js'; import {appendParams} from '../uri.js'; diff --git a/src/ol/source/UTFGrid.js b/src/ol/source/UTFGrid.js index fcb2b528f0..b12cff8e1e 100644 --- a/src/ol/source/UTFGrid.js +++ b/src/ol/source/UTFGrid.js @@ -11,8 +11,8 @@ import EventType from '../events/EventType.js'; import {applyTransform, intersects} from '../extent.js'; import {jsonp as requestJSONP} from '../net.js'; import {get as getProjection, getTransformFromProjections} from '../proj.js'; -import SourceState from '../source/State.js'; -import TileSource from '../source/Tile.js'; +import SourceState from './State.js'; +import TileSource from './Tile.js'; import {getKeyZXY} from '../tilecoord.js'; import {createXYZ, extentFromProjection} from '../tilegrid.js'; diff --git a/src/ol/source/UrlTile.js b/src/ol/source/UrlTile.js index e8f251e407..34edbc2d97 100644 --- a/src/ol/source/UrlTile.js +++ b/src/ol/source/UrlTile.js @@ -4,8 +4,8 @@ import {getUid} from '../util.js'; import TileState from '../TileState.js'; import {expandUrl, createFromTemplates, nullTileUrlFunction} from '../tileurlfunction.js'; -import TileSource, {TileSourceEvent} from '../source/Tile.js'; -import TileEventType from '../source/TileEventType.js'; +import TileSource, {TileSourceEvent} from './Tile.js'; +import TileEventType from './TileEventType.js'; import {getKeyZXY} from '../tilecoord.js'; /** diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js index 8b616ace92..cac054b870 100644 --- a/src/ol/source/Vector.js +++ b/src/ol/source/Vector.js @@ -16,9 +16,9 @@ import {xhr} from '../featureloader.js'; import {TRUE, VOID} from '../functions.js'; import {all as allStrategy} from '../loadingstrategy.js'; import {isEmpty, getValues} from '../obj.js'; -import Source from '../source/Source.js'; -import SourceState from '../source/State.js'; -import VectorEventType from '../source/VectorEventType.js'; +import Source from './Source.js'; +import SourceState from './State.js'; +import VectorEventType from './VectorEventType.js'; import RBush from '../structs/RBush.js'; /** diff --git a/src/ol/source/VectorTile.js b/src/ol/source/VectorTile.js index 47a22cab07..5f384c1931 100644 --- a/src/ol/source/VectorTile.js +++ b/src/ol/source/VectorTile.js @@ -6,7 +6,7 @@ import TileState from '../TileState.js'; import VectorImageTile, {defaultLoadFunction} from '../VectorImageTile.js'; import Tile from '../VectorTile.js'; import {toSize} from '../size.js'; -import UrlTile from '../source/UrlTile.js'; +import UrlTile from './UrlTile.js'; import {getKeyZXY} from '../tilecoord.js'; import {createXYZ, extentFromProjection, createForProjection} from '../tilegrid.js'; diff --git a/src/ol/source/WMTS.js b/src/ol/source/WMTS.js index 902ca5f374..cececef8ad 100644 --- a/src/ol/source/WMTS.js +++ b/src/ol/source/WMTS.js @@ -7,8 +7,8 @@ import {find, findIndex, includes} from '../array.js'; import {containsExtent} from '../extent.js'; import {assign} from '../obj.js'; import {get as getProjection, equivalent, transformExtent} from '../proj.js'; -import TileImage from '../source/TileImage.js'; -import WMTSRequestEncoding from '../source/WMTSRequestEncoding.js'; +import TileImage from './TileImage.js'; +import WMTSRequestEncoding from './WMTSRequestEncoding.js'; import {createFromCapabilitiesMatrixSet} from '../tilegrid/WMTS.js'; import {appendParams} from '../uri.js'; diff --git a/src/ol/source/XYZ.js b/src/ol/source/XYZ.js index 3da8ff4005..4b0c753c3b 100644 --- a/src/ol/source/XYZ.js +++ b/src/ol/source/XYZ.js @@ -2,7 +2,7 @@ * @module ol/source/XYZ */ -import TileImage from '../source/TileImage.js'; +import TileImage from './TileImage.js'; import {createXYZ, extentFromProjection} from '../tilegrid.js'; /** diff --git a/src/ol/source/Zoomify.js b/src/ol/source/Zoomify.js index 5381278a3d..2941d10877 100644 --- a/src/ol/source/Zoomify.js +++ b/src/ol/source/Zoomify.js @@ -10,7 +10,7 @@ import {assert} from '../asserts.js'; import {createCanvasContext2D} from '../dom.js'; import {getTopLeft} from '../extent.js'; import {toSize} from '../size.js'; -import TileImage from '../source/TileImage.js'; +import TileImage from './TileImage.js'; import TileGrid from '../tilegrid/TileGrid.js'; diff --git a/src/ol/style/AtlasManager.js b/src/ol/style/AtlasManager.js index cf42ec93bb..5b3d12cad1 100644 --- a/src/ol/style/AtlasManager.js +++ b/src/ol/style/AtlasManager.js @@ -3,7 +3,7 @@ */ import {MAX_TEXTURE_SIZE as WEBGL_MAX_TEXTURE_SIZE} from '../webgl.js'; import {VOID} from '../functions.js'; -import Atlas from '../style/Atlas.js'; +import Atlas from './Atlas.js'; /** diff --git a/src/ol/style/Circle.js b/src/ol/style/Circle.js index b90febbb9c..ca6e3030e6 100644 --- a/src/ol/style/Circle.js +++ b/src/ol/style/Circle.js @@ -2,7 +2,7 @@ * @module ol/style/Circle */ -import RegularShape from '../style/RegularShape.js'; +import RegularShape from './RegularShape.js'; /** diff --git a/src/ol/style/Icon.js b/src/ol/style/Icon.js index 7969cbf902..bd3b161f27 100644 --- a/src/ol/style/Icon.js +++ b/src/ol/style/Icon.js @@ -7,10 +7,10 @@ import {assert} from '../asserts.js'; import {asArray} from '../color.js'; import {listen, unlisten} from '../events.js'; import EventType from '../events/EventType.js'; -import IconAnchorUnits from '../style/IconAnchorUnits.js'; -import {get as getIconImage} from '../style/IconImage.js'; -import IconOrigin from '../style/IconOrigin.js'; -import ImageStyle from '../style/Image.js'; +import IconAnchorUnits from './IconAnchorUnits.js'; +import {get as getIconImage} from './IconImage.js'; +import IconOrigin from './IconOrigin.js'; +import ImageStyle from './Image.js'; /** diff --git a/src/ol/style/IconImage.js b/src/ol/style/IconImage.js index d94cbec242..6f51cc0d6e 100644 --- a/src/ol/style/IconImage.js +++ b/src/ol/style/IconImage.js @@ -7,7 +7,7 @@ import {listenOnce, unlistenByKey} from '../events.js'; import EventTarget from '../events/Target.js'; import EventType from '../events/EventType.js'; import ImageState from '../ImageState.js'; -import {shared as iconImageCache} from '../style/IconImageCache.js'; +import {shared as iconImageCache} from './IconImageCache.js'; class IconImage extends EventTarget { /** diff --git a/src/ol/style/RegularShape.js b/src/ol/style/RegularShape.js index 776176a298..de342a524d 100644 --- a/src/ol/style/RegularShape.js +++ b/src/ol/style/RegularShape.js @@ -8,7 +8,7 @@ import {createCanvasContext2D} from '../dom.js'; import {CANVAS_LINE_DASH} from '../has.js'; import ImageState from '../ImageState.js'; import {defaultStrokeStyle, defaultFillStyle, defaultLineCap, defaultLineWidth, defaultLineJoin, defaultMiterLimit} from '../render/canvas.js'; -import ImageStyle from '../style/Image.js'; +import ImageStyle from './Image.js'; /** diff --git a/src/ol/style/Style.js b/src/ol/style/Style.js index 2bf94e4b61..a76122a50b 100644 --- a/src/ol/style/Style.js +++ b/src/ol/style/Style.js @@ -88,9 +88,9 @@ */ import {assert} from '../asserts.js'; import GeometryType from '../geom/GeometryType.js'; -import CircleStyle from '../style/Circle.js'; -import Fill from '../style/Fill.js'; -import Stroke from '../style/Stroke.js'; +import CircleStyle from './Circle.js'; +import Fill from './Fill.js'; +import Stroke from './Stroke.js'; /** diff --git a/src/ol/style/Text.js b/src/ol/style/Text.js index 63290dad7d..95eb9598c7 100644 --- a/src/ol/style/Text.js +++ b/src/ol/style/Text.js @@ -1,8 +1,8 @@ /** * @module ol/style/Text */ -import Fill from '../style/Fill.js'; -import TextPlacement from '../style/TextPlacement.js'; +import Fill from './Fill.js'; +import TextPlacement from './TextPlacement.js'; /** diff --git a/src/ol/tilegrid/WMTS.js b/src/ol/tilegrid/WMTS.js index 8a4c23e94f..6582f6314b 100644 --- a/src/ol/tilegrid/WMTS.js +++ b/src/ol/tilegrid/WMTS.js @@ -4,7 +4,7 @@ import {find} from '../array.js'; import {get as getProjection} from '../proj.js'; -import TileGrid from '../tilegrid/TileGrid.js'; +import TileGrid from './TileGrid.js'; /**