@loaders.gl/mvt 3.4.10 → 3.4.12

package/dist/es5/mvt-loader.js

@@ -11,7 +11,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _parseMvt = _interopRequireDefault(require("./lib/parse-mvt"));
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+var VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 var DEFAULT_MVT_LOADER_OPTIONS = {
   mvt: {
     shape: 'geojson',

package/dist/esm/mvt-loader.js

@@ -1,5 +1,5 @@
 import parseMVT from './lib/parse-mvt';
-const VERSION = typeof "3.4.10" !== 'undefined' ? "3.4.10" : 'latest';
+const VERSION = typeof "3.4.12" !== 'undefined' ? "3.4.12" : 'latest';
 const DEFAULT_MVT_LOADER_OPTIONS = {
   mvt: {
     shape: 'geojson',

package/dist/mvt-worker.js

@@ -2154,7 +2154,7 @@
   }
 
   // src/mvt-loader.ts
-  var VERSION = true ? "3.4.10" : "latest";
+  var VERSION = true ? "3.4.12" : "latest";
   var DEFAULT_MVT_LOADER_OPTIONS = {
     mvt: {
       shape: "geojson",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/mvt",
   "description": "Loader for Mapbox Vector Tiles",
-  "version": "3.4.10",
+  "version": "3.4.12",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -32,14 +32,14 @@
     "build-worker": "esbuild src/workers/mvt-worker.ts --bundle --outfile=dist/mvt-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "3.4.10",
-    "@loaders.gl/loader-utils": "3.4.10",
-    "@loaders.gl/schema": "3.4.10",
+    "@loaders.gl/gis": "3.4.12",
+    "@loaders.gl/loader-utils": "3.4.12",
+    "@loaders.gl/schema": "3.4.12",
     "@math.gl/polygon": "^3.5.1",
     "pbf": "^3.2.1"
   },
   "devDependencies": {
     "@types/pbf": "^3.0.2"
   },
-  "gitHead": "4568459c96eaf0480a50ab77cace355307f61f04"
+  "gitHead": "85254762ae3082f608a863291deef09f2b40c6cf"
 }

package/dist/bundle.js

@@ -1,5 +0,0 @@
-"use strict";
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.loaders = globalThis.loaders || {};
-module.exports = Object.assign(globalThis.loaders, moduleExports);

package/dist/helpers/binary-util-functions.js

@@ -1,118 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readTag = exports.readFeature = exports.project = exports.classifyRings = void 0;
-const polygon_1 = require("@math.gl/polygon");
-/**
- * Classifies an array of rings into polygons with outer rings and holes
- * The function also detects holes which have zero area and
- * removes them. In doing so it modifies the input
- * `geom.data` array to remove the unneeded data
- *
- * @param geometry
- * @returns object
- */
-// eslint-disable-next-line max-statements
-function classifyRings(geom) {
-    const len = geom.indices.length;
-    const type = 'Polygon';
-    if (len <= 1) {
-        return {
-            type,
-            data: geom.data,
-            areas: [[(0, polygon_1.getPolygonSignedArea)(geom.data)]],
-            indices: [geom.indices]
-        };
-    }
-    const areas = [];
-    const polygons = [];
-    let ringAreas = [];
-    let polygon = [];
-    let ccw;
-    let offset = 0;
-    for (let endIndex, i = 0, startIndex; i < len; i++) {
-        startIndex = geom.indices[i] - offset;
-        endIndex = geom.indices[i + 1] - offset || geom.data.length;
-        const shape = geom.data.slice(startIndex, endIndex);
-        const area = (0, polygon_1.getPolygonSignedArea)(shape);
-        if (area === 0) {
-            // This polygon has no area, so remove it from the shape
-            // Remove the section from the data array
-            const before = geom.data.slice(0, startIndex);
-            const after = geom.data.slice(endIndex);
-            geom.data = before.concat(after);
-            // Need to offset any remaining indices as we have
-            // modified the data buffer
-            offset += endIndex - startIndex;
-            // Do not add this index to the output and process next shape
-            continue; // eslint-disable-line no-continue
-        }
-        if (ccw === undefined)
-            ccw = area < 0;
-        if (ccw === area < 0) {
-            if (polygon.length) {
-                areas.push(ringAreas);
-                polygons.push(polygon);
-            }
-            polygon = [startIndex];
-            ringAreas = [area];
-        }
-        else {
-            ringAreas.push(area);
-            polygon.push(startIndex);
-        }
-    }
-    if (ringAreas)
-        areas.push(ringAreas);
-    if (polygon.length)
-        polygons.push(polygon);
-    return { type, areas, indices: polygons, data: geom.data };
-}
-exports.classifyRings = classifyRings;
-/**
- *
- * @param data
- * @param x0
- * @param y0
- * @param size
- */
-function project(data, x0, y0, size) {
-    for (let j = 0, jl = data.length; j < jl; j += 2) {
-        data[j] = ((data[j] + x0) * 360) / size - 180;
-        const y2 = 180 - ((data[j + 1] + y0) * 360) / size;
-        data[j + 1] = (360 / Math.PI) * Math.atan(Math.exp((y2 * Math.PI) / 180)) - 90;
-    }
-}
-exports.project = project;
-/**
- * All code below is unchanged from the original Mapbox implemenation
- *
- * @param tag
- * @param feature
- * @param pbf
- */
-function readFeature(tag, feature, pbf) {
-    if (feature && pbf) {
-        if (tag === 1)
-            feature.id = pbf.readVarint();
-        else if (tag === 2)
-            readTag(pbf, feature);
-        else if (tag === 3)
-            feature.type = pbf.readVarint();
-        else if (tag === 4)
-            feature._geometry = pbf.pos;
-    }
-}
-exports.readFeature = readFeature;
-/**
- * @param pbf
- * @param feature
- */
-function readTag(pbf, feature) {
-    const end = pbf.readVarint() + pbf.pos;
-    while (pbf.pos < end) {
-        const key = feature._keys[pbf.readVarint()];
-        const value = feature._values[pbf.readVarint()];
-        feature.properties[key] = value;
-    }
-}
-exports.readTag = readTag;

package/dist/helpers/mapbox-util-functions.js

@@ -1,82 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readTag = exports.readFeature = exports.signedArea = exports.classifyRings = void 0;
-/**
- * Classifies an array of rings into polygons with outer rings and holes
- * @param rings
- * @returns polygons
- */
-function classifyRings(rings) {
-    const len = rings.length;
-    if (len <= 1)
-        return [rings];
-    const polygons = [];
-    let polygon;
-    let ccw;
-    for (let i = 0; i < len; i++) {
-        const area = signedArea(rings[i]);
-        if (area === 0)
-            continue; // eslint-disable-line no-continue
-        if (ccw === undefined)
-            ccw = area < 0;
-        if (ccw === area < 0) {
-            if (polygon)
-                polygons.push(polygon);
-            polygon = [rings[i]];
-        }
-        else if (polygon)
-            polygon.push(rings[i]);
-    }
-    if (polygon)
-        polygons.push(polygon);
-    return polygons;
-}
-exports.classifyRings = classifyRings;
-/**
- *
- * @param ring
- * @returns sum
- */
-function signedArea(ring) {
-    let sum = 0;
-    for (let i = 0, j = ring.length - 1, p1, p2; i < ring.length; j = i++) {
-        p1 = ring[i];
-        p2 = ring[j];
-        sum += (p2[0] - p1[0]) * (p1[1] + p2[1]);
-    }
-    return sum;
-}
-exports.signedArea = signedArea;
-/**
- *
- * @param tag
- * @param feature
- * @param pbf
- */
-function readFeature(tag, feature, pbf) {
-    if (feature && pbf) {
-        if (tag === 1)
-            feature.id = pbf.readVarint();
-        else if (tag === 2)
-            readTag(pbf, feature);
-        else if (tag === 3)
-            feature.type = pbf.readVarint();
-        else if (tag === 4)
-            feature._geometry = pbf.pos;
-    }
-}
-exports.readFeature = readFeature;
-/**
- *
- * @param pbf
- * @param feature
- */
-function readTag(pbf, feature) {
-    const end = pbf.readVarint() + pbf.pos;
-    while (pbf.pos < end) {
-        const key = feature._keys[pbf.readVarint()];
-        const value = feature._values[pbf.readVarint()];
-        feature.properties[key] = value;
-    }
-}
-exports.readTag = readTag;

package/dist/index.js

@@ -1,9 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeoJSONTiler = exports.MVTWorkerLoader = exports.MVTLoader = void 0;
-var mvt_loader_1 = require("./mvt-loader");
-Object.defineProperty(exports, "MVTLoader", { enumerable: true, get: function () { return mvt_loader_1.MVTLoader; } });
-Object.defineProperty(exports, "MVTWorkerLoader", { enumerable: true, get: function () { return mvt_loader_1.MVTWorkerLoader; } });
-var geojson_tiler_1 = require("./lib/geojson-tiler/geojson-tiler");
-Object.defineProperty(exports, "GeoJSONTiler", { enumerable: true, get: function () { return geojson_tiler_1.GeoJSONTiler; } });

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

@@ -1,156 +0,0 @@
-"use strict";
-// This code is forked from https://github.com/mapbox/vector-tile-js under BSD 3-clause license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TEST_EXPORTS = void 0;
-const binary_util_functions_1 = require("../../helpers/binary-util-functions");
-// Reduce GC by reusing variables
-let endPos;
-let cmd;
-let cmdLen;
-let length;
-let x;
-let y;
-let i;
-exports.TEST_EXPORTS = {
-    classifyRings: binary_util_functions_1.classifyRings
-};
-class VectorTileFeature {
-    // eslint-disable-next-line max-params
-    constructor(pbf, end, extent, keys, values, geometryInfo) {
-        // Public
-        this.properties = {};
-        this.extent = extent;
-        this.type = 0;
-        this.id = null;
-        // Private
-        this._pbf = pbf;
-        this._geometry = -1;
-        this._keys = keys;
-        this._values = values;
-        this._geometryInfo = geometryInfo;
-        pbf.readFields(binary_util_functions_1.readFeature, this, end);
-    }
-    // eslint-disable-next-line complexity, max-statements
-    loadGeometry() {
-        const pbf = this._pbf;
-        pbf.pos = this._geometry;
-        endPos = pbf.readVarint() + pbf.pos;
-        cmd = 1;
-        length = 0;
-        x = 0;
-        y = 0;
-        i = 0;
-        // Note: I attempted to replace the `data` array with a
-        // Float32Array, but performance was worse, both using
-        // `set()` and direct index access. Also, we cannot
-        // know how large the buffer should be, so it would
-        // increase memory usage
-        const indices = []; // Indices where geometries start
-        const data = []; // Flat array of coordinate data
-        while (pbf.pos < endPos) {
-            if (length <= 0) {
-                cmdLen = pbf.readVarint();
-                cmd = cmdLen & 0x7;
-                length = cmdLen >> 3;
-            }
-            length--;
-            if (cmd === 1 || cmd === 2) {
-                x += pbf.readSVarint();
-                y += pbf.readSVarint();
-                if (cmd === 1) {
-                    // New line
-                    indices.push(i);
-                }
-                data.push(x, y);
-                i += 2;
-            }
-            else if (cmd === 7) {
-                // Workaround for https://github.com/mapbox/mapnik-vector-tile/issues/90
-                if (i > 0) {
-                    const start = indices[indices.length - 1]; // start index of polygon
-                    data.push(data[start], data[start + 1]); // closePolygon
-                    i += 2;
-                }
-            }
-            else {
-                throw new Error(`unknown command ${cmd}`);
-            }
-        }
-        return { data, indices };
-    }
-    /**
-     *
-     * @param transform
-     * @returns result
-     */
-    _toBinaryCoordinates(transform) {
-        // Expands the protobuf data to an intermediate Flat GeoJSON
-        // data format, which maps closely to the binary data buffers.
-        // It is similar to GeoJSON, but rather than storing the coordinates
-        // in multidimensional arrays, we have a 1D `data` with all the
-        // coordinates, and then index into this using the `indices`
-        // parameter, e.g.
-        //
-        // geometry: {
-        //   type: 'Point', data: [1,2], indices: [0]
-        // }
-        // geometry: {
-        //   type: 'LineString', data: [1,2,3,4,...], indices: [0]
-        // }
-        // geometry: {
-        //   type: 'Polygon', data: [1,2,3,4,...], indices: [[0, 2]]
-        // }
-        // Thus the indices member lets us look up the relevant range
-        // from the data array.
-        // The Multi* versions of the above types share the same data
-        // structure, just with multiple elements in the indices array
-        const geom = this.loadGeometry();
-        let geometry;
-        // Apply the supplied transformation to data
-        transform(geom.data, this);
-        const coordLength = 2;
-        // eslint-disable-next-line default-case
-        switch (this.type) {
-            case 1: // Point
-                this._geometryInfo.pointFeaturesCount++;
-                this._geometryInfo.pointPositionsCount += geom.indices.length;
-                geometry = { type: 'Point', ...geom };
-                break;
-            case 2: // LineString
-                this._geometryInfo.lineFeaturesCount++;
-                this._geometryInfo.linePathsCount += geom.indices.length;
-                this._geometryInfo.linePositionsCount += geom.data.length / coordLength;
-                geometry = { type: 'LineString', ...geom };
-                break;
-            case 3: // Polygon
-                geometry = (0, binary_util_functions_1.classifyRings)(geom);
-                // Unlike Point & LineString geom.indices is a 2D array, thanks
-                // to the classifyRings method
-                this._geometryInfo.polygonFeaturesCount++;
-                this._geometryInfo.polygonObjectsCount += geometry.indices.length;
-                for (const indices of geometry.indices) {
-                    this._geometryInfo.polygonRingsCount += indices.length;
-                }
-                this._geometryInfo.polygonPositionsCount += geometry.data.length / coordLength;
-                break;
-            default:
-                throw new Error(`Invalid geometry type: ${this.type}`);
-        }
-        const result = { type: 'Feature', geometry, properties: this.properties };
-        if (this.id !== null) {
-            result.id = this.id;
-        }
-        return result;
-    }
-    toBinaryCoordinates(options) {
-        if (typeof options === 'function') {
-            return this._toBinaryCoordinates(options);
-        }
-        const { x, y, z } = options;
-        const size = this.extent * Math.pow(2, z);
-        const x0 = this.extent * x;
-        const y0 = this.extent * y;
-        return this._toBinaryCoordinates((data) => (0, binary_util_functions_1.project)(data, x0, y0, size));
-    }
-}
-exports.default = VectorTileFeature;

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

@@ -1,91 +0,0 @@
-"use strict";
-/* eslint-disable indent */
-// This code is forked from https://github.com/mapbox/vector-tile-js under BSD 3-clause license.
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const vector_tile_feature_1 = __importDefault(require("./vector-tile-feature"));
-class VectorTileLayer {
-    constructor(pbf, end) {
-        // Public
-        this.version = 1;
-        this.name = '';
-        this.extent = 4096;
-        this.length = 0;
-        // Private
-        this._pbf = pbf;
-        this._keys = [];
-        this._values = [];
-        this._features = [];
-        pbf.readFields(readLayer, this, end);
-        this.length = this._features.length;
-    }
-    /**
-     * return feature `i` from this layer as a `VectorTileFeature`
-     *
-     * @param index
-     * @param geometryInfo
-     * @returns {VectorTileFeature}
-     */
-    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, geometryInfo);
-    }
-}
-exports.default = VectorTileLayer;
-/**
- *
- * @param tag
- * @param layer
- * @param pbf
- */
-function readLayer(tag, layer, pbf) {
-    if (layer && pbf) {
-        if (tag === 15)
-            layer.version = pbf.readVarint();
-        else if (tag === 1)
-            layer.name = pbf.readString();
-        else if (tag === 5)
-            layer.extent = pbf.readVarint();
-        else if (tag === 2)
-            layer._features.push(pbf.pos);
-        else if (tag === 3)
-            layer._keys.push(pbf.readString());
-        else if (tag === 4)
-            layer._values.push(readValueMessage(pbf));
-    }
-}
-/**
- *
- * @param pbf
- * @returns value
- */
-function readValueMessage(pbf) {
-    let value = null;
-    const end = pbf.readVarint() + pbf.pos;
-    while (pbf.pos < end) {
-        const tag = pbf.readVarint() >> 3;
-        value =
-            tag === 1
-                ? pbf.readString()
-                : tag === 2
-                    ? pbf.readFloat()
-                    : tag === 3
-                        ? pbf.readDouble()
-                        : tag === 4
-                            ? pbf.readVarint64()
-                            : tag === 5
-                                ? pbf.readVarint()
-                                : tag === 6
-                                    ? pbf.readSVarint()
-                                    : tag === 7
-                                        ? pbf.readBoolean()
-                                        : null;
-    }
-    return value;
-}

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

@@ -1,29 +0,0 @@
-"use strict";
-// This code is forked from https://github.com/mapbox/vector-tile-js under BSD 3-clause license.
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const vector_tile_layer_1 = __importDefault(require("./vector-tile-layer"));
-class VectorTile {
-    constructor(pbf, end) {
-        this.layers = pbf.readFields(readTile, {}, end);
-    }
-}
-exports.default = VectorTile;
-/**
- *
- * @param tag
- * @param layers
- * @param pbf
- */
-function readTile(tag, layers, pbf) {
-    if (tag === 3) {
-        if (pbf) {
-            const layer = new vector_tile_layer_1.default(pbf, pbf.readVarint() + pbf.pos);
-            if (layer.length && layers) {
-                layers[layer.name] = layer;
-            }
-        }
-    }
-}