diff --git a/src/ol/Collection.js b/src/ol/Collection.js index 80267e29f5..6a7b4e5b62 100644 --- a/src/ol/Collection.js +++ b/src/ol/Collection.js @@ -107,7 +107,7 @@ class Collection extends BaseObject { * Add elements to the collection. This pushes each item in the provided array * to the end of the collection. * @param {!Array} arr Array. - * @return {import("./Collection.js").default} This collection. + * @return {Collection} This collection. * @api */ extend(arr) { diff --git a/src/ol/Feature.js b/src/ol/Feature.js index 4f21db871a..e163618a87 100644 --- a/src/ol/Feature.js +++ b/src/ol/Feature.js @@ -114,7 +114,7 @@ class Feature extends BaseObject { /** * Clone this feature. If the original feature has a geometry it * is also cloned. The feature id is not set in the clone. - * @return {import("./Feature.js").default} The clone. + * @return {Feature} The clone. * @api */ clone() { diff --git a/src/ol/Image.js b/src/ol/Image.js index c9e8117f02..f308a6dc8d 100644 --- a/src/ol/Image.js +++ b/src/ol/Image.js @@ -22,7 +22,7 @@ import {getHeight} from './extent.js'; * post requests or - in general - through XHR requests, where the src of the * image element would be set to a data URI when the content is loaded. * - * @typedef {function(import("./Image.js").default, string)} LoadFunction + * @typedef {function(ImageWrapper, string)} LoadFunction * @api */ diff --git a/src/ol/ImageTile.js b/src/ol/ImageTile.js index 9538a4232c..a07219c95e 100644 --- a/src/ol/ImageTile.js +++ b/src/ol/ImageTile.js @@ -8,7 +8,7 @@ import {listenOnce, unlistenByKey} from './events.js'; import EventType from './events/EventType.js'; /** - * @typedef {function(new: import("./ImageTile.js").default, import("./tilecoord.js").TileCoord, + * @typedef {function(new: ImageTile, import("./tilecoord.js").TileCoord, * import("./TileState.js").default, string, ?string, import("./Tile.js").LoadFunction)} TileClass * @api */ diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js index 96c9d82b0c..378ccb0530 100644 --- a/src/ol/PluggableMap.js +++ b/src/ol/PluggableMap.js @@ -56,7 +56,7 @@ import {create as createTransform, apply as applyTransform} from './transform.js /** - * @typedef {function(import("./PluggableMap.js").default, ?FrameState): boolean} PostRenderFunction + * @typedef {function(PluggableMap, ?FrameState): boolean} PostRenderFunction */ @@ -392,7 +392,7 @@ class PluggableMap extends BaseObject { this.controls.forEach( /** * @param {import("./control/Control.js").default} control Control. - * @this {import("./PluggableMap.js").default} + * @this {PluggableMap} */ (function(control) { control.setMap(this); @@ -417,7 +417,7 @@ class PluggableMap extends BaseObject { this.interactions.forEach( /** * @param {import("./interaction/Interaction.js").default} interaction Interaction. - * @this {import("./PluggableMap.js").default} + * @this {PluggableMap} */ (function(interaction) { interaction.setMap(this); diff --git a/src/ol/Tile.js b/src/ol/Tile.js index 8065d0227d..b7e7b77062 100644 --- a/src/ol/Tile.js +++ b/src/ol/Tile.js @@ -40,7 +40,7 @@ import EventType from './events/EventType.js'; * }); * ``` * - * @typedef {function(import("./Tile.js").default, string)} LoadFunction + * @typedef {function(Tile, string)} LoadFunction * @api */ @@ -101,7 +101,7 @@ class Tile extends EventTarget { * An "interim" tile for this tile. The interim tile may be used while this * one is loading, for "smooth" transitions when changing params/dimensions * on the source. - * @type {import("./Tile.js").default} + * @type {Tile} */ this.interimTile = null; @@ -146,7 +146,7 @@ class Tile extends EventTarget { * Get the interim tile most suitable for rendering using the chain of interim * tiles. This corresponds to the most recent tile that has been loaded, if no * such tile exists, the original tile is returned. - * @return {!import("./Tile.js").default} Best tile for rendering. + * @return {!Tile} Best tile for rendering. */ getInterimTile() { if (!this.interimTile) { diff --git a/src/ol/TileRange.js b/src/ol/TileRange.js index c7bb1bc885..af137bd4a1 100644 --- a/src/ol/TileRange.js +++ b/src/ol/TileRange.js @@ -47,7 +47,7 @@ class TileRange { } /** - * @param {import("./TileRange.js").default} tileRange Tile range. + * @param {TileRange} tileRange Tile range. * @return {boolean} Contains. */ containsTileRange(tileRange) { @@ -65,7 +65,7 @@ class TileRange { } /** - * @param {import("./TileRange.js").default} tileRange Tile range. + * @param {TileRange} tileRange Tile range. * @return {boolean} Equals. */ equals(tileRange) { @@ -74,7 +74,7 @@ class TileRange { } /** - * @param {import("./TileRange.js").default} tileRange Tile range. + * @param {TileRange} tileRange Tile range. */ extend(tileRange) { if (tileRange.minX < this.minX) { @@ -113,7 +113,7 @@ class TileRange { } /** - * @param {import("./TileRange.js").default} tileRange Tile range. + * @param {TileRange} tileRange Tile range. * @return {boolean} Intersects. */ intersects(tileRange) { @@ -130,8 +130,8 @@ class TileRange { * @param {number} maxX Maximum X. * @param {number} minY Minimum Y. * @param {number} maxY Maximum Y. - * @param {import("./TileRange.js").default=} tileRange TileRange. - * @return {import("./TileRange.js").default} Tile range. + * @param {TileRange=} tileRange TileRange. + * @return {TileRange} Tile range. */ export function createOrUpdate(minX, maxX, minY, maxY, tileRange) { if (tileRange !== undefined) { diff --git a/src/ol/VectorTile.js b/src/ol/VectorTile.js index 322b4d82dc..0d500ea273 100644 --- a/src/ol/VectorTile.js +++ b/src/ol/VectorTile.js @@ -13,7 +13,7 @@ const DEFAULT_EXTENT = [0, 0, 4096, 4096]; /** - * @typedef {function(new: import("./VectorTile.js").default, import("./tilecoord.js").TileCoord, + * @typedef {function(new: VectorTile, import("./tilecoord.js").TileCoord, * import("./TileState.js").default, string, ?string, import("./Tile.js").LoadFunction)} TileClass * @api */ diff --git a/src/ol/control/Attribution.js b/src/ol/control/Attribution.js index 5a3d1fcbc9..dfb28d6bcb 100644 --- a/src/ol/control/Attribution.js +++ b/src/ol/control/Attribution.js @@ -316,7 +316,7 @@ class Attribution extends Control { /** * Update the attribution element. * @param {import("../MapEvent.js").default} mapEvent Map event. - * @this {import("./Attribution.js").default} + * @this {Attribution} * @api */ export function render(mapEvent) { diff --git a/src/ol/control/MousePosition.js b/src/ol/control/MousePosition.js index 63b3fbe2dc..4b42d87d22 100644 --- a/src/ol/control/MousePosition.js +++ b/src/ol/control/MousePosition.js @@ -246,7 +246,7 @@ class MousePosition extends Control { /** * Update the mouseposition element. * @param {import("../MapEvent.js").default} mapEvent Map event. - * @this {import("./MousePosition.js").default} + * @this {MousePosition} * @api */ export function render(mapEvent) { diff --git a/src/ol/control/OverviewMap.js b/src/ol/control/OverviewMap.js index e09e0b27ae..2de4505ab4 100644 --- a/src/ol/control/OverviewMap.js +++ b/src/ol/control/OverviewMap.js @@ -570,7 +570,7 @@ class OverviewMap extends Control { /** * Update the overview map element. * @param {import("../MapEvent.js").default} mapEvent Map event. - * @this {import("./OverviewMap.js").default} + * @this {OverviewMap} * @api */ export function render(mapEvent) { diff --git a/src/ol/control/Rotate.js b/src/ol/control/Rotate.js index 9eb72ef149..e51c4e3c34 100644 --- a/src/ol/control/Rotate.js +++ b/src/ol/control/Rotate.js @@ -150,7 +150,7 @@ class Rotate extends Control { /** * Update the rotate control element. * @param {import("../MapEvent.js").default} mapEvent Map event. - * @this {import("./Rotate.js").default} + * @this {Rotate} * @api */ export function render(mapEvent) { diff --git a/src/ol/control/ScaleLine.js b/src/ol/control/ScaleLine.js index d4ebdeb39f..2e8b163136 100644 --- a/src/ol/control/ScaleLine.js +++ b/src/ol/control/ScaleLine.js @@ -283,7 +283,7 @@ class ScaleLine extends Control { /** * Update the scale line element. * @param {import("../MapEvent.js").default} mapEvent Map event. - * @this {import("./ScaleLine.js").default} + * @this {ScaleLine} * @api */ export function render(mapEvent) { diff --git a/src/ol/control/ZoomSlider.js b/src/ol/control/ZoomSlider.js index d99ce2781e..64ff50ff55 100644 --- a/src/ol/control/ZoomSlider.js +++ b/src/ol/control/ZoomSlider.js @@ -345,7 +345,7 @@ class ZoomSlider extends Control { /** * Update the zoomslider element. * @param {import("../MapEvent.js").default} mapEvent Map event. - * @this {import("./ZoomSlider.js").default} + * @this {ZoomSlider} * @api */ export function render(mapEvent) { diff --git a/src/ol/events/Target.js b/src/ol/events/Target.js index ffc8d4257e..146a13948b 100644 --- a/src/ol/events/Target.js +++ b/src/ol/events/Target.js @@ -8,7 +8,7 @@ import Event from '../events/Event.js'; /** - * @typedef {EventTarget|import("./Target.js").default} EventTargetLike + * @typedef {EventTarget|Target} EventTargetLike */ diff --git a/src/ol/format/KML.js b/src/ol/format/KML.js index 1a44a12e76..836e42d35e 100644 --- a/src/ol/format/KML.js +++ b/src/ol/format/KML.js @@ -2207,7 +2207,7 @@ const DOCUMENT_NODE_FACTORY = function(value, objectStack, opt_nodeName) { * @param {Node} node Node. * @param {Array} features Features. * @param {Array<*>} objectStack Object stack. - * @this {import("./KML.js").default} + * @this {KML} */ function writeDocument(node, features, objectStack) { const /** @type {import("../xml.js").NodeStackItem} */ context = {node: node}; @@ -2660,7 +2660,7 @@ const EXTENDEDDATA_NODE_FACTORY = makeSimpleNodeFactory('ExtendedData'); * @param {Element} node Node. * @param {import("../Feature.js").default} feature Feature. * @param {Array<*>} objectStack Object stack. - * @this {import("./KML.js").default} + * @this {KML} */ function writePlacemark(node, feature, objectStack) { const /** @type {import("../xml.js").NodeStackItem} */ context = {node: node}; diff --git a/src/ol/geom/Circle.js b/src/ol/geom/Circle.js index ea9af7116b..d851bd8bbc 100644 --- a/src/ol/geom/Circle.js +++ b/src/ol/geom/Circle.js @@ -33,7 +33,7 @@ class Circle extends SimpleGeometry { /** * Make a complete copy of the geometry. - * @return {!import("./Circle.js").default} Clone. + * @return {!Circle} Clone. * @override * @api */ @@ -230,7 +230,7 @@ class Circle extends SimpleGeometry { * string identifier or a {@link module:ol/proj/Projection~Projection} object. * @param {import("../proj.js").ProjectionLike} destination The desired projection. Can be a * string identifier or a {@link module:ol/proj/Projection~Projection} object. - * @return {import("./Circle.js").default} This geometry. Note that original geometry is + * @return {Circle} This geometry. Note that original geometry is * modified in place. * @function * @api diff --git a/src/ol/geom/Geometry.js b/src/ol/geom/Geometry.js index b6f99deb5b..4bdd544f6c 100644 --- a/src/ol/geom/Geometry.js +++ b/src/ol/geom/Geometry.js @@ -47,7 +47,7 @@ class Geometry extends BaseObject { /** * @protected - * @type {Object} + * @type {Object} */ this.simplifiedGeometryCache = {}; @@ -68,7 +68,7 @@ class Geometry extends BaseObject { /** * Make a complete copy of the geometry. * @abstract - * @return {!import("./Geometry.js").default} Clone. + * @return {!Geometry} Clone. */ clone() {} @@ -159,7 +159,7 @@ class Geometry extends BaseObject { * Douglas Peucker} algorithm. For polygons, a quantization-based * simplification is used to preserve topology. * @param {number} tolerance The tolerance distance for simplification. - * @return {import("./Geometry.js").default} A new, simplified version of the original geometry. + * @return {Geometry} A new, simplified version of the original geometry. * @api */ simplify(tolerance) { @@ -172,7 +172,7 @@ class Geometry extends BaseObject { * See https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm. * @abstract * @param {number} squaredTolerance Squared tolerance. - * @return {import("./Geometry.js").default} Simplified geometry. + * @return {Geometry} Simplified geometry. */ getSimplifiedGeometry(squaredTolerance) {} @@ -222,7 +222,7 @@ class Geometry extends BaseObject { * string identifier or a {@link module:ol/proj/Projection~Projection} object. * @param {import("../proj.js").ProjectionLike} destination The desired projection. Can be a * string identifier or a {@link module:ol/proj/Projection~Projection} object. - * @return {import("./Geometry.js").default} This geometry. Note that original geometry is + * @return {Geometry} This geometry. Note that original geometry is * modified in place. * @api */ diff --git a/src/ol/geom/GeometryCollection.js b/src/ol/geom/GeometryCollection.js index 012223f6c5..c31329d4e4 100644 --- a/src/ol/geom/GeometryCollection.js +++ b/src/ol/geom/GeometryCollection.js @@ -62,7 +62,7 @@ class GeometryCollection extends Geometry { /** * Make a complete copy of the geometry. - * @return {!import("./GeometryCollection.js").default} Clone. + * @return {!GeometryCollection} Clone. * @override * @api */ diff --git a/src/ol/geom/LineString.js b/src/ol/geom/LineString.js index 32eae103f9..395187adc8 100644 --- a/src/ol/geom/LineString.js +++ b/src/ol/geom/LineString.js @@ -80,7 +80,7 @@ class LineString extends SimpleGeometry { /** * Make a complete copy of the geometry. - * @return {!import("./LineString.js").default} Clone. + * @return {!LineString} Clone. * @override * @api */ diff --git a/src/ol/geom/LinearRing.js b/src/ol/geom/LinearRing.js index 7e608fb5a8..8757308328 100644 --- a/src/ol/geom/LinearRing.js +++ b/src/ol/geom/LinearRing.js @@ -51,7 +51,7 @@ class LinearRing extends SimpleGeometry { /** * Make a complete copy of the geometry. - * @return {!import("./LinearRing.js").default} Clone. + * @return {!LinearRing} Clone. * @override * @api */ diff --git a/src/ol/geom/MultiLineString.js b/src/ol/geom/MultiLineString.js index 0891a55a49..95bb93e903 100644 --- a/src/ol/geom/MultiLineString.js +++ b/src/ol/geom/MultiLineString.js @@ -91,7 +91,7 @@ class MultiLineString extends SimpleGeometry { /** * Make a complete copy of the geometry. - * @return {!import("./MultiLineString.js").default} Clone. + * @return {!MultiLineString} Clone. * @override * @api */ diff --git a/src/ol/geom/MultiPoint.js b/src/ol/geom/MultiPoint.js index 8b8721ecb1..4d23e10709 100644 --- a/src/ol/geom/MultiPoint.js +++ b/src/ol/geom/MultiPoint.js @@ -48,7 +48,7 @@ class MultiPoint extends SimpleGeometry { /** * Make a complete copy of the geometry. - * @return {!import("./MultiPoint.js").default} Clone. + * @return {!MultiPoint} Clone. * @override * @api */ diff --git a/src/ol/geom/MultiPolygon.js b/src/ol/geom/MultiPolygon.js index 0684e0e11d..dde66d4a58 100644 --- a/src/ol/geom/MultiPolygon.js +++ b/src/ol/geom/MultiPolygon.js @@ -135,7 +135,7 @@ class MultiPolygon extends SimpleGeometry { /** * Make a complete copy of the geometry. - * @return {!import("./MultiPolygon.js").default} Clone. + * @return {!MultiPolygon} Clone. * @override * @api */ diff --git a/src/ol/geom/Point.js b/src/ol/geom/Point.js index a0dbac69a6..66f89516cc 100644 --- a/src/ol/geom/Point.js +++ b/src/ol/geom/Point.js @@ -26,7 +26,7 @@ class Point extends SimpleGeometry { /** * Make a complete copy of the geometry. - * @return {!import("./Point.js").default} Clone. + * @return {!Point} Clone. * @override * @api */ diff --git a/src/ol/geom/Polygon.js b/src/ol/geom/Polygon.js index ed4c3b3bd8..4bdc97d5fe 100644 --- a/src/ol/geom/Polygon.js +++ b/src/ol/geom/Polygon.js @@ -111,7 +111,7 @@ class Polygon extends SimpleGeometry { /** * Make a complete copy of the geometry. - * @return {!import("./Polygon.js").default} Clone. + * @return {!Polygon} Clone. * @override * @api */ @@ -342,7 +342,7 @@ export default Polygon; * polygon. Default is `32`. * @param {number=} opt_sphereRadius Optional radius for the sphere (defaults to * the Earth's mean radius using the WGS84 ellipsoid). - * @return {import("./Polygon.js").default} The "circular" polygon. + * @return {Polygon} The "circular" polygon. * @api */ export function circular(center, radius, opt_n, opt_sphereRadius) { @@ -360,7 +360,7 @@ export function circular(center, radius, opt_n, opt_sphereRadius) { /** * Create a polygon from an extent. The layout used is `XY`. * @param {import("../extent.js").Extent} extent The extent. - * @return {import("./Polygon.js").default} The polygon. + * @return {Polygon} The polygon. * @api */ export function fromExtent(extent) { @@ -380,7 +380,7 @@ export function fromExtent(extent) { * @param {number=} opt_sides Number of sides of the polygon. Default is 32. * @param {number=} opt_angle Start angle for the first vertex of the polygon in * radians. Default is 0. - * @return {import("./Polygon.js").default} Polygon geometry. + * @return {Polygon} Polygon geometry. * @api */ export function fromCircle(circle, opt_sides, opt_angle) { @@ -406,7 +406,7 @@ export function fromCircle(circle, opt_sides, opt_angle) { /** * Modify the coordinates of a polygon to make it a regular polygon. - * @param {import("./Polygon.js").default} polygon Polygon geometry. + * @param {Polygon} polygon Polygon geometry. * @param {import("../coordinate.js").Coordinate} center Center of the regular polygon. * @param {number} radius Radius of the regular polygon. * @param {number=} opt_angle Start angle for the first vertex of the polygon in diff --git a/src/ol/geom/SimpleGeometry.js b/src/ol/geom/SimpleGeometry.js index ece1c6e85f..aa77fad2e4 100644 --- a/src/ol/geom/SimpleGeometry.js +++ b/src/ol/geom/SimpleGeometry.js @@ -130,7 +130,7 @@ class SimpleGeometry extends Geometry { /** * @param {number} squaredTolerance Squared tolerance. - * @return {import("./SimpleGeometry.js").default} Simplified geometry. + * @return {SimpleGeometry} Simplified geometry. * @protected */ getSimplifiedGeometryInternal(squaredTolerance) { @@ -298,7 +298,7 @@ SimpleGeometry.prototype.containsXY = FALSE; /** - * @param {import("./SimpleGeometry.js").default} simpleGeometry Simple geometry. + * @param {SimpleGeometry} simpleGeometry Simple geometry. * @param {import("../transform.js").Transform} transform Transform. * @param {Array=} opt_dest Destination. * @return {Array} Transformed flat coordinates. diff --git a/src/ol/interaction/DoubleClickZoom.js b/src/ol/interaction/DoubleClickZoom.js index 32fd5bc897..4958842443 100644 --- a/src/ol/interaction/DoubleClickZoom.js +++ b/src/ol/interaction/DoubleClickZoom.js @@ -51,7 +51,7 @@ class DoubleClickZoom extends Interaction { * doubleclick) and eventually zooms the map. * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. * @return {boolean} `false` to stop event propagation. - * @this {import("./DoubleClickZoom.js").default} + * @this {DoubleClickZoom} */ function handleEvent(mapBrowserEvent) { let stopEvent = false; diff --git a/src/ol/interaction/DragAndDrop.js b/src/ol/interaction/DragAndDrop.js index 7542e62952..40f131c57c 100644 --- a/src/ol/interaction/DragAndDrop.js +++ b/src/ol/interaction/DragAndDrop.js @@ -244,7 +244,7 @@ class DragAndDrop extends Interaction { /** * @param {DragEvent} event Event. - * @this {import("./DragAndDrop.js").default} + * @this {DragAndDrop} */ function handleDrop(event) { const files = event.dataTransfer.files; diff --git a/src/ol/interaction/DragBox.js b/src/ol/interaction/DragBox.js index ae77d9daf3..93d24baa94 100644 --- a/src/ol/interaction/DragBox.js +++ b/src/ol/interaction/DragBox.js @@ -28,7 +28,7 @@ import RenderBox from '../render/Box.js'; * @property {EndCondition} [boxEndCondition] A function that takes a {@link module:ol/MapBrowserEvent~MapBrowserEvent} and two * {@link module:ol/pixel~Pixel}s to indicate whether a `boxend` event should be fired. * Default is `true` if the area of the box is bigger than the `minArea` option. - * @property {function(this:import("./DragBox.js").default, import("../MapBrowserEvent.js").default)} onBoxEnd Code to execute just + * @property {function(this:DragBox, import("../MapBrowserEvent.js").default)} onBoxEnd Code to execute just * before `boxend` is fired. */ @@ -137,7 +137,7 @@ class DragBox extends PointerInteraction { /** * Function to execute just before `onboxend` is fired - * @type {function(this:import("./DragBox.js").default, import("../MapBrowserEvent.js").default)} + * @type {function(this:DragBox, import("../MapBrowserEvent.js").default)} * @private */ this.onBoxEnd_ = options.onBoxEnd ? options.onBoxEnd : VOID; @@ -181,7 +181,7 @@ class DragBox extends PointerInteraction { * @param {import("../pixel.js").Pixel} startPixel The starting pixel of the box. * @param {import("../pixel.js").Pixel} endPixel The end pixel of the box. * @return {boolean} Whether or not the boxend condition should be fired. - * @this {import("./DragBox.js").default} + * @this {DragBox} */ function defaultBoxEndCondition(mapBrowserEvent, startPixel, endPixel) { const width = endPixel[0] - startPixel[0]; @@ -192,7 +192,7 @@ function defaultBoxEndCondition(mapBrowserEvent, startPixel, endPixel) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. - * @this {import("./DragBox.js").default} + * @this {DragBox} */ function handleDragEvent(mapBrowserEvent) { if (!mouseOnly(mapBrowserEvent)) { @@ -209,7 +209,7 @@ function handleDragEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Stop drag sequence? - * @this {import("./DragBox.js").default} + * @this {DragBox} */ function handleUpEvent(mapBrowserEvent) { if (!mouseOnly(mapBrowserEvent)) { @@ -230,7 +230,7 @@ function handleUpEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Start drag sequence? - * @this {import("./DragBox.js").default} + * @this {DragBox} */ function handleDownEvent(mapBrowserEvent) { if (!mouseOnly(mapBrowserEvent)) { diff --git a/src/ol/interaction/DragPan.js b/src/ol/interaction/DragPan.js index 7c0edb629c..9fe6ee80a5 100644 --- a/src/ol/interaction/DragPan.js +++ b/src/ol/interaction/DragPan.js @@ -78,7 +78,7 @@ class DragPan extends PointerInteraction { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. - * @this {import("./DragPan.js").default} + * @this {DragPan} */ function handleDragEvent(mapBrowserEvent) { if (!this.panning_) { @@ -116,7 +116,7 @@ function handleDragEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Stop drag sequence? - * @this {import("./DragPan.js").default} + * @this {DragPan} */ function handleUpEvent(mapBrowserEvent) { const map = mapBrowserEvent.map; @@ -157,7 +157,7 @@ function handleUpEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Start drag sequence? - * @this {import("./DragPan.js").default} + * @this {DragPan} */ function handleDownEvent(mapBrowserEvent) { if (this.targetPointers.length > 0 && this.condition_(mapBrowserEvent)) { diff --git a/src/ol/interaction/DragRotate.js b/src/ol/interaction/DragRotate.js index 4e4c582405..d3b33564a8 100644 --- a/src/ol/interaction/DragRotate.js +++ b/src/ol/interaction/DragRotate.js @@ -69,7 +69,7 @@ class DragRotate extends PointerInteraction { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. - * @this {import("./DragRotate.js").default} + * @this {DragRotate} */ function handleDragEvent(mapBrowserEvent) { if (!mouseOnly(mapBrowserEvent)) { @@ -97,7 +97,7 @@ function handleDragEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Stop drag sequence? - * @this {import("./DragRotate.js").default} + * @this {DragRotate} */ function handleUpEvent(mapBrowserEvent) { if (!mouseOnly(mapBrowserEvent)) { @@ -116,7 +116,7 @@ function handleUpEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Start drag sequence? - * @this {import("./DragRotate.js").default} + * @this {DragRotate} */ function handleDownEvent(mapBrowserEvent) { if (!mouseOnly(mapBrowserEvent)) { diff --git a/src/ol/interaction/DragRotateAndZoom.js b/src/ol/interaction/DragRotateAndZoom.js index 62c395c53d..51a959b116 100644 --- a/src/ol/interaction/DragRotateAndZoom.js +++ b/src/ol/interaction/DragRotateAndZoom.js @@ -81,7 +81,7 @@ class DragRotateAndZoom extends PointerInteraction { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. - * @this {import("./DragRotateAndZoom.js").default} + * @this {DragRotateAndZoom} */ function handleDragEvent(mapBrowserEvent) { if (!mouseOnly(mapBrowserEvent)) { @@ -115,7 +115,7 @@ function handleDragEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Stop drag sequence? - * @this {import("./DragRotateAndZoom.js").default} + * @this {DragRotateAndZoom} */ function handleUpEvent(mapBrowserEvent) { if (!mouseOnly(mapBrowserEvent)) { @@ -136,7 +136,7 @@ function handleUpEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Start drag sequence? - * @this {import("./DragRotateAndZoom.js").default} + * @this {DragRotateAndZoom} */ function handleDownEvent(mapBrowserEvent) { if (!mouseOnly(mapBrowserEvent)) { diff --git a/src/ol/interaction/DragZoom.js b/src/ol/interaction/DragZoom.js index 9375cceb51..a3f0a3d702 100644 --- a/src/ol/interaction/DragZoom.js +++ b/src/ol/interaction/DragZoom.js @@ -61,7 +61,7 @@ class DragZoom extends DragBox { /** - * @this {import("./DragZoom.js").default} + * @this {DragZoom} */ function onBoxEnd() { const map = this.getMap(); diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index 457a587804..57b2dd75af 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -823,7 +823,7 @@ function getDefaultStyleFunction() { * draw or finish the drawing. * @param {import("../MapBrowserEvent.js").default} event Map browser event. * @return {boolean} `false` to stop event propagation. - * @this {import("./Draw.js").default} + * @this {Draw} * @api */ export function handleEvent(event) { @@ -875,7 +875,7 @@ export function handleEvent(event) { /** * @param {import("../MapBrowserPointerEvent.js").default} event Event. * @return {boolean} Start drag sequence? - * @this {import("./Draw.js").default} + * @this {Draw} */ function handleDownEvent(event) { this.shouldHandle_ = !this.freehand_; @@ -903,7 +903,7 @@ function handleDownEvent(event) { /** * @param {import("../MapBrowserPointerEvent.js").default} event Event. * @return {boolean} Stop drag sequence? - * @this {import("./Draw.js").default} + * @this {Draw} */ function handleUpEvent(event) { let pass = true; diff --git a/src/ol/interaction/KeyboardPan.js b/src/ol/interaction/KeyboardPan.js index 1a89c7abdd..b2721aa123 100644 --- a/src/ol/interaction/KeyboardPan.js +++ b/src/ol/interaction/KeyboardPan.js @@ -87,7 +87,7 @@ class KeyboardPan extends Interaction { * pressed). * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. * @return {boolean} `false` to stop event propagation. - * @this {import("./KeyboardPan.js").default} + * @this {KeyboardPan} */ function handleEvent(mapBrowserEvent) { let stopEvent = false; diff --git a/src/ol/interaction/KeyboardZoom.js b/src/ol/interaction/KeyboardZoom.js index 61f212111f..724bfcec5b 100644 --- a/src/ol/interaction/KeyboardZoom.js +++ b/src/ol/interaction/KeyboardZoom.js @@ -71,7 +71,7 @@ class KeyboardZoom extends Interaction { * key pressed was '+' or '-'). * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. * @return {boolean} `false` to stop event propagation. - * @this {import("./KeyboardZoom.js").default} + * @this {KeyboardZoom} */ function handleEvent(mapBrowserEvent) { let stopEvent = false; diff --git a/src/ol/interaction/Modify.js b/src/ol/interaction/Modify.js index 3bfb83c6a2..b1ff6abb43 100644 --- a/src/ol/interaction/Modify.js +++ b/src/ol/interaction/Modify.js @@ -987,7 +987,7 @@ function compareIndexes(a, b) { /** * @param {import("../MapBrowserPointerEvent.js").default} evt Event. * @return {boolean} Start drag sequence? - * @this {import("./Modify.js").default} + * @this {Modify} */ function handleDownEvent(evt) { if (!this.condition_(evt)) { @@ -1062,7 +1062,7 @@ function handleDownEvent(evt) { /** * @param {import("../MapBrowserPointerEvent.js").default} evt Event. - * @this {import("./Modify.js").default} + * @this {Modify} */ function handleDragEvent(evt) { this.ignoreNextSingleClick_ = false; @@ -1139,7 +1139,7 @@ function handleDragEvent(evt) { /** * @param {import("../MapBrowserPointerEvent.js").default} evt Event. * @return {boolean} Stop drag sequence? - * @this {import("./Modify.js").default} + * @this {Modify} */ function handleUpEvent(evt) { for (let i = this.dragSegments_.length - 1; i >= 0; --i) { @@ -1171,7 +1171,7 @@ function handleUpEvent(evt) { * geometry. * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. * @return {boolean} `false` to stop event propagation. - * @this {import("./Modify.js").default} + * @this {Modify} */ function handleEvent(mapBrowserEvent) { if (!(mapBrowserEvent instanceof MapBrowserPointerEvent)) { diff --git a/src/ol/interaction/MouseWheelZoom.js b/src/ol/interaction/MouseWheelZoom.js index e1871e401a..23cd3490fb 100644 --- a/src/ol/interaction/MouseWheelZoom.js +++ b/src/ol/interaction/MouseWheelZoom.js @@ -196,7 +196,7 @@ class MouseWheelZoom extends Interaction { * mousewheel-event) and eventually zooms the map. * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. * @return {boolean} Allow event propagation. - * @this {import("./MouseWheelZoom.js").default} + * @this {MouseWheelZoom} */ function handleEvent(mapBrowserEvent) { if (!this.condition_(mapBrowserEvent)) { diff --git a/src/ol/interaction/PinchRotate.js b/src/ol/interaction/PinchRotate.js index 7903a7dd1b..1a6172be91 100644 --- a/src/ol/interaction/PinchRotate.js +++ b/src/ol/interaction/PinchRotate.js @@ -80,7 +80,7 @@ class PinchRotate extends PointerInteraction { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. - * @this {import("./PinchRotate.js").default} + * @this {PinchRotate} */ function handleDragEvent(mapBrowserEvent) { let rotationDelta = 0.0; @@ -131,7 +131,7 @@ function handleDragEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Stop drag sequence? - * @this {import("./PinchRotate.js").default} + * @this {PinchRotate} */ function handleUpEvent(mapBrowserEvent) { if (this.targetPointers.length < 2) { @@ -152,7 +152,7 @@ function handleUpEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Start drag sequence? - * @this {import("./PinchRotate.js").default} + * @this {PinchRotate} */ function handleDownEvent(mapBrowserEvent) { if (this.targetPointers.length >= 2) { diff --git a/src/ol/interaction/PinchZoom.js b/src/ol/interaction/PinchZoom.js index f867b5d424..63c130525a 100644 --- a/src/ol/interaction/PinchZoom.js +++ b/src/ol/interaction/PinchZoom.js @@ -73,7 +73,7 @@ class PinchZoom extends PointerInteraction { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. - * @this {import("./PinchZoom.js").default} + * @this {PinchZoom} */ function handleDragEvent(mapBrowserEvent) { let scaleDelta = 1.0; @@ -126,7 +126,7 @@ function handleDragEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Stop drag sequence? - * @this {import("./PinchZoom.js").default} + * @this {PinchZoom} */ function handleUpEvent(mapBrowserEvent) { if (this.targetPointers.length < 2) { @@ -153,7 +153,7 @@ function handleUpEvent(mapBrowserEvent) { /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Start drag sequence? - * @this {import("./PinchZoom.js").default} + * @this {PinchZoom} */ function handleDownEvent(mapBrowserEvent) { if (this.targetPointers.length >= 2) { diff --git a/src/ol/interaction/Pointer.js b/src/ol/interaction/Pointer.js index f10b55decf..70626b4571 100644 --- a/src/ol/interaction/Pointer.js +++ b/src/ol/interaction/Pointer.js @@ -10,7 +10,7 @@ import {getValues} from '../obj.js'; /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. - * @this {import("./Pointer.js").default} + * @this {PointerInteraction} */ const handleDragEvent = VOID; @@ -18,7 +18,7 @@ const handleDragEvent = VOID; /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Capture dragging. - * @this {import("./Pointer.js").default} + * @this {PointerInteraction} */ const handleUpEvent = FALSE; @@ -26,14 +26,14 @@ const handleUpEvent = FALSE; /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. * @return {boolean} Capture dragging. - * @this {import("./Pointer.js").default} + * @this {PointerInteraction} */ const handleDownEvent = FALSE; /** * @param {import("../MapBrowserPointerEvent.js").default} mapBrowserEvent Event. - * @this {import("./Pointer.js").default} + * @this {PointerInteraction} */ const handleMoveEvent = VOID; @@ -203,7 +203,7 @@ function isPointerDraggingEvent(mapBrowserEvent) { * detected. * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. * @return {boolean} `false` to stop event propagation. - * @this {import("./Pointer.js").default} + * @this {PointerInteraction} * @api */ export function handleEvent(mapBrowserEvent) { diff --git a/src/ol/interaction/Select.js b/src/ol/interaction/Select.js index ee9ff85f20..09a96ee864 100644 --- a/src/ol/interaction/Select.js +++ b/src/ol/interaction/Select.js @@ -385,7 +385,7 @@ class Select extends Interaction { * selected state of features. * @param {import("../MapBrowserEvent.js").default} mapBrowserEvent Map browser event. * @return {boolean} `false` to stop event propagation. - * @this {import("./Select.js").default} + * @this {Select} */ function handleEvent(mapBrowserEvent) { if (!this.condition_(mapBrowserEvent)) { diff --git a/src/ol/interaction/Snap.js b/src/ol/interaction/Snap.js index 941f2688d2..5e69318067 100644 --- a/src/ol/interaction/Snap.js +++ b/src/ol/interaction/Snap.js @@ -591,7 +591,7 @@ class Snap extends PointerInteraction { * Handle all pointer events events. * @param {import("../MapBrowserEvent.js").default} evt A move event. * @return {boolean} Pass the event to other interactions. - * @this {import("./Snap.js").default} + * @this {Snap} */ export function handleEvent(evt) { const result = this.snapTo(evt.pixel, evt.coordinate, evt.map); @@ -606,7 +606,7 @@ export function handleEvent(evt) { /** * @param {import("../MapBrowserPointerEvent.js").default} evt Event. * @return {boolean} Stop drag sequence? - * @this {import("./Snap.js").default} + * @this {Snap} */ function handleUpEvent(evt) { const featuresToUpdate = getValues(this.pendingFeatures_); @@ -623,7 +623,7 @@ function handleUpEvent(evt) { * @param {SegmentData} a The first segment data. * @param {SegmentData} b The second segment data. * @return {number} The difference in distance. - * @this {import("./Snap.js").default} + * @this {Snap} */ function sortByDistance(a, b) { const deltaA = squaredDistanceToSegment(this.pixelCoordinate_, a.segment); diff --git a/src/ol/interaction/Translate.js b/src/ol/interaction/Translate.js index 8932c68253..08e4de5ebe 100644 --- a/src/ol/interaction/Translate.js +++ b/src/ol/interaction/Translate.js @@ -238,7 +238,7 @@ class Translate extends PointerInteraction { /** * @param {import("../MapBrowserPointerEvent.js").default} event Event. * @return {boolean} Start drag sequence? - * @this {import("./Translate.js").default} + * @this {Translate} */ function handleDownEvent(event) { this.lastFeature_ = this.featuresAtPixel_(event.pixel, event.map); @@ -261,7 +261,7 @@ function handleDownEvent(event) { /** * @param {import("../MapBrowserPointerEvent.js").default} event Event. * @return {boolean} Stop drag sequence? - * @this {import("./Translate.js").default} + * @this {Translate} */ function handleUpEvent(event) { if (this.lastCoordinate_) { @@ -282,7 +282,7 @@ function handleUpEvent(event) { /** * @param {import("../MapBrowserPointerEvent.js").default} event Event. - * @this {import("./Translate.js").default} + * @this {Translate} */ function handleDragEvent(event) { if (this.lastCoordinate_) { @@ -309,7 +309,7 @@ function handleDragEvent(event) { /** * @param {import("../MapBrowserEvent.js").default} event Event. - * @this {import("./Translate.js").default} + * @this {Translate} */ function handleMoveEvent(event) { const elem = event.map.getViewport(); diff --git a/src/ol/pointer/MouseSource.js b/src/ol/pointer/MouseSource.js index 2438ff27cf..bdcb96344d 100644 --- a/src/ol/pointer/MouseSource.js +++ b/src/ol/pointer/MouseSource.js @@ -57,7 +57,7 @@ const DEDUP_DIST = 25; /** * Handler for `mousedown`. * - * @this {import("./MouseSource.js").default} + * @this {MouseSource} * @param {MouseEvent} inEvent The in event. */ function mousedown(inEvent) { @@ -76,7 +76,7 @@ function mousedown(inEvent) { /** * Handler for `mousemove`. * - * @this {import("./MouseSource.js").default} + * @this {MouseSource} * @param {MouseEvent} inEvent The in event. */ function mousemove(inEvent) { @@ -89,7 +89,7 @@ function mousemove(inEvent) { /** * Handler for `mouseup`. * - * @this {import("./MouseSource.js").default} + * @this {MouseSource} * @param {MouseEvent} inEvent The in event. */ function mouseup(inEvent) { @@ -107,7 +107,7 @@ function mouseup(inEvent) { /** * Handler for `mouseover`. * - * @this {import("./MouseSource.js").default} + * @this {MouseSource} * @param {MouseEvent} inEvent The in event. */ function mouseover(inEvent) { @@ -120,7 +120,7 @@ function mouseover(inEvent) { /** * Handler for `mouseout`. * - * @this {import("./MouseSource.js").default} + * @this {MouseSource} * @param {MouseEvent} inEvent The in event. */ function mouseout(inEvent) { diff --git a/src/ol/pointer/MsSource.js b/src/ol/pointer/MsSource.js index ca4ff8912c..2c1893396b 100644 --- a/src/ol/pointer/MsSource.js +++ b/src/ol/pointer/MsSource.js @@ -49,7 +49,7 @@ const POINTER_TYPES = [ /** * Handler for `msPointerDown`. * - * @this {import("./MsSource.js").default} + * @this {MsSource} * @param {MSPointerEvent} inEvent The in event. */ function msPointerDown(inEvent) { @@ -61,7 +61,7 @@ function msPointerDown(inEvent) { /** * Handler for `msPointerMove`. * - * @this {import("./MsSource.js").default} + * @this {MsSource} * @param {MSPointerEvent} inEvent The in event. */ function msPointerMove(inEvent) { @@ -72,7 +72,7 @@ function msPointerMove(inEvent) { /** * Handler for `msPointerUp`. * - * @this {import("./MsSource.js").default} + * @this {MsSource} * @param {MSPointerEvent} inEvent The in event. */ function msPointerUp(inEvent) { @@ -84,7 +84,7 @@ function msPointerUp(inEvent) { /** * Handler for `msPointerOut`. * - * @this {import("./MsSource.js").default} + * @this {MsSource} * @param {MSPointerEvent} inEvent The in event. */ function msPointerOut(inEvent) { @@ -95,7 +95,7 @@ function msPointerOut(inEvent) { /** * Handler for `msPointerOver`. * - * @this {import("./MsSource.js").default} + * @this {MsSource} * @param {MSPointerEvent} inEvent The in event. */ function msPointerOver(inEvent) { @@ -106,7 +106,7 @@ function msPointerOver(inEvent) { /** * Handler for `msPointerCancel`. * - * @this {import("./MsSource.js").default} + * @this {MsSource} * @param {MSPointerEvent} inEvent The in event. */ function msPointerCancel(inEvent) { @@ -118,7 +118,7 @@ function msPointerCancel(inEvent) { /** * Handler for `msLostPointerCapture`. * - * @this {import("./MsSource.js").default} + * @this {MsSource} * @param {MSPointerEvent} inEvent The in event. */ function msLostPointerCapture(inEvent) { @@ -129,7 +129,7 @@ function msLostPointerCapture(inEvent) { /** * Handler for `msGotPointerCapture`. * - * @this {import("./MsSource.js").default} + * @this {MsSource} * @param {MSPointerEvent} inEvent The in event. */ function msGotPointerCapture(inEvent) { diff --git a/src/ol/pointer/NativeSource.js b/src/ol/pointer/NativeSource.js index 2123389b70..2fa0fb0b0f 100644 --- a/src/ol/pointer/NativeSource.js +++ b/src/ol/pointer/NativeSource.js @@ -37,7 +37,7 @@ import EventSource from '../pointer/EventSource.js'; /** * Handler for `pointerdown`. * - * @this {import("./NativeSource.js").default} + * @this {NativeSource} * @param {Event} inEvent The in event. */ function pointerDown(inEvent) { @@ -47,7 +47,7 @@ function pointerDown(inEvent) { /** * Handler for `pointermove`. * - * @this {import("./NativeSource.js").default} + * @this {NativeSource} * @param {Event} inEvent The in event. */ function pointerMove(inEvent) { @@ -57,7 +57,7 @@ function pointerMove(inEvent) { /** * Handler for `pointerup`. * - * @this {import("./NativeSource.js").default} + * @this {NativeSource} * @param {Event} inEvent The in event. */ function pointerUp(inEvent) { @@ -67,7 +67,7 @@ function pointerUp(inEvent) { /** * Handler for `pointerout`. * - * @this {import("./NativeSource.js").default} + * @this {NativeSource} * @param {Event} inEvent The in event. */ function pointerOut(inEvent) { @@ -77,7 +77,7 @@ function pointerOut(inEvent) { /** * Handler for `pointerover`. * - * @this {import("./NativeSource.js").default} + * @this {NativeSource} * @param {Event} inEvent The in event. */ function pointerOver(inEvent) { @@ -87,7 +87,7 @@ function pointerOver(inEvent) { /** * Handler for `pointercancel`. * - * @this {import("./NativeSource.js").default} + * @this {NativeSource} * @param {Event} inEvent The in event. */ function pointerCancel(inEvent) { @@ -97,7 +97,7 @@ function pointerCancel(inEvent) { /** * Handler for `lostpointercapture`. * - * @this {import("./NativeSource.js").default} + * @this {NativeSource} * @param {Event} inEvent The in event. */ function lostPointerCapture(inEvent) { @@ -107,7 +107,7 @@ function lostPointerCapture(inEvent) { /** * Handler for `gotpointercapture`. * - * @this {import("./NativeSource.js").default} + * @this {NativeSource} * @param {Event} inEvent The in event. */ function gotPointerCapture(inEvent) { diff --git a/src/ol/pointer/TouchSource.js b/src/ol/pointer/TouchSource.js index 01130d9cbb..6a6902476b 100644 --- a/src/ol/pointer/TouchSource.js +++ b/src/ol/pointer/TouchSource.js @@ -51,7 +51,7 @@ const POINTER_TYPE = 'touch'; * Handler for `touchstart`, triggers `pointerover`, * `pointerenter` and `pointerdown` events. * - * @this {import("./TouchSource.js").default} + * @this {TouchSource} * @param {TouchEvent} inEvent The in event. */ function touchstart(inEvent) { @@ -65,7 +65,7 @@ function touchstart(inEvent) { /** * Handler for `touchmove`. * - * @this {import("./TouchSource.js").default} + * @this {TouchSource} * @param {TouchEvent} inEvent The in event. */ function touchmove(inEvent) { @@ -76,7 +76,7 @@ function touchmove(inEvent) { * Handler for `touchend`, triggers `pointerup`, * `pointerout` and `pointerleave` events. * - * @this {import("./TouchSource.js").default} + * @this {TouchSource} * @param {TouchEvent} inEvent The event. */ function touchend(inEvent) { @@ -88,7 +88,7 @@ function touchend(inEvent) { * Handler for `touchcancel`, triggers `pointercancel`, * `pointerout` and `pointerleave` events. * - * @this {import("./TouchSource.js").default} + * @this {TouchSource} * @param {TouchEvent} inEvent The in event. */ function touchcancel(inEvent) { diff --git a/src/ol/proj/Units.js b/src/ol/proj/Units.js index b702e7c867..fd84544797 100644 --- a/src/ol/proj/Units.js +++ b/src/ol/proj/Units.js @@ -20,7 +20,7 @@ const Units = { /** * Meters per unit lookup table. * @const - * @type {Object} + * @type {Object} * @api */ export const METERS_PER_UNIT = {}; diff --git a/src/ol/render/Feature.js b/src/ol/render/Feature.js index fb32dff1fe..6e848d2b6b 100644 --- a/src/ol/render/Feature.js +++ b/src/ol/render/Feature.js @@ -185,7 +185,7 @@ class RenderFeature { /** * For API compatibility with {@link module:ol/Feature~Feature}, this method is useful when * determining the geometry type in style function (see {@link #getType}). - * @return {import("./Feature.js").default} Feature. + * @return {RenderFeature} Feature. * @api */ getGeometry() { @@ -257,7 +257,7 @@ RenderFeature.prototype.getFlatCoordinates = /** * Get the feature for working with its geometry. - * @return {import("./Feature.js").default} Feature. + * @return {RenderFeature} Feature. */ RenderFeature.prototype.getSimplifiedGeometry = RenderFeature.prototype.getGeometry; diff --git a/src/ol/render/canvas/Replay.js b/src/ol/render/canvas/Replay.js index 35bbfccfa2..d50cfd735d 100644 --- a/src/ol/render/canvas/Replay.js +++ b/src/ol/render/canvas/Replay.js @@ -1002,7 +1002,7 @@ class CanvasReplay extends VectorContext { /** * @param {import("../canvas.js").FillStrokeState} state State. - * @param {function(this:import("./Replay.js").default, import("../canvas.js").FillStrokeState, (import("../../geom/Geometry.js").default|import("../Feature.js").default)):Array<*>} createFill Create fill. + * @param {function(this:CanvasReplay, import("../canvas.js").FillStrokeState, (import("../../geom/Geometry.js").default|import("../Feature.js").default)):Array<*>} createFill Create fill. * @param {import("../../geom/Geometry.js").default|import("../Feature.js").default} geometry Geometry. */ updateFillStyle(state, createFill, geometry) { @@ -1017,7 +1017,7 @@ class CanvasReplay extends VectorContext { /** * @param {import("../canvas.js").FillStrokeState} state State. - * @param {function(this:import("./Replay.js").default, import("../canvas.js").FillStrokeState)} applyStroke Apply stroke. + * @param {function(this:CanvasReplay, import("../canvas.js").FillStrokeState)} applyStroke Apply stroke. */ updateStrokeStyle(state, applyStroke) { const strokeStyle = state.strokeStyle; diff --git a/src/ol/renderer/canvas/ImageLayer.js b/src/ol/renderer/canvas/ImageLayer.js index 669ae022b1..d9134a4197 100644 --- a/src/ol/renderer/canvas/ImageLayer.js +++ b/src/ol/renderer/canvas/ImageLayer.js @@ -206,7 +206,7 @@ CanvasImageLayerRenderer['handles'] = function(layer) { * Create a layer renderer. * @param {import("../Map.js").default} mapRenderer The map renderer. * @param {import("../../layer/Layer.js").default} layer The layer to be rendererd. - * @return {import("./ImageLayer.js").default} The layer renderer. + * @return {CanvasImageLayerRenderer} The layer renderer. */ CanvasImageLayerRenderer['create'] = function(mapRenderer, layer) { return new CanvasImageLayerRenderer(/** @type {import("../../layer/Image.js").default} */ (layer)); diff --git a/src/ol/renderer/canvas/TileLayer.js b/src/ol/renderer/canvas/TileLayer.js index e478d1526d..e74a65761d 100644 --- a/src/ol/renderer/canvas/TileLayer.js +++ b/src/ol/renderer/canvas/TileLayer.js @@ -370,7 +370,7 @@ CanvasTileLayerRenderer['handles'] = function(layer) { * Create a layer renderer. * @param {import("../Map.js").default} mapRenderer The map renderer. * @param {import("../../layer/Layer.js").default} layer The layer to be rendererd. - * @return {import("./TileLayer.js").default} The layer renderer. + * @return {CanvasTileLayerRenderer} The layer renderer. */ CanvasTileLayerRenderer['create'] = function(mapRenderer, layer) { return new CanvasTileLayerRenderer(/** @type {import("../../layer/Tile.js").default} */ (layer)); diff --git a/src/ol/renderer/canvas/VectorLayer.js b/src/ol/renderer/canvas/VectorLayer.js index 4f6d95d230..ae88718b25 100644 --- a/src/ol/renderer/canvas/VectorLayer.js +++ b/src/ol/renderer/canvas/VectorLayer.js @@ -339,7 +339,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer { vectorSource.loadFeatures(extent, resolution, projection); /** * @param {import("../../Feature.js").default} feature Feature. - * @this {import("./VectorLayer.js").default} + * @this {CanvasVectorLayerRenderer} */ const render = function(feature) { let styles; @@ -427,7 +427,7 @@ CanvasVectorLayerRenderer['handles'] = function(layer) { * Create a layer renderer. * @param {import("../Map.js").default} mapRenderer The map renderer. * @param {import("../../layer/Layer.js").default} layer The layer to be rendererd. - * @return {import("./VectorLayer.js").default} The layer renderer. + * @return {CanvasVectorLayerRenderer} The layer renderer. */ CanvasVectorLayerRenderer['create'] = function(mapRenderer, layer) { return new CanvasVectorLayerRenderer(/** @type {import("../../layer/Vector.js").default} */ (layer)); diff --git a/src/ol/renderer/canvas/VectorTileLayer.js b/src/ol/renderer/canvas/VectorTileLayer.js index d860fe9f9c..ea2346213b 100644 --- a/src/ol/renderer/canvas/VectorTileLayer.js +++ b/src/ol/renderer/canvas/VectorTileLayer.js @@ -183,7 +183,7 @@ class CanvasVectorTileLayerRenderer extends CanvasTileLayerRenderer { /** * @param {import("../../Feature.js").default|import("../../render/Feature.js").default} feature Feature. - * @this {import("./VectorTileLayer.js").default} + * @this {CanvasVectorTileLayerRenderer} */ const render = function(feature) { let styles; @@ -490,7 +490,7 @@ CanvasVectorTileLayerRenderer['handles'] = function(layer) { * Create a layer renderer. * @param {import("../Map.js").default} mapRenderer The map renderer. * @param {import("../../layer/Layer.js").default} layer The layer to be rendererd. - * @return {import("./VectorTileLayer.js").default} The layer renderer. + * @return {CanvasVectorTileLayerRenderer} The layer renderer. */ CanvasVectorTileLayerRenderer['create'] = function(mapRenderer, layer) { return new CanvasVectorTileLayerRenderer(/** @type {import("../../layer/VectorTile.js").default} */ (layer)); diff --git a/src/ol/renderer/webgl/ImageLayer.js b/src/ol/renderer/webgl/ImageLayer.js index 5815c826fd..6468d062a1 100644 --- a/src/ol/renderer/webgl/ImageLayer.js +++ b/src/ol/renderer/webgl/ImageLayer.js @@ -327,7 +327,7 @@ WebGLImageLayerRenderer['handles'] = function(layer) { * Create a layer renderer. * @param {import("../Map.js").default} mapRenderer The map renderer. * @param {import("../../layer/Layer.js").default} layer The layer to be rendererd. - * @return {import("./ImageLayer.js").default} The layer renderer. + * @return {WebGLImageLayerRenderer} The layer renderer. */ WebGLImageLayerRenderer['create'] = function(mapRenderer, layer) { return new WebGLImageLayerRenderer( diff --git a/src/ol/renderer/webgl/Map.js b/src/ol/renderer/webgl/Map.js index 8e1b094c10..52a559939e 100644 --- a/src/ol/renderer/webgl/Map.js +++ b/src/ol/renderer/webgl/Map.js @@ -131,7 +131,7 @@ class WebGLMapRenderer extends MapRenderer { /** * @param {Array<*>} element Element. * @return {number} Priority. - * @this {import("./Map.js").default} + * @this {WebGLMapRenderer} */ (function(element) { const tileCenter = /** @type {import("../../coordinate.js").Coordinate} */ (element[1]); @@ -156,7 +156,7 @@ class WebGLMapRenderer extends MapRenderer { * @param {import("../../PluggableMap.js").default} map Map. * @param {?import("../../PluggableMap.js").FrameState} frameState Frame state. * @return {boolean} false. - * @this {import("./Map.js").default} + * @this {WebGLMapRenderer} */ this.loadNextTileTexture_ = function(map, frameState) { diff --git a/src/ol/renderer/webgl/TileLayer.js b/src/ol/renderer/webgl/TileLayer.js index e6876040a1..f263dddc52 100644 --- a/src/ol/renderer/webgl/TileLayer.js +++ b/src/ol/renderer/webgl/TileLayer.js @@ -399,7 +399,7 @@ WebGLTileLayerRenderer['handles'] = function(layer) { * Create a layer renderer. * @param {import("../Map.js").default} mapRenderer The map renderer. * @param {import("../../layer/Layer.js").default} layer The layer to be rendererd. - * @return {import("./TileLayer.js").default} The layer renderer. + * @return {WebGLTileLayerRenderer} The layer renderer. */ WebGLTileLayerRenderer['create'] = function(mapRenderer, layer) { return new WebGLTileLayerRenderer( diff --git a/src/ol/renderer/webgl/VectorLayer.js b/src/ol/renderer/webgl/VectorLayer.js index df36c1f59d..64021fad82 100644 --- a/src/ol/renderer/webgl/VectorLayer.js +++ b/src/ol/renderer/webgl/VectorLayer.js @@ -232,7 +232,7 @@ class WebGLVectorLayerRenderer extends WebGLLayerRenderer { vectorSource.loadFeatures(extent, resolution, projection); /** * @param {import("../../Feature.js").default} feature Feature. - * @this {import("./VectorLayer.js").default} + * @this {WebGLVectorLayerRenderer} */ const render = function(feature) { let styles; @@ -318,7 +318,7 @@ WebGLVectorLayerRenderer['handles'] = function(layer) { * Create a layer renderer. * @param {import("../Map.js").default} mapRenderer The map renderer. * @param {import("../../layer/Layer.js").default} layer The layer to be rendererd. - * @return {import("./VectorLayer.js").default} The layer renderer. + * @return {WebGLVectorLayerRenderer} The layer renderer. */ WebGLVectorLayerRenderer['create'] = function(mapRenderer, layer) { return new WebGLVectorLayerRenderer( diff --git a/src/ol/source/WMTS.js b/src/ol/source/WMTS.js index ef5dcab315..9f2e28d0b4 100644 --- a/src/ol/source/WMTS.js +++ b/src/ol/source/WMTS.js @@ -460,7 +460,7 @@ export function optionsFromCapabilities(wmtsCap, config) { /** * @param {string} template Template. * @return {import("../Tile.js").UrlFunction} Tile URL function. - * @this {import("./WMTS.js").default} + * @this {WMTS} */ function createFromWMTSTemplate(template) { const requestEncoding = this.requestEncoding_; diff --git a/src/ol/structs/LRUCache.js b/src/ol/structs/LRUCache.js index 5772f291b9..b603969913 100644 --- a/src/ol/structs/LRUCache.js +++ b/src/ol/structs/LRUCache.js @@ -96,7 +96,7 @@ class LRUCache extends EventTarget { /** - * @param {function(this: S, T, string, import("./LRUCache.js").default): ?} f The function + * @param {function(this: S, T, string, LRUCache): ?} f The function * to call for every entry from the oldest to the newer. This function takes * 3 arguments (the entry value, the entry key and the LRUCache object). * The return value is ignored. diff --git a/src/ol/structs/LinkedList.js b/src/ol/structs/LinkedList.js index c5faea7cb4..a8ead55720 100644 --- a/src/ol/structs/LinkedList.js +++ b/src/ol/structs/LinkedList.js @@ -227,7 +227,7 @@ class LinkedList { /** * Concatenates two lists. - * @param {import("./LinkedList.js").default} list List to merge into the current list. + * @param {LinkedList} list List to merge into the current list. */ concat(list) { if (list.head_) { diff --git a/src/ol/structs/RBush.js b/src/ol/structs/RBush.js index 71531fc389..ab7746db1d 100644 --- a/src/ol/structs/RBush.js +++ b/src/ol/structs/RBush.js @@ -228,7 +228,7 @@ class RBush { /** - * @param {import("./RBush.js").default} rbush R-Tree. + * @param {RBush} rbush R-Tree. */ concat(rbush) { this.rbush_.load(rbush.rbush_.all()); diff --git a/src/ol/style/Circle.js b/src/ol/style/Circle.js index 80e2757d30..b90febbb9c 100644 --- a/src/ol/style/Circle.js +++ b/src/ol/style/Circle.js @@ -41,7 +41,7 @@ class CircleStyle extends RegularShape { /** * Clones the style. If an atlasmanager was provided to the original style it will be used in the cloned style, too. - * @return {import("./Circle.js").default} The cloned style. + * @return {CircleStyle} The cloned style. * @override * @api */ diff --git a/src/ol/style/Fill.js b/src/ol/style/Fill.js index 60318fdcd2..3ff449d64f 100644 --- a/src/ol/style/Fill.js +++ b/src/ol/style/Fill.js @@ -41,7 +41,7 @@ class Fill { /** * Clones the style. The color is not cloned if it is an {@link module:ol/colorlike~ColorLike}. - * @return {import("./Fill.js").default} The cloned style. + * @return {Fill} The cloned style. * @api */ clone() { diff --git a/src/ol/style/Icon.js b/src/ol/style/Icon.js index ee89666dbb..f0309df9d5 100644 --- a/src/ol/style/Icon.js +++ b/src/ol/style/Icon.js @@ -202,7 +202,7 @@ class Icon extends ImageStyle { /** * Clones the style. The underlying Image/HTMLCanvasElement is not cloned. - * @return {import("./Icon.js").default} The cloned style. + * @return {Icon} The cloned style. * @api */ clone() { diff --git a/src/ol/style/IconImage.js b/src/ol/style/IconImage.js index 4e14851240..79c02c6fee 100644 --- a/src/ol/style/IconImage.js +++ b/src/ol/style/IconImage.js @@ -247,7 +247,7 @@ class IconImage extends EventTarget { * @param {?string} crossOrigin Cross origin. * @param {import("../ImageState.js").default} imageState Image state. * @param {import("../color.js").Color} color Color. - * @return {import("./IconImage.js").default} Icon image. + * @return {IconImage} Icon image. */ export function get(image, src, size, crossOrigin, imageState, color) { let iconImage = iconImageCache.get(src, crossOrigin, color); diff --git a/src/ol/style/RegularShape.js b/src/ol/style/RegularShape.js index 572da93c2d..5170bd8c7c 100644 --- a/src/ol/style/RegularShape.js +++ b/src/ol/style/RegularShape.js @@ -164,7 +164,7 @@ class RegularShape extends ImageStyle { /** * Clones the style. If an atlasmanager was provided to the original style it will be used in the cloned style, too. - * @return {import("./RegularShape.js").default} The cloned style. + * @return {RegularShape} The cloned style. * @api */ clone() { diff --git a/src/ol/style/Stroke.js b/src/ol/style/Stroke.js index e91477088d..f1891a0b79 100644 --- a/src/ol/style/Stroke.js +++ b/src/ol/style/Stroke.js @@ -87,7 +87,7 @@ class Stroke { /** * Clones the style. - * @return {import("./Stroke.js").default} The cloned style. + * @return {Stroke} The cloned style. * @api */ clone() { diff --git a/src/ol/style/Style.js b/src/ol/style/Style.js index d2b0b308c7..888e344987 100644 --- a/src/ol/style/Style.js +++ b/src/ol/style/Style.js @@ -100,7 +100,7 @@ import Stroke from '../style/Stroke.js'; * vector layer can be styled. * * @typedef {function((import("../Feature.js").default|import("../render/Feature.js").default), number): - * (import("./Style.js").default|Array)} StyleFunction + * (Style|Array