ol 9.2.5-sh.2 → 10.0.1-dev.1722076459273

package/format/JSONFeature.js

@@ -10,8 +10,8 @@ import {abstract} from '../util.js';
  * instantiated in apps.
  * Base class for JSON feature formats.
  *
- * @template {import('../Feature.js').FeatureClass} [FeatureClassType=import('./Feature.js').FeatureToFeatureClass<import("../Feature.js").default>]
- * @extends {FeatureFormat<FeatureClassType>}
+ * @template {import('../Feature.js').FeatureLike} [FeatureType=import("../Feature.js").default]
+ * @extends {FeatureFormat<FeatureType>}
  * @abstract
  */
 class JSONFeature extends FeatureFormat {
@@ -21,6 +21,7 @@ class JSONFeature extends FeatureFormat {
 
   /**
    * @return {import("./Feature.js").Type} Format.
+   * @override
    */
   getType() {
     return 'json';
@@ -32,8 +33,9 @@ class JSONFeature extends FeatureFormat {
    *
    * @param {ArrayBuffer|Document|Element|Object|string} source Source.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
-   * @return {import('./Feature.js').FeatureClassToFeature<FeatureClassType>|Array<import('./Feature.js').FeatureClassToFeature<FeatureClassType>>} Feature.
+   * @return {FeatureType|Array<FeatureType>} Feature.
    * @api
+   * @override
    */
   readFeature(source, options) {
     return this.readFeatureFromObject(
@@ -48,15 +50,14 @@ class JSONFeature extends FeatureFormat {
    *
    * @param {ArrayBuffer|Document|Element|Object|string} source Source.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
-   * @return {Array<import('./Feature.js').FeatureClassToFeature<FeatureClassType>>} Features.
+   * @return {Array<FeatureType>} Features.
    * @api
+   * @override
    */
   readFeatures(source, options) {
-    return /** @type {Array<import('./Feature.js').FeatureClassToFeature<FeatureClassType>>} */ (
-      this.readFeaturesFromObject(
-        getObject(source),
-        this.getReadOptions(source, options),
-      )
+    return this.readFeaturesFromObject(
+      getObject(source),
+      this.getReadOptions(source, options),
     );
   }
 
@@ -65,7 +66,7 @@ class JSONFeature extends FeatureFormat {
    * @param {Object} object Object.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @protected
-   * @return {import('./Feature.js').FeatureClassToFeature<FeatureClassType>|Array<import('./Feature.js').FeatureClassToFeature<FeatureClassType>>} Feature.
+   * @return {FeatureType|Array<FeatureType>} Feature.
    */
   readFeatureFromObject(object, options) {
     return abstract();
@@ -76,7 +77,7 @@ class JSONFeature extends FeatureFormat {
    * @param {Object} object Object.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @protected
-   * @return {Array<import('./Feature.js').FeatureClassToFeature<FeatureClassType>>} Features.
+   * @return {Array<FeatureType>} Features.
    */
   readFeaturesFromObject(object, options) {
     return abstract();
@@ -89,6 +90,7 @@ class JSONFeature extends FeatureFormat {
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @return {import("../geom/Geometry.js").default} Geometry.
    * @api
+   * @override
    */
   readGeometry(source, options) {
     return this.readGeometryFromObject(
@@ -114,6 +116,7 @@ class JSONFeature extends FeatureFormat {
    * @param {ArrayBuffer|Document|Element|Object|string} source Source.
    * @return {import("../proj/Projection.js").default} Projection.
    * @api
+   * @override
    */
   readProjection(source) {
     return this.readProjectionFromObject(getObject(source));
@@ -136,6 +139,7 @@ class JSONFeature extends FeatureFormat {
    * @param {import("./Feature.js").WriteOptions} [options] Write options.
    * @return {string} Encoded feature.
    * @api
+   * @override
    */
   writeFeature(feature, options) {
     return JSON.stringify(this.writeFeatureObject(feature, options));
@@ -158,6 +162,7 @@ class JSONFeature extends FeatureFormat {
    * @param {import("./Feature.js").WriteOptions} [options] Write options.
    * @return {string} Encoded features.
    * @api
+   * @override
    */
   writeFeatures(features, options) {
     return JSON.stringify(this.writeFeaturesObject(features, options));
@@ -180,6 +185,7 @@ class JSONFeature extends FeatureFormat {
    * @param {import("./Feature.js").WriteOptions} [options] Write options.
    * @return {string} Encoded geometry.
    * @api
+   * @override
    */
   writeGeometry(geometry, options) {
     return JSON.stringify(this.writeGeometryObject(geometry, options));

package/format/KML.d.ts

@@ -265,7 +265,7 @@ declare class KML extends XMLFeature {
      * @return {Array<KMLCamera>} Cameras.
      * @api
      */
-    readCamera(source: Document | Element | string): {
+    readCamera(source: Document | Element | string): Array<{
         /**
          * Latitude of the camera.
          */
@@ -294,12 +294,12 @@ declare class KML extends XMLFeature {
          * Vertical camera rotation.
          */
         Roll?: number | undefined;
-    }[];
+    }>;
     /**
      * @param {Document} doc Document.
      * @return {Array<KMLCamera>} Cameras.
      */
-    readCameraFromDocument(doc: Document): {
+    readCameraFromDocument(doc: Document): Array<{
         /**
          * Latitude of the camera.
          */
@@ -328,13 +328,13 @@ declare class KML extends XMLFeature {
          * Vertical camera rotation.
          */
         Roll?: number | undefined;
-    }[];
+    }>;
     /**
      * @param {Element} node Node.
      * @return {Array<KMLCamera>} Cameras.
      * @api
      */
-    readCameraFromNode(node: Element): {
+    readCameraFromNode(node: Element): Array<{
         /**
          * Latitude of the camera.
          */
@@ -363,7 +363,7 @@ declare class KML extends XMLFeature {
          * Vertical camera rotation.
          */
         Roll?: number | undefined;
-    }[];
+    }>;
 }
 import XMLFeature from './XMLFeature.js';
 //# sourceMappingURL=KML.d.ts.map

package/format/KML.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"KML.d.ts","sourceRoot":"","sources":["KML.js"],"names":[],"mappings":"AAmNA;;;GAGG;AACH,uCAFY,IAAI,GAAC,IAAI,CAIpB;AAgCD;;;GAGG;AACH,wCAFY,OAAO,mBAAmB,EAAE,OAAO,GAAC,IAAI,CAInD;AAYD;;;GAGG;AACH,yCAFY,MAAM,GAAC,IAAI,CAItB;AAYD;;;GAGG;AACH,uCAFY,IAAI,GAAC,IAAI,CAIpB;AAOD;;;GAGG;AACH,mCAFY,KAAK,GAAC,IAAI,CAIrB;AAOD;;;GAGG;AACH,wCAFY,MAAM,KAAK,CAAC,GAAC,IAAI,CAI5B;AAq2BD;;;GAGG;AACH,0CAHW,IAAI,GACH,MAAM,MAAM,CAAC,GAAC,SAAS,CAsBlC;;;;;;;qCA5yBqB,MAAM,KAAE,MAAM;;;;;OAxVtB,MAAM;;;;YACN,OAAO,kBAAkB,EAAE,eAAe;;;;OAC1C,MAAM;;;;YACN,OAAO,kBAAkB,EAAE,eAAe;;;;;;;;;;iBAM1C,MAAM,MAAM,MAAM,CAAC,CAAC;;;;WACpB,MAAM,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA5DV,kBAAkB;mBAUhB,oBAAoB;iBAEtB,kBAAkB;kBADjB,mBAAmB;AA4YrC;;;;;;;;;;;GAWG;AAEH;;;;;;;;;;;;GAYG;AACH;IACE;;OAEG;IACH,2CA8DC;IAhDC;;;OAGG;IACH,sBAEuB;IAEvB;;;OAGG;IACH,uBACoE;IAEpE;;OAEG;IACH,cAFU,OAAO,CAG+C;IAEhE;;;OAGG;IACH,sBAAuB;IAEvB;;;OAGG;IACH,wBACsE;IAEtE;;OAEG;IACH,cAFU,IAAI,GAAC,MAAM,CAGkD;IAEvE;;OAEG;IACH,kBAFU,eAAe,CAIC;IAK5B;;;;;OAKG;IACH,8BAgBC;IAED;;;;;OAKG;IACH,uBA8CC;IAED;;;;OAIG;IACH,yBAmBC;IAED;;;;OAIG;IACH,4BAqBC;IA+DD;;;;;;OAMG;IACH,iBAJW,QAAQ,GAAC,OAAO,GAAC,MAAM,GACtB,MAAM,GAAC,SAAS,CAe3B;IAED;;;OAGG;IACH,0BAHW,QAAQ,GACP,MAAM,GAAC,SAAS,CAY3B;IAED;;;OAGG;IACH,uBAHW,OAAO,GACN,MAAM,GAAC,SAAS,CAwB3B;IAED;;;;;;OAMG;IACH,yBAJW,QAAQ,GAAC,OAAO,GAAC,MAAM,GACtB,UAAa,CAoBxB;IAED;;;OAGG;IACH,kCAHW,QAAQ,GACP,UAAa,CAaxB;IAED;;;OAGG;IACH,+BAHW,OAAO,GACN,UAAa,CAuBxB;IAED;;;;;;OAMG;IACH,mBAJW,QAAQ,GAAC,OAAO,GAAC,MAAM,GACtB,UAAa,CAiBxB;IAED;;;OAGG;IACH,4BAHW,QAAQ,GACP,UAAa,CAUxB;IAED;;;;OAIG;IACH,yBAJW,OAAO,GACN,UAAa,CAqBxB;IAED;;;;;;;;;OASG;IAEH;;;;;;OAMG;IACH,mBAJW,QAAQ,GAAC,OAAO,GAAC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAkBjC;IAED;;;OAGG;IACH,4BAHW,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAWlB;IAED;;;;OAIG;IACH,yBAJW,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAyBjB;CA8CF;uBAt+BsB,iBAAiB"}
+{"version":3,"file":"KML.d.ts","sourceRoot":"","sources":["KML.js"],"names":[],"mappings":"AAmNA;;;GAGG;AACH,uCAFY,IAAI,GAAC,IAAI,CAIpB;AAgCD;;;GAGG;AACH,wCAFY,OAAO,mBAAmB,EAAE,OAAO,GAAC,IAAI,CAInD;AAYD;;;GAGG;AACH,yCAFY,MAAM,GAAC,IAAI,CAItB;AAYD;;;GAGG;AACH,uCAFY,IAAI,GAAC,IAAI,CAIpB;AAOD;;;GAGG;AACH,mCAFY,KAAK,GAAC,IAAI,CAIrB;AAOD;;;GAGG;AACH,wCAFY,KAAK,CAAC,KAAK,CAAC,GAAC,IAAI,CAI5B;AAw2BD;;;GAGG;AACH,0CAHW,IAAI,GACH,KAAK,CAAC,MAAM,CAAC,GAAC,SAAS,CAsBlC;;;;;;;8BA/yBY,CAAS,IAAM,EAAN,MAAM,KAAE,MAAM;;;;;OAxVtB,MAAM;;;;YACN,OAAO,kBAAkB,EAAE,eAAe;;;;OAC1C,MAAM;;;;YACN,OAAO,kBAAkB,EAAE,eAAe;;;;;;;;;;iBAM1C,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;;;;WACpB,KAAK,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA5DV,kBAAkB;mBAUhB,oBAAoB;iBAEtB,kBAAkB;kBADjB,mBAAmB;AA4YrC;;;;;;;;;;;GAWG;AAEH;;;;;;;;;;;;GAYG;AACH;IACE;;OAEG;IACH,2CA8DC;IAhDC;;;OAGG;IACH,sBAEuB;IAEvB;;;OAGG;IACH,uBACoE;IAEpE;;OAEG;IACH,cAFU,OAAO,CAG+C;IAEhE;;;OAGG;IACH,sBAAuB;IAEvB;;;OAGG;IACH,wBACsE;IAEtE;;OAEG;IACH,cAFU,IAAI,GAAC,MAAM,CAGkD;IAEvE;;OAEG;IACH,kBAFU,eAAe,CAIC;IAK5B;;;;;OAKG;IACH,8BAgBC;IAED;;;;;OAKG;IACH,uBA8CC;IAED;;;;OAIG;IACH,yBAmBC;IAED;;;;OAIG;IACH,4BAqBC;IAiED;;;;;;OAMG;IACH,iBAJW,QAAQ,GAAC,OAAO,GAAC,MAAM,GACtB,MAAM,GAAC,SAAS,CAe3B;IAED;;;OAGG;IACH,0BAHW,QAAQ,GACP,MAAM,GAAC,SAAS,CAY3B;IAED;;;OAGG;IACH,uBAHW,OAAO,GACN,MAAM,GAAC,SAAS,CAwB3B;IAED;;;;;;OAMG;IACH,yBAJW,QAAQ,GAAC,OAAO,GAAC,MAAM,GACtB,KAAK,KAAQ,CAoBxB;IAED;;;OAGG;IACH,kCAHW,QAAQ,GACP,KAAK,KAAQ,CAaxB;IAED;;;OAGG;IACH,+BAHW,OAAO,GACN,KAAK,KAAQ,CAuBxB;IAED;;;;;;OAMG;IACH,mBAJW,QAAQ,GAAC,OAAO,GAAC,MAAM,GACtB,KAAK,KAAQ,CAiBxB;IAED;;;OAGG;IACH,4BAHW,QAAQ,GACP,KAAK,KAAQ,CAUxB;IAED;;;;OAIG;IACH,yBAJW,OAAO,GACN,KAAK,KAAQ,CAqBxB;IAED;;;;;;;;;OASG;IAEH;;;;;;OAMG;IACH,mBAJW,QAAQ,GAAC,OAAO,GAAC,MAAM,GACtB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAW,CAiB3B;IAED;;;OAGG;IACH,4BAHW,QAAQ,GACP,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAW,CAU3B;IAED;;;;OAIG;IACH,yBAJW,OAAO,GACN,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAW,CAwB3B;CA+CF;uBAz+BsB,iBAAiB"}

package/format/KML.js

@@ -639,6 +639,7 @@ class KML extends XMLFeature {
    * @param {Element} node Node.
    * @param {import("./Feature.js").ReadOptions} [options] Options.
    * @return {import("../Feature.js").default} Feature.
+   * @override
    */
   readFeatureFromNode(node, options) {
     if (!NAMESPACE_URIS.includes(node.namespaceURI)) {
@@ -658,6 +659,7 @@ class KML extends XMLFeature {
    * @param {Element} node Node.
    * @param {import("./Feature.js").ReadOptions} [options] Options.
    * @return {Array<import("../Feature.js").default>} Features.
+   * @override
    */
   readFeaturesFromNode(node, options) {
     if (!NAMESPACE_URIS.includes(node.namespaceURI)) {
@@ -977,6 +979,7 @@ class KML extends XMLFeature {
    * @param {import("./Feature.js").WriteOptions} [options] Options.
    * @return {Node} Node.
    * @api
+   * @override
    */
   writeFeaturesNode(features, options) {
     options = this.adaptOptions(options);
@@ -1849,7 +1852,7 @@ function readMultiGeometry(node, objectStack) {
     } else if (type == 'Polygon') {
       multiGeometry = new MultiPolygon(geometries);
       setCommonGeometryProperties(multiGeometry, geometries);
-    } else if (type == 'GeometryCollection') {
+    } else if (type == 'GeometryCollection' || type.startsWith('Multi')) {
       multiGeometry = new GeometryCollection(geometries);
     } else {
       throw new Error('Unknown geometry type found');
@@ -2165,6 +2168,7 @@ const PAIR_PARSERS = makeStructureNS(NAMESPACE_URIS, {
 });
 
 /**
+ * @this {KML}
  * @param {Element} node Node.
  * @param {Array<*>} objectStack Object stack.
  */

package/format/MVT.d.ts

@@ -1,12 +1,12 @@
 export default MVT;
-export type Options<FeatureClassType extends import("../Feature.js").FeatureClass = typeof RenderFeature> = {
+export type Options<FeatureType extends import("../Feature.js").FeatureLike = RenderFeature> = {
     /**
      * Class for features returned by
      * {@link module :ol/format/MVT~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.
      */
-    featureClass?: FeatureClassType | undefined;
+    featureClass?: import("./Feature.js").FeatureToFeatureClass<FeatureType> | undefined;
     /**
      * Geometry name to use when creating features.
      */
@@ -26,9 +26,9 @@ export type Options<FeatureClassType extends import("../Feature.js").FeatureClas
     idProperty?: string | undefined;
 };
 /**
- * @template {import("../Feature.js").FeatureClass} [FeatureClassType=import('./Feature.js').FeatureToFeatureClass<import("../render/Feature.js").default>]
+ * @template {import("../Feature.js").FeatureLike} [FeatureType=import("../render/Feature.js").default]
  * @typedef {Object} Options
- * @property {FeatureClassType} [featureClass] Class for features returned by
+ * @property {import('./Feature.js').FeatureToFeatureClass<FeatureType>} [featureClass] Class for features returned by
  * {@link module:ol/format/MVT~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.
@@ -42,15 +42,15 @@ export type Options<FeatureClassType extends import("../Feature.js").FeatureClas
  * @classdesc
  * Feature format for reading data in the Mapbox MVT format.
  *
- * @template {import('../Feature.js').FeatureClass} [FeatureClassType=import('./Feature.js').FeatureToFeatureClass<import("../render/Feature.js").default>]
- * @extends {FeatureFormat<FeatureClassType>}
+ * @template {import('../Feature.js').FeatureLike} [FeatureType=RenderFeature]
+ * @extends {FeatureFormat<FeatureType>}
  * @api
  */
-declare class MVT<FeatureClassType extends import("../Feature.js").FeatureClass = typeof RenderFeature> extends FeatureFormat<FeatureClassType> {
+declare class MVT<FeatureType extends import("../Feature.js").FeatureLike = RenderFeature> extends FeatureFormat<FeatureType> {
     /**
-     * @param {Options<FeatureClassType>} [options] Options.
+     * @param {Options<FeatureType>} [options] Options.
      */
-    constructor(options?: Options<FeatureClassType> | undefined);
+    constructor(options?: Options<FeatureType> | undefined);
     /**
      * @private
      * @type {string|undefined}
@@ -86,7 +86,7 @@ declare class MVT<FeatureClassType extends import("../Feature.js").FeatureClass
      * @param {PBF} pbf PBF
      * @param {Object} rawFeature Raw Mapbox feature.
      * @param {import("./Feature.js").ReadOptions} options Read options.
-     * @return {import('./Feature.js').FeatureClassToFeature<FeatureClassType>|null} Feature.
+     * @return {FeatureType|null} Feature.
      */
     private createFeature_;
     /**
@@ -94,18 +94,20 @@ declare class MVT<FeatureClassType extends import("../Feature.js").FeatureClass
      *
      * @param {ArrayBuffer} source Source.
      * @param {import("./Feature.js").ReadOptions} [options] Read options.
-     * @return {Array<import('./Feature.js').FeatureClassToFeature<FeatureClassType>>} Features.
+     * @return {Array<FeatureType>} Features.
      * @api
+     * @override
      */
-    readFeatures(source: ArrayBuffer, options?: import("./Feature.js").ReadOptions | undefined): Array<import('./Feature.js').FeatureClassToFeature<FeatureClassType>>;
+    override readFeatures(source: ArrayBuffer, options?: import("./Feature.js").ReadOptions | undefined): Array<FeatureType>;
     /**
      * Read the projection from the source.
      *
      * @param {Document|Element|Object|string} source Source.
      * @return {import("../proj/Projection.js").default} Projection.
      * @api
+     * @override
      */
-    readProjection(source: Document | Element | any | string): import("../proj/Projection.js").default;
+    override readProjection(source: Document | Element | any | string): import("../proj/Projection.js").default;
     /**
      * Sets the layers that features will be read from.
      * @param {Array<string>} layers Layers.

package/format/MVT.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MVT.d.ts","sourceRoot":"","sources":["MVT.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBA;;;;;;;;;;;;GAYG;AAEH;;;;;;;GAOG;AACH;IACE;;OAEG;IACH,6DA6CC;IA5BC;;;OAGG;IACH,sBAAyC;IAEzC;;;OAGG;IACH,mBAAiE;IAEjE;;;OAGG;IACH,gBAAqD;IAErD;;;OAGG;IACH,oBAAqC;IAQvC;;;;;;;;OAQG;IACH,yBAoDC;IAED;;;;;;OAMG;IACH,uBAqEC;IASD;;;;;;;OAOG;IACH,qBALW,WAAW,6DAEV,MAAM,OAAO,cAAc,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CAkChF;IAED;;;;;;OAMG;IACH,uBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,CAKlD;IAED;;;;OAIG;IACH,kBAHW,MAAM,MAAM,CAAC,QAKvB;CACF;0BA7RyB,sBAAsB;0BATU,cAAc"}
+{"version":3,"file":"MVT.d.ts","sourceRoot":"","sources":["MVT.js"],"names":[],"mappings":";oBAmBoD,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;;;;;;;;;;;;;;;;;;;;;;;;;;AADlD;;;;;;;;;;;;GAYG;AAEH;;;;;;;GAOG;AACH,kBAJoD,WAAW,SAAlD,OAAQ,eAAe,EAAE,WAAY;IAKhD;;OAEG;IACH,wDA+CC;IA5BC;;;OAGG;IACH,sBAAyC;IAEzC;;;OAGG;IACH,mBAAiE;IAEjE;;;OAGG;IACH,gBAAqD;IAErD;;;OAGG;IACH,oBAAqC;IAQvC;;;;;;;;OAQG;IACH,yBAoDC;IAED;;;;;;OAMG;IACH,uBAmEC;IAUD;;;;;;;;OAQG;IACH,8BANW,WAAW,6DAEV,KAAK,CAAC,WAAW,CAAC,CAiC7B;IAED;;;;;;;OAOG;IACH,gCALW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,CAMlD;IAED;;;;OAIG;IACH,kBAHW,KAAK,CAAC,MAAM,CAAC,QAKvB;CACF;0BA9RyB,sBAAsB;0BATU,cAAc"}

package/format/MVT.js

@@ -17,9 +17,9 @@ import {get} from '../proj.js';
 import {inflateEnds} from '../geom/flat/orient.js';
 
 /**
- * @template {import("../Feature.js").FeatureClass} [FeatureClassType=import('./Feature.js').FeatureToFeatureClass<import("../render/Feature.js").default>]
+ * @template {import("../Feature.js").FeatureLike} [FeatureType=import("../render/Feature.js").default]
  * @typedef {Object} Options
- * @property {FeatureClassType} [featureClass] Class for features returned by
+ * @property {import('./Feature.js').FeatureToFeatureClass<FeatureType>} [featureClass] Class for features returned by
  * {@link module:ol/format/MVT~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.
@@ -34,13 +34,13 @@ import {inflateEnds} from '../geom/flat/orient.js';
  * @classdesc
  * Feature format for reading data in the Mapbox MVT format.
  *
- * @template {import('../Feature.js').FeatureClass} [FeatureClassType=import('./Feature.js').FeatureToFeatureClass<import("../render/Feature.js").default>]
- * @extends {FeatureFormat<FeatureClassType>}
+ * @template {import('../Feature.js').FeatureLike} [FeatureType=RenderFeature]
+ * @extends {FeatureFormat<FeatureType>}
  * @api
  */
 class MVT extends FeatureFormat {
   /**
-   * @param {Options<FeatureClassType>} [options] Options.
+   * @param {Options<FeatureType>} [options] Options.
    */
   constructor(options) {
     super();
@@ -57,7 +57,9 @@ class MVT extends FeatureFormat {
 
     this.featureClass = options.featureClass
       ? options.featureClass
-      : /** @type {FeatureClassType} */ (RenderFeature);
+      : /** @type {import('./Feature.js').FeatureToFeatureClass<FeatureType>} */ (
+          RenderFeature
+        );
 
     /**
      * @private
@@ -157,7 +159,7 @@ class MVT extends FeatureFormat {
    * @param {PBF} pbf PBF
    * @param {Object} rawFeature Raw Mapbox feature.
    * @param {import("./Feature.js").ReadOptions} options Read options.
-   * @return {import('./Feature.js').FeatureClassToFeature<FeatureClassType>|null} Feature.
+   * @return {FeatureType|null} Feature.
    */
   createFeature_(pbf, rawFeature, options) {
     const type = rawFeature.type;
@@ -225,13 +227,12 @@ class MVT extends FeatureFormat {
       feature.setProperties(values, true);
     }
 
-    return /** @type {import('./Feature.js').FeatureClassToFeature<FeatureClassType>} */ (
-      feature
-    );
+    return /** @type {FeatureType} */ (feature);
   }
 
   /**
    * @return {import("./Feature.js").Type} Format.
+   * @override
    */
   getType() {
     return 'arraybuffer';
@@ -242,8 +243,9 @@ class MVT extends FeatureFormat {
    *
    * @param {ArrayBuffer} source Source.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
-   * @return {Array<import('./Feature.js').FeatureClassToFeature<FeatureClassType>>} Features.
+   * @return {Array<FeatureType>} Features.
    * @api
+   * @override
    */
   readFeatures(source, options) {
     const layers = this.layers_;
@@ -273,9 +275,7 @@ class MVT extends FeatureFormat {
       }
     }
 
-    return /** @type {Array<import('./Feature.js').FeatureClassToFeature<FeatureClassType>>} */ (
-      features
-    );
+    return /** @type {Array<FeatureType>} */ (features);
   }
 
   /**
@@ -284,6 +284,7 @@ class MVT extends FeatureFormat {
    * @param {Document|Element|Object|string} source Source.
    * @return {import("../proj/Projection.js").default} Projection.
    * @api
+   * @override
    */
   readProjection(source) {
     return this.dataProjection;

package/format/OSMXML.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OSMXML.d.ts","sourceRoot":"","sources":["OSMXML.js"],"names":[],"mappings":";AAyCA;;;;;;GAMG;AACH;CA+DC;uBAvGsB,iBAAiB"}
+{"version":3,"file":"OSMXML.d.ts","sourceRoot":"","sources":["OSMXML.js"],"names":[],"mappings":";AAyCA;;;;;;GAMG;AACH;CAgEC;uBAxGsB,iBAAiB"}

package/format/OSMXML.js

@@ -61,6 +61,7 @@ class OSMXML extends XMLFeature {
    * @param {Element} node Node.
    * @param {import("./Feature.js").ReadOptions} [options] Options.
    * @return {Array<import("../Feature.js").default>} Features.
+   * @override
    */
   readFeaturesFromNode(node, options) {
     options = this.getReadOptions(node, options);

package/format/OWS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OWS.d.ts","sourceRoot":"","sources":["OWS.js"],"names":[],"mappings":";AA8BA;CAaC;gBAxCe,UAAU"}
+{"version":3,"file":"OWS.d.ts","sourceRoot":"","sources":["OWS.js"],"names":[],"mappings":";AA8BA;CAcC;gBAzCe,UAAU"}

package/format/OWS.js

@@ -36,6 +36,7 @@ class OWS extends XML {
   /**
    * @param {Element} node Node.
    * @return {Object|null} Object
+   * @override
    */
   readFromNode(node) {
     const owsObject = pushParseAndPop({}, PARSERS, node, []);

package/format/Polyline.d.ts

@@ -136,22 +136,25 @@ declare class Polyline extends TextFeature {
      * @param {import("./Feature.js").WriteOptions} [options] Write options.
      * @protected
      * @return {string} Text.
+     * @override
      */
-    protected writeFeatureText(feature: import("../Feature.js").default<LineString>, options?: import("./Feature.js").WriteOptions | undefined): string;
+    protected override writeFeatureText(feature: import("../Feature.js").default<LineString>, options?: import("./Feature.js").WriteOptions | undefined): string;
     /**
      * @param {Array<import("../Feature.js").default<LineString>>} features Features.
      * @param {import("./Feature.js").WriteOptions} [options] Write options.
      * @protected
      * @return {string} Text.
+     * @override
      */
-    protected writeFeaturesText(features: Array<import("../Feature.js").default<LineString>>, options?: import("./Feature.js").WriteOptions | undefined): string;
+    protected override writeFeaturesText(features: Array<import("../Feature.js").default<LineString>>, options?: import("./Feature.js").WriteOptions | undefined): string;
     /**
      * @param {LineString} geometry Geometry.
      * @param {import("./Feature.js").WriteOptions} [options] Write options.
      * @protected
      * @return {string} Text.
+     * @override
      */
-    protected writeGeometryText(geometry: LineString, options?: import("./Feature.js").WriteOptions | undefined): string;
+    protected override writeGeometryText(geometry: LineString, options?: import("./Feature.js").WriteOptions | undefined): string;
 }
 import TextFeature from './TextFeature.js';
 import LineString from '../geom/LineString.js';

package/format/Polyline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Polyline.d.ts","sourceRoot":"","sources":["Polyline.js"],"names":[],"mappings":"AAwJA;;;;;;;;;;;;GAYG;AACH,sCARW,MAAM,MAAM,CAAC,UACb,MAAM,gCAIL,MAAM,CAuBjB;AAED;;;;;;;;;;GAUG;AACH,sCARW,MAAM,UACN,MAAM,gCAIL,MAAM,MAAM,CAAC,CAwBxB;AAED;;;;;;;;;;;GAWG;AACH,sCAPW,MAAM,MAAM,CAAC,gCAIZ,MAAM,CAUjB;AAED;;;;;;;;GAQG;AACH,sCANW,MAAM,gCAGL,MAAM,MAAM,CAAC,CAUxB;AAED;;;;;;;GAOG;AACH,8CAHW,MAAM,MAAM,CAAC,GACZ,MAAM,CAQjB;AAED;;;;;GAKG;AACH,8CAHW,MAAM,GACL,MAAM,MAAM,CAAC,CASxB;AAED;;;;;GAKG;AACH,gDAHW,MAAM,MAAM,CAAC,GACZ,MAAM,CAQjB;AAED;;;;;GAKG;AACH,gDAHW,MAAM,GACL,MAAM,MAAM,CAAC,CAkBxB;AAED;;;;;GAKG;AACH,2CAHW,MAAM,GACL,MAAM,CAajB;;;;;;;;;;;;;AA9UD;;;;;GAKG;AAEH;;;;;;;;;;;;;GAaG;AACH;IACE;;OAEG;IACH,2CAuBC;IAbC;;;OAGG;IACH,gBAAoD;IAEpD;;;OAGG;IACH,wBAEQ;IAkDV;;;;;OAKG;IACH,oCALW,OAAO,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,8DAG1C,MAAM,CAQjB;IAED;;;;;OAKG;IACH,sCALW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,8DAGjD,MAAM,CAIjB;IAED;;;;;OAKG;IACH,sCALW,UAAU,8DAGT,MAAM,CAYjB;CACF;wBAjJuB,kBAAkB;uBADnB,uBAAuB"}
+{"version":3,"file":"Polyline.d.ts","sourceRoot":"","sources":["Polyline.js"],"names":[],"mappings":"AA8JA;;;;;;;;;;;;GAYG;AACH,sCARW,KAAK,CAAC,MAAM,CAAC,UACb,MAAM,gCAIL,MAAM,CAuBjB;AAED;;;;;;;;;;GAUG;AACH,sCARW,MAAM,UACN,MAAM,gCAIL,KAAK,CAAC,MAAM,CAAC,CAwBxB;AAED;;;;;;;;;;;GAWG;AACH,sCAPW,KAAK,CAAC,MAAM,CAAC,gCAIZ,MAAM,CAUjB;AAED;;;;;;;;GAQG;AACH,sCANW,MAAM,gCAGL,KAAK,CAAC,MAAM,CAAC,CAUxB;AAED;;;;;;;GAOG;AACH,8CAHW,KAAK,CAAC,MAAM,CAAC,GACZ,MAAM,CAQjB;AAED;;;;;GAKG;AACH,8CAHW,MAAM,GACL,KAAK,CAAC,MAAM,CAAC,CASxB;AAED;;;;;GAKG;AACH,gDAHW,KAAK,CAAC,MAAM,CAAC,GACZ,MAAM,CAQjB;AAED;;;;;GAKG;AACH,gDAHW,MAAM,GACL,KAAK,CAAC,MAAM,CAAC,CAkBxB;AAED;;;;;GAKG;AACH,2CAHW,MAAM,GACL,MAAM,CAajB;;;;;;;;;;;;;AApVD;;;;;GAKG;AAEH;;;;;;;;;;;;;GAaG;AACH;IACE;;OAEG;IACH,2CAuBC;IAbC;;;OAGG;IACH,gBAAoD;IAEpD;;;OAGG;IACH,wBAEQ;IAqDV;;;;;;OAMG;IACH,6CANW,OAAO,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,8DAG1C,MAAM,CASjB;IAED;;;;;;OAMG;IACH,+CANW,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,8DAGjD,MAAM,CAKjB;IAED;;;;;;OAMG;IACH,+CANW,UAAU,8DAGT,MAAM,CAajB;CACF;wBAvJuB,kBAAkB;uBADnB,uBAAuB"}

package/format/Polyline.js

@@ -65,6 +65,7 @@ class Polyline extends TextFeature {
    * @param {string} text Text.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @return {import("../Feature.js").default} Feature.
+   * @override
    */
   readFeatureFromText(text, options) {
     const geometry = this.readGeometryFromText(text, options);
@@ -76,6 +77,7 @@ class Polyline extends TextFeature {
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @protected
    * @return {Array<Feature>} Features.
+   * @override
    */
   readFeaturesFromText(text, options) {
     const feature = this.readFeatureFromText(text, options);
@@ -87,6 +89,7 @@ class Polyline extends TextFeature {
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @protected
    * @return {import("../geom/Geometry.js").default} Geometry.
+   * @override
    */
   readGeometryFromText(text, options) {
     const stride = getStrideForLayout(this.geometryLayout_);
@@ -112,6 +115,7 @@ class Polyline extends TextFeature {
    * @param {import("./Feature.js").WriteOptions} [options] Write options.
    * @protected
    * @return {string} Text.
+   * @override
    */
   writeFeatureText(feature, options) {
     const geometry = feature.getGeometry();
@@ -126,6 +130,7 @@ class Polyline extends TextFeature {
    * @param {import("./Feature.js").WriteOptions} [options] Write options.
    * @protected
    * @return {string} Text.
+   * @override
    */
   writeFeaturesText(features, options) {
     return this.writeFeatureText(features[0], options);
@@ -136,6 +141,7 @@ class Polyline extends TextFeature {
    * @param {import("./Feature.js").WriteOptions} [options] Write options.
    * @protected
    * @return {string} Text.
+   * @override
    */
   writeGeometryText(geometry, options) {
     geometry =

package/format/TextFeature.d.ts

@@ -7,7 +7,7 @@ export default TextFeature;
  *
  * @abstract
  */
-declare class TextFeature extends FeatureFormat<typeof import("../Feature.js").default> {
+declare class TextFeature extends FeatureFormat<import("../Feature.js").default<import("../geom/Geometry.js").default>> {
     constructor();
     /**
      * Read the feature from the source.
@@ -16,8 +16,9 @@ declare class TextFeature extends FeatureFormat<typeof import("../Feature.js").d
      * @param {import("./Feature.js").ReadOptions} [options] Read options.
      * @return {import("../Feature.js").default} Feature.
      * @api
+     * @override
      */
-    readFeature(source: Document | Element | any | string, options?: import("../format/Feature.js").ReadOptions | undefined): import("../Feature.js").default;
+    override readFeature(source: Document | Element | any | string, options?: import("../format/Feature.js").ReadOptions | undefined): import("../Feature.js").default;
     /**
      * @abstract
      * @param {string} text Text.
@@ -55,8 +56,9 @@ declare class TextFeature extends FeatureFormat<typeof import("../Feature.js").d
      * @param {import("./Feature.js").WriteOptions} [options] Write options.
      * @return {string} Encoded feature.
      * @api
+     * @override
      */
-    writeFeature(feature: import("../Feature.js").default, options?: import("../format/Feature.js").WriteOptions | undefined): string;
+    override writeFeature(feature: import("../Feature.js").default, options?: import("../format/Feature.js").WriteOptions | undefined): string;
     /**
      * @abstract
      * @param {import("../Feature.js").default} feature Features.
@@ -72,8 +74,9 @@ declare class TextFeature extends FeatureFormat<typeof import("../Feature.js").d
      * @param {import("./Feature.js").WriteOptions} [options] Write options.
      * @return {string} Encoded features.
      * @api
+     * @override
      */
-    writeFeatures(features: Array<import("../Feature.js").default>, options?: import("../format/Feature.js").WriteOptions | undefined): string;
+    override writeFeatures(features: Array<import("../Feature.js").default>, options?: import("../format/Feature.js").WriteOptions | undefined): string;
     /**
      * @abstract
      * @param {Array<import("../Feature.js").default>} features Features.
@@ -89,8 +92,9 @@ declare class TextFeature extends FeatureFormat<typeof import("../Feature.js").d
      * @param {import("./Feature.js").WriteOptions} [options] Write options.
      * @return {string} Geometry.
      * @api
+     * @override
      */
-    writeGeometry(geometry: import("../geom/Geometry.js").default, options?: import("../format/Feature.js").WriteOptions | undefined): string;
+    override writeGeometry(geometry: import("../geom/Geometry.js").default, options?: import("../format/Feature.js").WriteOptions | undefined): string;
     /**
      * @abstract
      * @param {import("../geom/Geometry.js").default} geometry Geometry.

package/format/TextFeature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TextFeature.d.ts","sourceRoot":"","sources":["TextFeature.js"],"names":[],"mappings":";AAMA;;;;;;;GAOG;AACH;IACE,cAEC;IASD;;;;;;;OAOG;IACH,oBALW,QAAQ,GAAC,OAAO,SAAQ,MAAM,qEAE7B,OAAO,eAAe,EAAE,OAAO,CAQ1C;IAED;;;;;;OAMG;IACH,oCALW,MAAM,qEAGL,OAAO,eAAe,EAAE,OAAO,CAI1C;IAiBD;;;;;;OAMG;IACH,qCALW,MAAM,qEAGL,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAIjD;IAiBD;;;;;;OAMG;IACH,qCALW,MAAM,qEAGL,OAAO,qBAAqB,EAAE,OAAO,CAIhD;IAaD;;;;OAIG;IACH,uCAJW,MAAM,GAEL,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAI5D;IAED;;;;;;;OAOG;IACH,sBALW,OAAO,eAAe,EAAE,OAAO,sEAE9B,MAAM,CAKjB;IAED;;;;;;OAMG;IACH,oCALW,OAAO,eAAe,EAAE,OAAO,sEAG9B,MAAM,CAIjB;IAED;;;;;;;OAOG;IACH,wBALW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,sEAErC,MAAM,CAKjB;IAED;;;;;;OAMG;IACH,sCALW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,sEAGrC,MAAM,CAIjB;IAED;;;;;;;OAOG;IACH,wBALW,OAAO,qBAAqB,EAAE,OAAO,sEAEpC,MAAM,CAKjB;IAED;;;;;;OAMG;IACH,sCALW,OAAO,qBAAqB,EAAE,OAAO,sEAGpC,MAAM,CAIjB;CACF;0BA7LyB,sBAAsB"}
+{"version":3,"file":"TextFeature.d.ts","sourceRoot":"","sources":["TextFeature.js"],"names":[],"mappings":";AAMA;;;;;;;GAOG;AACH;IACE,cAEC;IAUD;;;;;;;;OAQG;IACH,6BANW,QAAQ,GAAC,OAAO,SAAQ,MAAM,qEAE7B,OAAO,eAAe,EAAE,OAAO,CAS1C;IAED;;;;;;OAMG;IACH,oCALW,MAAM,qEAGL,OAAO,eAAe,EAAE,OAAO,CAI1C;IAkBD;;;;;;OAMG;IACH,qCALW,MAAM,qEAGL,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,CAIjD;IAkBD;;;;;;OAMG;IACH,qCALW,MAAM,qEAGL,OAAO,qBAAqB,EAAE,OAAO,CAIhD;IAcD;;;;OAIG;IACH,uCAJW,MAAM,GAEL,OAAO,uBAAuB,EAAE,OAAO,GAAC,SAAS,CAI5D;IAED;;;;;;;;OAQG;IACH,+BANW,OAAO,eAAe,EAAE,OAAO,sEAE9B,MAAM,CAMjB;IAED;;;;;;OAMG;IACH,oCALW,OAAO,eAAe,EAAE,OAAO,sEAG9B,MAAM,CAIjB;IAED;;;;;;;;OAQG;IACH,iCANW,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,sEAErC,MAAM,CAMjB;IAED;;;;;;OAMG;IACH,sCALW,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,sEAGrC,MAAM,CAIjB;IAED;;;;;;;;OAQG;IACH,iCANW,OAAO,qBAAqB,EAAE,OAAO,sEAEpC,MAAM,CAMjB;IAED;;;;;;OAMG;IACH,sCALW,OAAO,qBAAqB,EAAE,OAAO,sEAGpC,MAAM,CAIjB;CACF;0BArMyB,sBAAsB"}

package/format/TextFeature.js

@@ -19,6 +19,7 @@ class TextFeature extends FeatureFormat {
 
   /**
    * @return {import("./Feature.js").Type} Format.
+   * @override
    */
   getType() {
     return 'text';
@@ -31,6 +32,7 @@ class TextFeature extends FeatureFormat {
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @return {import("../Feature.js").default} Feature.
    * @api
+   * @override
    */
   readFeature(source, options) {
     return this.readFeatureFromText(
@@ -57,6 +59,7 @@ class TextFeature extends FeatureFormat {
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @return {Array<import("../Feature.js").default>} Features.
    * @api
+   * @override
    */
   readFeatures(source, options) {
     return this.readFeaturesFromText(
@@ -83,6 +86,7 @@ class TextFeature extends FeatureFormat {
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @return {import("../geom/Geometry.js").default} Geometry.
    * @api
+   * @override
    */
   readGeometry(source, options) {
     return this.readGeometryFromText(
@@ -108,6 +112,7 @@ class TextFeature extends FeatureFormat {
    * @param {Document|Element|Object|string} source Source.
    * @return {import("../proj/Projection.js").default|undefined} Projection.
    * @api
+   * @override
    */
   readProjection(source) {
     return this.readProjectionFromText(getText(source));
@@ -129,6 +134,7 @@ class TextFeature extends FeatureFormat {
    * @param {import("./Feature.js").WriteOptions} [options] Write options.
    * @return {string} Encoded feature.
    * @api
+   * @override
    */
   writeFeature(feature, options) {
     return this.writeFeatureText(feature, this.adaptOptions(options));
@@ -152,6 +158,7 @@ class TextFeature extends FeatureFormat {
    * @param {import("./Feature.js").WriteOptions} [options] Write options.
    * @return {string} Encoded features.
    * @api
+   * @override
    */
   writeFeatures(features, options) {
     return this.writeFeaturesText(features, this.adaptOptions(options));
@@ -175,6 +182,7 @@ class TextFeature extends FeatureFormat {
    * @param {import("./Feature.js").WriteOptions} [options] Write options.
    * @return {string} Geometry.
    * @api
+   * @override
    */
   writeGeometry(geometry, options) {
     return this.writeGeometryText(geometry, this.adaptOptions(options));

package/format/TopoJSON.d.ts

@@ -79,7 +79,7 @@ export type Options = {
  *
  * @api
  */
-declare class TopoJSON extends JSONFeature<typeof Feature> {
+declare class TopoJSON extends JSONFeature<Feature<import("../geom/Geometry.js").default>> {
     /**
      * @param {Options} [options] Options.
      */

package/format/TopoJSON.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TopoJSON.d.ts","sourceRoot":"","sources":["TopoJSON.js"],"names":[],"mappings":";+BAea,OAAO,wBAAwB,EAAE,QAAQ;yCACzC,OAAO,wBAAwB,EAAE,kBAAkB;+BACnD,OAAO,wBAAwB,EAAE,cAAc;4BAC/C,OAAO,wBAAwB,EAAE,KAAK;iCACtC,OAAO,wBAAwB,EAAE,UAAU;iCAC3C,OAAO,wBAAwB,EAAE,UAAU;sCAC3C,OAAO,wBAAwB,EAAE,eAAe;8BAChD,OAAO,wBAAwB,EAAE,OAAO;mCACxC,OAAO,wBAAwB,EAAE,YAAY;;;;;qBAK5C,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;AAdjD;;;;;;;;;;GAUG;AAEH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,2CAuBC;IAlBC;;;OAGG;IACH,mBAAmC;IAEnC;;;OAGG;IACH,gBAAqD;CAsFxD;oBA9JmB,eAAe;wBACX,kBAAkB"}
+{"version":3,"file":"TopoJSON.d.ts","sourceRoot":"","sources":["TopoJSON.js"],"names":[],"mappings":";+BAea,OAAO,wBAAwB,EAAE,QAAQ;yCACzC,OAAO,wBAAwB,EAAE,kBAAkB;+BACnD,OAAO,wBAAwB,EAAE,cAAc;4BAC/C,OAAO,wBAAwB,EAAE,KAAK;iCACtC,OAAO,wBAAwB,EAAE,UAAU;iCAC3C,OAAO,wBAAwB,EAAE,UAAU;sCAC3C,OAAO,wBAAwB,EAAE,eAAe;8BAChD,OAAO,wBAAwB,EAAE,OAAO;mCACxC,OAAO,wBAAwB,EAAE,YAAY;;;;;qBAK5C,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;AAdjD;;;;;;;;;;GAUG;AAEH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,2CAuBC;IAlBC;;;OAGG;IACH,mBAAmC;IAEnC;;;OAGG;IACH,gBAAqD;CAwFxD;oBAhKmB,eAAe;wBACX,kBAAkB"}