ol 8.1.1-dev.1694608919656 → 8.1.1-dev.1694687206621

package/format/GeoJSON.js

@@ -3,17 +3,20 @@
  */
 
 import Feature from '../Feature.js';
-import GeometryCollection from '../geom/GeometryCollection.js';
 import JSONFeature from './JSONFeature.js';
-import LineString from '../geom/LineString.js';
-import MultiLineString from '../geom/MultiLineString.js';
-import MultiPoint from '../geom/MultiPoint.js';
-import MultiPolygon from '../geom/MultiPolygon.js';
-import Point from '../geom/Point.js';
-import Polygon from '../geom/Polygon.js';
+import RenderFeature from '../render/Feature.js';
+import {
+  createGeometry,
+  createRenderFeature,
+  transformGeometryWithOptions,
+} from './Feature.js';
+import {
+  deflateCoordinatesArray,
+  deflateMultiCoordinatesArray,
+} from '../geom/flat/deflate.js';
+import {getLayoutForStride} from '../geom/SimpleGeometry.js';
 import {get as getProjection} from '../proj.js';
 import {isEmpty} from '../obj.js';
-import {transformGeometryWithOptions} from './Feature.js';
 
 /**
  * @typedef {import("geojson").GeoJSON} GeoJSONObject
@@ -39,6 +42,10 @@ import {transformGeometryWithOptions} from './Feature.js';
  * the geometry_name field in the feature GeoJSON. If set to `true` the GeoJSON reader
  * will look for that field to set the geometry name. If both this field is set to `true`
  * and a `geometryName` is provided, the `geometryName` will take precedence.
+ * @property {import("../Feature.js").FeatureClass} [featureClass] Feature class
+ * to be used when reading features. The default is {@link module:ol/Feature~Feature}. If performance is
+ * the primary concern, and features are not going to be modified or round-tripped through the format,
+ * consider using {@link module:ol/render/Feature~RenderFeature}
  */
 
 /**
@@ -70,6 +77,10 @@ class GeoJSON extends JSONFeature {
       this.defaultFeatureProjection = getProjection(options.featureProjection);
     }
 
+    if (options.featureClass) {
+      this.featureClass = options.featureClass;
+    }
+
     /**
      * Name of the geometry attribute for features.
      * @type {string|undefined}
@@ -94,7 +105,7 @@ class GeoJSON extends JSONFeature {
    * @param {Object} object Object.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @protected
-   * @return {import("../Feature.js").default} Feature.
+   * @return {Feature|RenderFeature|Array<RenderFeature>}.default} Feature.
    */
   readFeatureFromObject(object, options) {
     /**
@@ -111,7 +122,18 @@ class GeoJSON extends JSONFeature {
       };
     }
 
-    const geometry = readGeometry(geoJSONFeature['geometry'], options);
+    const geometry = readGeometryInternal(geoJSONFeature['geometry'], options);
+    if (this.featureClass === RenderFeature) {
+      return createRenderFeature(
+        {
+          geometry,
+          id: geoJSONFeature['id'],
+          properties: geoJSONFeature['properties'],
+        },
+        options
+      );
+    }
+
     const feature = new Feature();
     if (this.geometryName_) {
       feature.setGeometryName(this.geometryName_);
@@ -121,7 +143,7 @@ class GeoJSON extends JSONFeature {
     ) {
       feature.setGeometryName(geoJSONFeature['geometry_name']);
     }
-    feature.setGeometry(geometry);
+    feature.setGeometry(createGeometry(geometry, options));
 
     if ('id' in geoJSONFeature) {
       feature.setId(geoJSONFeature['id']);
@@ -137,11 +159,11 @@ class GeoJSON extends JSONFeature {
    * @param {Object} object Object.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @protected
-   * @return {Array<Feature>} Features.
+   * @return {Array<Feature|RenderFeature>} Features.
    */
   readFeaturesFromObject(object, options) {
     const geoJSONObject = /** @type {GeoJSONObject} */ (object);
-    /** @type {Array<import("../Feature.js").default>} */
+    /** @type {Array<Feature|RenderFeature|Array<RenderFeature>>} */
     let features = null;
     if (geoJSONObject['type'] === 'FeatureCollection') {
       const geoJSONFeatureCollection = /** @type {GeoJSONFeatureCollection} */ (
@@ -150,12 +172,19 @@ class GeoJSON extends JSONFeature {
       features = [];
       const geoJSONFeatures = geoJSONFeatureCollection['features'];
       for (let i = 0, ii = geoJSONFeatures.length; i < ii; ++i) {
-        features.push(this.readFeatureFromObject(geoJSONFeatures[i], options));
+        const featureObject = this.readFeatureFromObject(
+          geoJSONFeatures[i],
+          options
+        );
+        if (!featureObject) {
+          continue;
+        }
+        features.push(featureObject);
       }
     } else {
       features = [this.readFeatureFromObject(object, options)];
     }
-    return features;
+    return features.flat();
   }
 
   /**
@@ -268,16 +297,14 @@ class GeoJSON extends JSONFeature {
 /**
  * @param {GeoJSONGeometry|GeoJSONGeometryCollection} object Object.
  * @param {import("./Feature.js").ReadOptions} [options] Read options.
- * @return {import("../geom/Geometry.js").default} Geometry.
+ * @return {import("./Feature.js").GeometryObject} Geometry.
  */
-function readGeometry(object, options) {
+function readGeometryInternal(object, options) {
   if (!object) {
     return null;
   }
 
-  /**
-   * @type {import("../geom/Geometry.js").default}
-   */
+  /** @type {import("./Feature.js").GeometryObject} */
   let geometry;
   switch (object['type']) {
     case 'Point': {
@@ -322,73 +349,132 @@ function readGeometry(object, options) {
       throw new Error('Unsupported GeoJSON type: ' + object['type']);
     }
   }
-  return transformGeometryWithOptions(geometry, false, options);
+  return geometry;
+}
+
+/**
+ * @param {GeoJSONGeometry|GeoJSONGeometryCollection} object Object.
+ * @param {import("./Feature.js").ReadOptions} [options] Read options.
+ * @return {import("../geom/Geometry.js").default} Geometry.
+ */
+function readGeometry(object, options) {
+  const geometryObject = readGeometryInternal(object, options);
+  return createGeometry(geometryObject, options);
 }
 
 /**
  * @param {GeoJSONGeometryCollection} object Object.
  * @param {import("./Feature.js").ReadOptions} [options] Read options.
- * @return {GeometryCollection} Geometry collection.
+ * @return {import("./Feature.js").GeometryCollectionObject} Geometry collection.
  */
 function readGeometryCollectionGeometry(object, options) {
   const geometries = object['geometries'].map(
     /**
      * @param {GeoJSONGeometry} geometry Geometry.
-     * @return {import("../geom/Geometry.js").default} geometry Geometry.
+     * @return {import("./Feature.js").GeometryObject} geometry Geometry.
      */
     function (geometry) {
-      return readGeometry(geometry, options);
+      return readGeometryInternal(geometry, options);
     }
   );
-  return new GeometryCollection(geometries);
+  return geometries;
 }
 
 /**
- * @param {GeoJSONPoint} object Object.
- * @return {Point} Point.
+ * @param {GeoJSONPoint} object Input object.
+ * @return {import("./Feature.js").GeometryObject} Point geometry.
  */
 function readPointGeometry(object) {
-  return new Point(object['coordinates']);
+  const flatCoordinates = object['coordinates'];
+  return {
+    type: 'Point',
+    flatCoordinates,
+    layout: getLayoutForStride(flatCoordinates.length),
+  };
 }
 
 /**
  * @param {GeoJSONLineString} object Object.
- * @return {LineString} LineString.
+ * @return {import("./Feature.js").GeometryObject} LineString geometry.
  */
 function readLineStringGeometry(object) {
-  return new LineString(object['coordinates']);
+  const coordinates = object['coordinates'];
+  const flatCoordinates = coordinates.flat();
+  return {
+    type: 'LineString',
+    flatCoordinates,
+    ends: [flatCoordinates.length],
+    layout: getLayoutForStride(coordinates[0].length),
+  };
 }
 
 /**
  * @param {GeoJSONMultiLineString} object Object.
- * @return {MultiLineString} MultiLineString.
+ * @return {import("./Feature.js").GeometryObject} MultiLineString geometry.
  */
 function readMultiLineStringGeometry(object) {
-  return new MultiLineString(object['coordinates']);
+  const coordinates = object['coordinates'];
+  const stride = coordinates[0][0].length;
+  const flatCoordinates = [];
+  const ends = deflateCoordinatesArray(flatCoordinates, 0, coordinates, stride);
+  return {
+    type: 'MultiLineString',
+    flatCoordinates,
+    ends,
+    layout: getLayoutForStride(stride),
+  };
 }
 
 /**
  * @param {GeoJSONMultiPoint} object Object.
- * @return {MultiPoint} MultiPoint.
+ * @return {import("./Feature.js").GeometryObject} MultiPoint geometry.
  */
 function readMultiPointGeometry(object) {
-  return new MultiPoint(object['coordinates']);
+  const coordinates = object['coordinates'];
+  return {
+    type: 'MultiPoint',
+    flatCoordinates: coordinates.flat(),
+    layout: getLayoutForStride(coordinates[0].length),
+  };
 }
 
 /**
  * @param {GeoJSONMultiPolygon} object Object.
- * @return {MultiPolygon} MultiPolygon.
+ * @return {import("./Feature.js").GeometryObject} MultiPolygon geometry.
  */
 function readMultiPolygonGeometry(object) {
-  return new MultiPolygon(object['coordinates']);
+  const coordinates = object['coordinates'];
+  const flatCoordinates = [];
+  const stride = coordinates[0][0][0].length;
+  const endss = deflateMultiCoordinatesArray(
+    flatCoordinates,
+    0,
+    coordinates,
+    stride
+  );
+  return {
+    type: 'MultiPolygon',
+    flatCoordinates,
+    ends: endss,
+    layout: getLayoutForStride(stride),
+  };
 }
 
 /**
  * @param {GeoJSONPolygon} object Object.
- * @return {Polygon} Polygon.
+ * @return {import("./Feature.js").GeometryObject} Polygon.
  */
 function readPolygonGeometry(object) {
-  return new Polygon(object['coordinates']);
+  const coordinates = object['coordinates'];
+  const flatCoordinates = [];
+  const stride = coordinates[0][0].length;
+  const ends = deflateCoordinatesArray(flatCoordinates, 0, coordinates, stride);
+  return {
+    type: 'Polygon',
+    flatCoordinates,
+    ends,
+    layout: getLayoutForStride(stride),
+  };
 }
 
 /**
@@ -398,53 +484,59 @@ function readPolygonGeometry(object) {
  */
 function writeGeometry(geometry, options) {
   geometry = transformGeometryWithOptions(geometry, true, options);
+
   const type = geometry.getType();
 
   /** @type {GeoJSONGeometry} */
   let geoJSON;
   switch (type) {
     case 'Point': {
-      geoJSON = writePointGeometry(/** @type {Point} */ (geometry), options);
+      geoJSON = writePointGeometry(
+        /** @type {import("../geom/Point.js").default} */ (geometry),
+        options
+      );
       break;
     }
     case 'LineString': {
       geoJSON = writeLineStringGeometry(
-        /** @type {LineString} */ (geometry),
+        /** @type {import("../geom/LineString.js").default} */ (geometry),
         options
       );
       break;
     }
     case 'Polygon': {
       geoJSON = writePolygonGeometry(
-        /** @type {Polygon} */ (geometry),
+        /** @type {import("../geom/Polygon.js").default} */ (geometry),
         options
       );
       break;
     }
     case 'MultiPoint': {
       geoJSON = writeMultiPointGeometry(
-        /** @type {MultiPoint} */ (geometry),
+        /** @type {import("../geom/MultiPoint.js").default} */ (geometry),
         options
       );
       break;
     }
     case 'MultiLineString': {
       geoJSON = writeMultiLineStringGeometry(
-        /** @type {MultiLineString} */ (geometry),
+        /** @type {import("../geom/MultiLineString.js").default} */ (geometry),
         options
       );
       break;
     }
     case 'MultiPolygon': {
       geoJSON = writeMultiPolygonGeometry(
-        /** @type {MultiPolygon} */ (geometry),
+        /** @type {import("../geom/MultiPolygon.js").default} */ (geometry),
         options
       );
       break;
     }
     case 'GeometryCollection': {
       geoJSON = writeGeometryCollectionGeometry(
-        /** @type {GeometryCollection} */ (geometry),
+        /** @type {import("../geom/GeometryCollection.js").default} */ (
+          geometry
+        ),
         options
       );
       break;
@@ -464,7 +556,7 @@ function writeGeometry(geometry, options) {
 }
 
 /**
- * @param {GeometryCollection} geometry Geometry.
+ * @param {import("../geom/GeometryCollection.js").default} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions} [options] Write options.
  * @return {GeoJSONGeometryCollection} GeoJSON geometry collection.
  */
@@ -481,7 +573,7 @@ function writeGeometryCollectionGeometry(geometry, options) {
 }
 
 /**
- * @param {LineString} geometry Geometry.
+ * @param {import("../geom/LineString.js").default} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions} [options] Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -493,7 +585,7 @@ function writeLineStringGeometry(geometry, options) {
 }
 
 /**
- * @param {MultiLineString} geometry Geometry.
+ * @param {import("../geom/MultiLineString.js").default} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions} [options] Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -505,7 +597,7 @@ function writeMultiLineStringGeometry(geometry, options) {
 }
 
 /**
- * @param {MultiPoint} geometry Geometry.
+ * @param {import("../geom/MultiPoint.js").default} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions} [options] Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -517,7 +609,7 @@ function writeMultiPointGeometry(geometry, options) {
 }
 
 /**
- * @param {MultiPolygon} geometry Geometry.
+ * @param {import("../geom/MultiPolygon.js").default} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions} [options] Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -533,7 +625,7 @@ function writeMultiPolygonGeometry(geometry, options) {
 }
 
 /**
- * @param {Point} geometry Geometry.
+ * @param {import("../geom/Point.js").default} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions} [options] Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -545,7 +637,7 @@ function writePointGeometry(geometry, options) {
 }
 
 /**
- * @param {Polygon} geometry Geometry.
+ * @param {import("../geom/Polygon.js").default} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions} [options] Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */

package/format/JSONFeature.d.ts

@@ -8,42 +8,22 @@ export default JSONFeature;
  * @abstract
  */
 declare class JSONFeature extends FeatureFormat {
-    /**
-     * Read a feature.  Only works for a single feature. Use `readFeatures` to
-     * read a feature collection.
-     *
-     * @param {ArrayBuffer|Document|Element|Object|string} source Source.
-     * @param {import("./Feature.js").ReadOptions} [options] Read options.
-     * @return {import("../Feature.js").default} Feature.
-     * @api
-     */
-    readFeature(source: ArrayBuffer | Document | Element | any | string, options?: import("./Feature.js").ReadOptions | undefined): import("../Feature.js").default;
-    /**
-     * Read all features.  Works with both a single feature and a feature
-     * collection.
-     *
-     * @param {ArrayBuffer|Document|Element|Object|string} source Source.
-     * @param {import("./Feature.js").ReadOptions} [options] Read options.
-     * @return {Array<import("../Feature.js").default>} Features.
-     * @api
-     */
-    readFeatures(source: ArrayBuffer | Document | Element | any | string, options?: import("./Feature.js").ReadOptions | undefined): Array<import("../Feature.js").default>;
     /**
      * @abstract
      * @param {Object} object Object.
      * @param {import("./Feature.js").ReadOptions} [options] Read options.
      * @protected
-     * @return {import("../Feature.js").default} Feature.
+     * @return {import("../Feature.js").default|import("../render/Feature.js").default|Array<import("../render/Feature.js").default>} Feature.
      */
-    protected readFeatureFromObject(object: any, options?: import("./Feature.js").ReadOptions | undefined): import("../Feature.js").default;
+    protected readFeatureFromObject(object: any, options?: import("./Feature.js").ReadOptions | undefined): import("../Feature.js").default | import("../render/Feature.js").default | Array<import("../render/Feature.js").default>;
     /**
      * @abstract
      * @param {Object} object Object.
      * @param {import("./Feature.js").ReadOptions} [options] Read options.
      * @protected
-     * @return {Array<import("../Feature.js").default>} Features.
+     * @return {Array<import("../Feature.js").default|import("../render/Feature.js").default>} Features.
      */
-    protected readFeaturesFromObject(object: any, options?: import("./Feature.js").ReadOptions | undefined): Array<import("../Feature.js").default>;
+    protected readFeaturesFromObject(object: any, options?: import("./Feature.js").ReadOptions | undefined): Array<import("../Feature.js").default | import("../render/Feature.js").default>;
     /**
      * @abstract
      * @param {Object} object Object.

package/format/JSONFeature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JSONFeature.d.ts","sourceRoot":"","sources":["JSONFeature.js"],"names":[],"mappings":";AAMA;;;;;;;GAOG;AACH;IAYE;;;;;;;;OAQG;IACH,oBALW,WAAW,GAAC,QAAQ,GAAC,OAAO,SAAQ,MAAM,6DAEzC,OAAO,eAAe,EAAE,OAAO,CAQ1C;IAED;;;;;;;;OAQG;IACH,qBALW,WAAW,GAAC,QAAQ,GAAC,OAAO,SAAQ,MAAM,6DAEzC,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAQjD;IAED;;;;;;OAMG;IACH,wGAFY,OAAO,eAAe,EAAE,OAAO,CAI1C;IAED;;;;;;OAMG;IACH,yGAFY,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAIjD;IAiBD;;;;;;OAMG;IACH,yGAFY,OAAO,qBAAqB,EAAE,OAAO,CAIhD;IAED;;;;;;OAMG;IACH,uBAJW,WAAW,GAAC,QAAQ,GAAC,OAAO,SAAQ,MAAM,GACzC,OAAO,uBAAuB,EAAE,OAAO,CAKlD;IAED;;;;;OAKG;IACH,iDAFY,OAAO,uBAAuB,EAAE,OAAO,CAIlD;IAED;;;;;;;OAOG;IACH,sBALW,OAAO,eAAe,EAAE,OAAO,8DAE9B,MAAM,CAKjB;IAED;;;;;OAKG;IACH,4BAJW,OAAO,eAAe,EAAE,OAAO,kEAMzC;IAED;;;;;;;OAOG;IACH,wBALW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,8DAErC,MAAM,CAKjB;IAED;;;;;OAKG;IACH,8BAJW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,kEAMhD;IAED;;;;;;;OAOG;IACH,wBALW,OAAO,qBAAqB,EAAE,OAAO,8DAEpC,MAAM,CAKjB;IAED;;;;;OAKG;IACH,8BAJW,OAAO,qBAAqB,EAAE,OAAO,kEAM/C;CACF;0BA7LyB,cAAc"}
+{"version":3,"file":"JSONFeature.d.ts","sourceRoot":"","sources":["JSONFeature.js"],"names":[],"mappings":";AAMA;;;;;;;GAOG;AACH;IA4CE;;;;;;OAMG;IACH,wGAFY,OAAO,eAAe,EAAE,OAAO,GAAC,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,CAI/H;IAED;;;;;;OAMG;IACH,yGAFY,MAAM,OAAO,eAAe,EAAE,OAAO,GAAC,OAAO,sBAAsB,EAAE,OAAO,CAAC,CAIxF;IAiBD;;;;;;OAMG;IACH,yGAFY,OAAO,qBAAqB,EAAE,OAAO,CAIhD;IAED;;;;;;OAMG;IACH,uBAJW,WAAW,GAAC,QAAQ,GAAC,OAAO,SAAQ,MAAM,GACzC,OAAO,uBAAuB,EAAE,OAAO,CAKlD;IAED;;;;;OAKG;IACH,iDAFY,OAAO,uBAAuB,EAAE,OAAO,CAIlD;IAED;;;;;;;OAOG;IACH,sBALW,OAAO,eAAe,EAAE,OAAO,8DAE9B,MAAM,CAKjB;IAED;;;;;OAKG;IACH,4BAJW,OAAO,eAAe,EAAE,OAAO,kEAMzC;IAED;;;;;;;OAOG;IACH,wBALW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,8DAErC,MAAM,CAKjB;IAED;;;;;OAKG;IACH,8BAJW,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,kEAMhD;IAED;;;;;;;OAOG;IACH,wBALW,OAAO,qBAAqB,EAAE,OAAO,8DAEpC,MAAM,CAKjB;IAED;;;;;OAKG;IACH,8BAJW,OAAO,qBAAqB,EAAE,OAAO,kEAM/C;CACF;0BA7LyB,cAAc"}

package/format/JSONFeature.js

@@ -30,7 +30,7 @@ class JSONFeature extends FeatureFormat {
    *
    * @param {ArrayBuffer|Document|Element|Object|string} source Source.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
-   * @return {import("../Feature.js").default} Feature.
+   * @return {import("../Feature.js").FeatureLike|Array<import("../render/Feature.js").default>} Feature.
    * @api
    */
   readFeature(source, options) {
@@ -46,7 +46,7 @@ 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").default>} Features.
+   * @return {Array<import("../Feature.js").FeatureLike>} Features.
    * @api
    */
   readFeatures(source, options) {
@@ -61,7 +61,7 @@ class JSONFeature extends FeatureFormat {
    * @param {Object} object Object.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @protected
-   * @return {import("../Feature.js").default} Feature.
+   * @return {import("../Feature.js").default|import("../render/Feature.js").default|Array<import("../render/Feature.js").default>} Feature.
    */
   readFeatureFromObject(object, options) {
     return abstract();
@@ -72,7 +72,7 @@ class JSONFeature extends FeatureFormat {
    * @param {Object} object Object.
    * @param {import("./Feature.js").ReadOptions} [options] Read options.
    * @protected
-   * @return {Array<import("../Feature.js").default>} Features.
+   * @return {Array<import("../Feature.js").default|import("../render/Feature.js").default>} Features.
    */
   readFeaturesFromObject(object, options) {
     return abstract();

package/format/MVT.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MVT.d.ts","sourceRoot":"","sources":["MVT.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBA;;;;;;;;;;;GAWG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,2CAiDC;IApCC;;;OAGG;IACH,sBAEiB;IAEjB;;;OAGG;IACH,sBAAyC;IAEzC;;;OAGG;IACH,mBAAiE;IAEjE;;;OAGG;IACH,gBAAqD;IAErD;;;OAGG;IACH,oBAAqC;IAQvC;;;;;;;;OAQG;IACH,yBAoDC;IAED;;;;;;OAMG;IACH,uBAsEC;IASD;;;;;;;OAOG;IACH,qBALW,WAAW,6DAEV,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,CAgCrD;IAED;;;;;;OAMG;IACH,uBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,CAKlD;IAED;;;;OAIG;IACH,kBAHW,MAAM,MAAM,CAAC,QAKvB;CACF;0BAvSyD,cAAc"}
+{"version":3,"file":"MVT.d.ts","sourceRoot":"","sources":["MVT.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAkBA;;;;;;;;;;;GAWG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,2CAiDC;IApCC;;;OAGG;IACH,sBAEiB;IAEjB;;;OAGG;IACH,sBAAyC;IAEzC;;;OAGG;IACH,mBAAiE;IAEjE;;;OAGG;IACH,gBAAqD;IAErD;;;OAGG;IACH,oBAAqC;IAQvC;;;;;;;;OAQG;IACH,yBAoDC;IAED;;;;;;OAMG;IACH,uBAuEC;IASD;;;;;;;OAOG;IACH,qBALW,WAAW,6DAEV,MAAM,OAAO,eAAe,EAAE,WAAW,CAAC,CAgCrD;IAED;;;;;;OAMG;IACH,uBAJW,QAAQ,GAAC,OAAO,SAAQ,MAAM,GAC7B,OAAO,uBAAuB,EAAE,OAAO,CAKlD;IAED;;;;OAIG;IACH,kBAHW,MAAM,MAAM,CAAC,QAKvB;CACF;0BAxSyD,cAAc"}

package/format/MVT.js

@@ -191,6 +191,7 @@ class MVT extends FeatureFormat {
         geometryType,
         flatCoordinates,
         ends,
+        2,
         values,
         id
       );
@@ -412,10 +413,10 @@ function readRawFeature(pbf, layer, i) {
  * @param {number} type The raw feature's geometry type
  * @param {number} numEnds Number of ends of the flat coordinates of the
  * geometry.
- * @return {import("../geom/Geometry.js").Type} The geometry type.
+ * @return {import("../render/Feature.js").Type} The geometry type.
  */
 function getGeometryType(type, numEnds) {
-  /** @type {import("../geom/Geometry.js").Type} */
+  /** @type {import("../render/Feature.js").Type} */
   let geometryType;
   if (type === 1) {
     geometryType = numEnds === 1 ? 'Point' : 'MultiPoint';

package/format/TopoJSON.d.ts

@@ -94,6 +94,14 @@ declare class TopoJSON extends JSONFeature {
      * @type {?Array<string>}
      */
     private layers_;
+    /**
+     * @param {Object} object Object.
+     * @param {import("./Feature.js").ReadOptions} [options] Read options.
+     * @protected
+     * @return {Array<Feature>} Features.
+     */
+    protected readFeaturesFromObject(object: any, options?: import("./Feature.js").ReadOptions | undefined): Array<Feature>;
 }
 import JSONFeature from './JSONFeature.js';
+import Feature from '../Feature.js';
 //# sourceMappingURL=TopoJSON.d.ts.map

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;wBA7JuB,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;IAUvD;;;;;OAKG;IACH,yGAFY,MAAM,OAAO,CAAC,CA8DzB;CAUF;wBA7JuB,kBAAkB;oBADtB,eAAe"}

package/geom/SimpleGeometry.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @param {number} stride Stride.
+ * @return {import("./Geometry.js").GeometryLayout} layout Layout.
+ */
+export function getLayoutForStride(stride: number): import("./Geometry.js").GeometryLayout;
 /**
  * @param {import("./Geometry.js").GeometryLayout} layout Layout.
  * @return {number} Stride.

package/geom/SimpleGeometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleGeometry.d.ts","sourceRoot":"","sources":["SimpleGeometry.js"],"names":[],"mappings":"AAsTA;;;GAGG;AACH,2CAHW,OAAO,eAAe,EAAE,cAAc,GACrC,MAAM,CAYjB;AAED;;;;;GAKG;AACH,gDALW,cAAc,aACd,OAAO,iBAAiB,EAAE,SAAS,gCAElC,MAAM,MAAM,CAAC,CAgBxB;;AAlVD;;;;;;;GAOG;AACH;IAII;;;OAGG;IACH,kBAFU,OAAO,eAAe,EAAE,cAAc,CAE9B;IAElB;;;OAGG;IACH,kBAFU,MAAM,CAED;IAEf;;;OAGG;IACH,2BAFU,MAAM,MAAM,CAAC,CAEI;IAkB7B;;;OAGG;IACH,kBAFY,UAAQ,GAAG,IAAI,CAI1B;IAED;;;;OAIG;IACH,sBAHY,OAAO,kBAAkB,EAAE,UAAU,CAKhD;IAED;;OAEG;IACH,sBAFY,MAAM,MAAM,CAAC,CAIxB;IAED;;;;OAIG;IACH,qBAHY,OAAO,kBAAkB,EAAE,UAAU,CAOhD;IAED;;;;OAIG;IACH,aAHY,OAAO,eAAe,EAAE,cAAc,CAKjD;IAED;;;;OAIG;IACH,wCAHW,MAAM,GACL,cAAc,CA+BzB;IAED;;;;OAIG;IACH,0DAJW,MAAM,GACL,cAAc,CAKzB;IAED;;OAEG;IACH,aAFY,MAAM,CAIjB;IAED;;;OAGG;IACH,2BAHW,OAAO,eAAe,EAAE,cAAc,mBACtC,MAAM,MAAM,CAAC,QAMvB;IAED;;;;OAIG;IACH,4BAHY,UAAQ,qEAKnB;IAED;;;;;OAKG;IACH,4BALW,OAAO,eAAe,EAAE,cAAc,GAAC,SAAS,eAChD,UAAQ,WACR,MAAM,QAsBhB;CAkGF;qBAjSoB,eAAe"}
+{"version":3,"file":"SimpleGeometry.d.ts","sourceRoot":"","sources":["SimpleGeometry.js"],"names":[],"mappings":"AAsSA;;;GAGG;AACH,2CAHW,MAAM,GACL,OAAO,eAAe,EAAE,cAAc,CAYjD;AAED;;;GAGG;AACH,2CAHW,OAAO,eAAe,EAAE,cAAc,GACrC,MAAM,CAYjB;AAED;;;;;GAKG;AACH,gDALW,cAAc,aACd,OAAO,iBAAiB,EAAE,SAAS,gCAElC,MAAM,MAAM,CAAC,CAgBxB;;AAlVD;;;;;;;GAOG;AACH;IAII;;;OAGG;IACH,kBAFU,OAAO,eAAe,EAAE,cAAc,CAE9B;IAElB;;;OAGG;IACH,kBAFU,MAAM,CAED;IAEf;;;OAGG;IACH,2BAFU,MAAM,MAAM,CAAC,CAEI;IAkB7B;;;OAGG;IACH,kBAFY,UAAQ,GAAG,IAAI,CAI1B;IAED;;;;OAIG;IACH,sBAHY,OAAO,kBAAkB,EAAE,UAAU,CAKhD;IAED;;OAEG;IACH,sBAFY,MAAM,MAAM,CAAC,CAIxB;IAED;;;;OAIG;IACH,qBAHY,OAAO,kBAAkB,EAAE,UAAU,CAOhD;IAED;;;;OAIG;IACH,aAHY,OAAO,eAAe,EAAE,cAAc,CAKjD;IAED;;;;OAIG;IACH,wCAHW,MAAM,GACL,cAAc,CA+BzB;IAED;;;;OAIG;IACH,0DAJW,MAAM,GACL,cAAc,CAKzB;IAED;;OAEG;IACH,aAFY,MAAM,CAIjB;IAED;;;OAGG;IACH,2BAHW,OAAO,eAAe,EAAE,cAAc,mBACtC,MAAM,MAAM,CAAC,QAMvB;IAED;;;;OAIG;IACH,4BAHY,UAAQ,qEAKnB;IAED;;;;;OAKG;IACH,4BALW,OAAO,eAAe,EAAE,cAAc,GAAC,SAAS,eAChD,UAAQ,WACR,MAAM,QAsBhB;CAkGF;qBAjSoB,eAAe"}

package/geom/SimpleGeometry.js

@@ -296,7 +296,7 @@ class SimpleGeometry extends Geometry {
  * @param {number} stride Stride.
  * @return {import("./Geometry.js").GeometryLayout} layout Layout.
  */
-function getLayoutForStride(stride) {
+export function getLayoutForStride(stride) {
   let layout;
   if (stride == 2) {
     layout = 'XY';

package/interaction/DragAndDrop.d.ts

@@ -44,7 +44,7 @@ export type Options = {
      * source without removing the existing features (append only), instead of
      * providing the source option listen for the "addfeatures" event.
      */
-    source?: import("../source/Vector.js").default<import("../geom/Geometry.js").default> | undefined;
+    source?: import("../source/Vector.js").default<import("../Feature.js").default<import("../geom/Geometry.js").default>> | undefined;
     /**
      * Target projection. By default, the map's view's projection is used.
      */

package/interaction/Draw.d.ts

@@ -61,7 +61,7 @@ export type Options = {
      * Destination source for
      * the drawn features.
      */
-    source?: VectorSource<import("../geom/Geometry.js").default> | undefined;
+    source?: VectorSource<Feature<import("../geom/Geometry.js").default>> | undefined;
     /**
      * Delay in milliseconds after pointerdown
      * before the current vertex can be dragged to its exact position.
@@ -141,7 +141,7 @@ export type Options = {
      * not provided, the interaction's `source` will be used.  Tracing requires that the interaction is configured with
      * either a `traceSource` or a `source`.
      */
-    traceSource?: VectorSource<import("../geom/Geometry.js").default> | undefined;
+    traceSource?: VectorSource<Feature<import("../geom/Geometry.js").default>> | undefined;
     /**
      * Wrap the world horizontally on the sketch
      * overlay.

package/interaction/Modify.d.ts

@@ -148,7 +148,7 @@ export type Options = {
      * features to modify.  If a vector source is not provided, a feature collection
      * must be provided with the `features` option.
      */
-    source?: VectorSource<import("../geom/Geometry.js").default> | undefined;
+    source?: VectorSource<Feature<import("../geom/Geometry.js").default>> | undefined;
     /**
      * When configured, point
      * features will be considered for modification based on their visual appearance, instead of being within

package/interaction/Snap.d.ts

@@ -44,7 +44,7 @@ export type Options = {
     /**
      * Snap to features from this source. Either this option or features should be provided
      */
-    source?: import("../source/Vector.js").default<import("../geom/Geometry.js").default> | undefined;
+    source?: import("../source/Vector.js").default<import("../Feature.js").default<import("../geom/Geometry.js").default>> | undefined;
 };
 /**
  * *

package/layer/BaseVector.d.ts

@@ -1,5 +1,5 @@
 export default BaseVectorLayer;
-export type Options<VectorSourceType extends import("../source/Vector.js").default<import("../geom/Geometry.js").default> | import("../source/VectorTile.js").default> = {
+export type Options<VectorSourceType extends import("../source/Vector.js").default<import("../Feature").default<import("../geom/Geometry.js").default>> | import("../source/VectorTile.js").default> = {
     /**
      * A CSS class name to set to the layer element.
      */
@@ -122,7 +122,7 @@ export type Options<VectorSourceType extends import("../source/Vector.js").defau
  * @extends {Layer<VectorSourceType, RendererType>}
  * @api
  */
-declare class BaseVectorLayer<VectorSourceType extends import("../source/Vector.js").default<import("../geom/Geometry.js").default> | import("../source/VectorTile.js").default, RendererType extends import("../renderer/canvas/VectorLayer.js").default | import("../renderer/canvas/VectorTileLayer.js").default | import("../renderer/canvas/VectorImageLayer.js").default | import("../renderer/webgl/PointsLayer.js").default> extends Layer<VectorSourceType, RendererType> {
+declare class BaseVectorLayer<VectorSourceType extends import("../source/Vector.js").default<import("../Feature").default<import("../geom/Geometry.js").default>> | import("../source/VectorTile.js").default, RendererType extends import("../renderer/canvas/VectorLayer.js").default | import("../renderer/canvas/VectorTileLayer.js").default | import("../renderer/canvas/VectorImageLayer.js").default | import("../renderer/webgl/PointsLayer.js").default> extends Layer<VectorSourceType, RendererType> {
     /**
      * @param {Options<VectorSourceType>} [options] Options.
      */