diff --git a/src/ol/Feature.js b/src/ol/Feature.js index d03b5905cf..752e0f096c 100644 --- a/src/ol/Feature.js +++ b/src/ol/Feature.js @@ -8,6 +8,14 @@ import BaseObject, {getChangeEventType} from './Object.js'; import Geometry from './geom/Geometry.js'; import Style from './style/Style.js'; +/** + * @typedef {typeof Feature|typeof import("./render/Feature.js").default} FeatureClass + */ + +/** + * @typedef {Feature|import("./render/Feature.js").default} FeatureLike + */ + /** * @classdesc * A vector object for geographic features with a geometry and other diff --git a/src/ol/format/Feature.js b/src/ol/format/Feature.js index b179b57b81..17b976f702 100644 --- a/src/ol/format/Feature.js +++ b/src/ol/format/Feature.js @@ -6,16 +6,6 @@ import {assign} from '../obj.js'; import {get as getProjection, equivalent as equivalentProjection, transformExtent} from '../proj.js'; -/** - * @typedef {typeof import("../Feature.js").default|typeof import("../render/Feature.js").default} FeatureClass - */ - - -/** - * @typedef {import("../Feature.js").default|import("../render/Feature.js").default} FeatureLike - */ - - /** * @typedef {Object} ReadOptions * @property {import("../proj.js").ProjectionLike} [dataProjection] Projection of the data we are reading. @@ -141,7 +131,7 @@ class FeatureFormat { * @abstract * @param {Document|Node|Object|string} source Source. * @param {ReadOptions=} opt_options Read options. - * @return {FeatureLike} Feature. + * @return {import("../Feature.js").FeatureLike} Feature. */ readFeature(source, opt_options) {} @@ -151,7 +141,7 @@ class FeatureFormat { * @abstract * @param {Document|Node|ArrayBuffer|Object|string} source Source. * @param {ReadOptions=} opt_options Read options. - * @return {Array} Features. + * @return {Array} Features. */ readFeatures(source, opt_options) {} diff --git a/src/ol/format/MVT.js b/src/ol/format/MVT.js index dfca63c325..7c67c1ce6c 100644 --- a/src/ol/format/MVT.js +++ b/src/ol/format/MVT.js @@ -23,7 +23,7 @@ import RenderFeature from '../render/Feature.js'; /** * @typedef {Object} Options - * @property {import("./Feature.js").FeatureClass} [featureClass] Class for features returned by + * @property {import("../Feature.js").FeatureClass} [featureClass] Class for features returned by * {@link module:ol/format/MVT#readFeatures}. Set to {@link module:ol/Feature~Feature} to get full editing and geometry * support at the cost of decreased rendering performance. The default is * {@link module:ol/render/Feature~RenderFeature}, which is optimized for rendering and hit detection. @@ -61,7 +61,7 @@ class MVT extends FeatureFormat { /** * @private - * @type {import("./Feature.js").FeatureClass} + * @type {import("../Feature.js").FeatureClass} */ this.featureClass_ = options.featureClass ? options.featureClass : RenderFeature; diff --git a/src/ol/interaction/DragAndDrop.js b/src/ol/interaction/DragAndDrop.js index cce32ccb1f..b1b20765ae 100644 --- a/src/ol/interaction/DragAndDrop.js +++ b/src/ol/interaction/DragAndDrop.js @@ -56,7 +56,7 @@ class DragAndDropEvent extends Event { /** * The features parsed from dropped data. - * @type {Array|undefined} + * @type {Array|undefined} * @api */ this.features = opt_features; @@ -220,7 +220,7 @@ class DragAndDrop extends Interaction { * @param {string} text Text. * @param {import("../format/Feature.js").ReadOptions} options Read options. * @private - * @return {Array} Features. + * @return {Array} Features. */ tryReadFeatures_(format, text, options) { try {