@loaders.gl/mvt 3.1.0 → 3.1.4

package/dist/lib/binary-vector-tile/vector-tile-layer.js

@@ -25,16 +25,16 @@ class VectorTileLayer {
      * return feature `i` from this layer as a `VectorTileFeature`
      *
      * @param index
-     * @param firstPassData
+     * @param geometryInfo
      * @returns {VectorTileFeature}
      */
-    feature(i, firstPassData) {
+    feature(i, geometryInfo) {
         if (i < 0 || i >= this._features.length) {
             throw new Error('feature index out of bounds');
         }
         this._pbf.pos = this._features[i];
         const end = this._pbf.readVarint() + this._pbf.pos;
-        return new vector_tile_feature_1.default(this._pbf, end, this.extent, this._keys, this._values, firstPassData);
+        return new vector_tile_feature_1.default(this._pbf, end, this.extent, this._keys, this._values, geometryInfo);
     }
 }
 exports.default = VectorTileLayer;

package/dist/lib/parse-mvt.d.ts

@@ -1,4 +1,4 @@
-import { MvtBinaryCoordinates, MvtMapboxCoordinates } from '../lib/types';
+import type { MvtMapboxCoordinates } from '../lib/types';
 import { LoaderOptions } from '@loaders.gl/loader-utils';
 /**
  * Parse MVT arrayBuffer and return GeoJSON.
@@ -7,79 +7,11 @@ import { LoaderOptions } from '@loaders.gl/loader-utils';
  * @param options
  * @returns A GeoJSON geometry object or a binary representation
  */
-export default function parseMVT(arrayBuffer: ArrayBuffer, options?: LoaderOptions): {
-    points: {
-        positions: {
-            value: Float32Array;
-            size: number;
-        };
-        globalFeatureIds: {
-            value: Uint16Array | Uint32Array;
-            size: number;
-        };
-        featureIds: {
-            value: Uint16Array | Uint32Array;
-            size: number;
-        };
-        numericProps: object;
-        properties: {}[];
-        fields: {
-            id?: number | undefined;
-        }[];
-    };
-    lines: {
-        pathIndices: {
-            value: Uint16Array | Uint32Array;
-            size: number;
-        };
-        positions: {
-            value: Float32Array;
-            size: number;
-        };
-        globalFeatureIds: {
-            value: Uint16Array | Uint32Array;
-            size: number;
-        };
-        featureIds: {
-            value: Uint16Array | Uint32Array;
-            size: number;
-        };
-        numericProps: object;
-        properties: {}[];
-        fields: {
-            id?: number | undefined;
-        }[];
-    };
-    polygons: {
-        polygonIndices: {
-            value: Uint16Array | Uint32Array;
-            size: number;
-        };
-        primitivePolygonIndices: {
-            value: Uint16Array | Uint32Array;
-            size: number;
-        };
-        positions: {
-            value: Float32Array;
-            size: number;
-        };
-        triangles: {
-            value: Uint32Array;
-            size: number;
-        };
-        globalFeatureIds: {
-            value: Uint16Array | Uint32Array;
-            size: number;
-        };
-        featureIds: {
-            value: Uint16Array | Uint32Array;
-            size: number;
-        };
-        numericProps: object;
-        properties: {}[];
-        fields: {
-            id?: number | undefined;
-        }[];
-    };
-} | (MvtBinaryCoordinates | MvtMapboxCoordinates)[];
+export default function parseMVT(arrayBuffer: ArrayBuffer, options?: LoaderOptions): (MvtMapboxCoordinates | {
+    type: "Feature";
+    geometry: import("@loaders.gl/schema").FlatGeometry;
+    id?: string | number | undefined;
+    properties: import("geojson").GeoJsonProperties;
+    bbox?: import("geojson").BBox | undefined;
+})[] | import("@loaders.gl/schema").BinaryFeatures;
 //# sourceMappingURL=parse-mvt.d.ts.map

package/dist/lib/parse-mvt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-mvt.d.ts","sourceRoot":"","sources":["../../src/lib/parse-mvt.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,oBAAoB,EAAE,oBAAoB,EAAa,MAAM,cAAc,CAAC;AAGpF,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oDAyDjF"}
+{"version":3,"file":"parse-mvt.d.ts","sourceRoot":"","sources":["../../src/lib/parse-mvt.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAC,oBAAoB,EAAa,MAAM,cAAc,CAAC;AAGnE,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEvD;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,aAAa;;;;;;mDA0DjF"}

package/dist/lib/parse-mvt.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // import {VectorTile} from '@mapbox/vector-tile';
 const vector_tile_1 = __importDefault(require("./mapbox-vector-tile/vector-tile"));
 const vector_tile_2 = __importDefault(require("./binary-vector-tile/vector-tile"));
-const features_to_binary_1 = require("./binary-vector-tile/features-to-binary");
+const gis_1 = require("@loaders.gl/gis");
 const pbf_1 = __importDefault(require("pbf"));
 /**
  * Parse MVT arrayBuffer and return GeoJSON.
@@ -20,7 +20,8 @@ function parseMVT(arrayBuffer, options) {
     const features = [];
     if (options) {
         const binary = options.gis.format === 'binary';
-        const firstPassData = {
+        const geometryInfo = {
+            coordLength: 2,
             pointPositionsCount: 0,
             pointFeaturesCount: 0,
             linePositionsCount: 0,
@@ -46,7 +47,7 @@ function parseMVT(arrayBuffer, options) {
                     return;
                 }
                 for (let i = 0; i < vectorTileLayer.length; i++) {
-                    const vectorTileFeature = vectorTileLayer.feature(i, firstPassData);
+                    const vectorTileFeature = vectorTileLayer.feature(i, geometryInfo);
                     const decodedFeature = binary
                         ? getDecodedFeatureBinary(vectorTileFeature, featureOptions)
                         : getDecodedFeature(vectorTileFeature, featureOptions);
@@ -55,7 +56,7 @@ function parseMVT(arrayBuffer, options) {
             });
         }
         if (binary) {
-            const data = (0, features_to_binary_1.featuresToBinary)(features, firstPassData);
+            const data = (0, gis_1.flatGeojsonToBinary)(features, geometryInfo);
             // Add the original byteLength (as a reasonable approximation of the size of the binary data)
             // TODO decide where to store extra fields like byteLength (header etc) and document
             // @ts-ignore
@@ -111,7 +112,7 @@ function getDecodedFeature(feature, options) {
 function getDecodedFeatureBinary(feature, options) {
     const decodedFeature = feature.toBinaryCoordinates(options.coordinates === 'wgs84' ? options.tileIndex : transformToLocalCoordinatesBinary);
     // Add layer name to GeoJSON properties
-    if (options.layerProperty) {
+    if (options.layerProperty && decodedFeature.properties) {
         decodedFeature.properties[options.layerProperty] = options.layerName;
     }
     return decodedFeature;

package/dist/lib/types.d.ts

@@ -8,27 +8,12 @@ export declare type MvtOptions = {
     layerProperty: string | number;
     layerName: string;
 };
-export declare type MvtBinaryGeometry = {
-    data: number[];
-    lines: any[];
-    areas?: number[];
-    type?: string;
-    id?: number;
-};
 export declare type MvtMapboxGeometry = {
     type?: string;
     id?: number;
     length: number;
     coordinates?: any[];
 };
-export declare type MvtBinaryCoordinates = {
-    type: string;
-    geometry: MvtBinaryGeometry;
-    properties: {
-        [x: string]: string | number | boolean | null;
-    };
-    id?: number;
-};
 export declare type MvtMapboxCoordinates = {
     type: string;
     geometry: {
@@ -40,57 +25,4 @@ export declare type MvtMapboxCoordinates = {
     };
     id?: number;
 };
-export declare type MvtPropArrayConstructor = Float32ArrayConstructor | Float64ArrayConstructor | ArrayConstructor;
-export declare type MvtBinaryOptions = {
-    numericPropKeys: string[];
-    propArrayTypes: {
-        [key: string]: MvtPropArrayConstructor;
-    };
-    PositionDataType: Float32ArrayConstructor;
-};
-export declare type MvtFirstPassedData = {
-    pointPositionsCount: number;
-    pointFeaturesCount: number;
-    linePositionsCount: number;
-    linePathsCount: number;
-    lineFeaturesCount: number;
-    polygonPositionsCount: number;
-    polygonObjectsCount: number;
-    polygonRingsCount: number;
-    polygonFeaturesCount: number;
-};
-export declare type MvtPoints = {
-    positions: Float32Array;
-    globalFeatureIds: Uint16Array | Uint32Array;
-    featureIds: Uint16Array | Uint32Array;
-    numericProps: object;
-    properties: {}[];
-    fields: {
-        id?: number;
-    }[];
-};
-export declare type MvtLines = {
-    pathIndices: Uint16Array | Uint32Array;
-    positions: Float32Array;
-    globalFeatureIds: Uint16Array | Uint32Array;
-    featureIds: Uint16Array | Uint32Array;
-    numericProps: object;
-    properties: {}[];
-    fields: {
-        id?: number;
-    }[];
-};
-export declare type MvtPolygons = {
-    polygonIndices: Uint16Array | Uint32Array;
-    primitivePolygonIndices: Uint16Array | Uint32Array;
-    positions: Float32Array;
-    triangles: number[];
-    globalFeatureIds: Uint16Array | Uint32Array;
-    featureIds: Uint16Array | Uint32Array;
-    numericProps: object;
-    properties: {}[];
-    fields: {
-        id?: number;
-    }[];
-};
 //# sourceMappingURL=types.d.ts.map

package/dist/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,oBAAY,UAAU,GAAG;IACvB,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC/B,SAAS,EAAE;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IAC7C,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC;CACrB,CAAC;AAEF,oBAAY,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,iBAAiB,CAAC;KAChC,CAAC;IACF,UAAU,EAAE;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAA;KAAC,CAAC;IAC5D,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,CAAC"}