@loaders.gl/mvt 4.2.0-alpha.4 → 4.2.0-alpha.6

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

@@ -1,4 +1,6 @@
+// This code is forked from https://github.com/mapbox/vector-tile-js under BSD 3-clause license.
 import { classifyRings, project, readFeature } from "../../helpers/binary-util-functions.js";
+// Reduce GC by reusing variables
 let endPos;
 let cmd;
 let cmdLen;
@@ -7,129 +9,153 @@ let x;
 let y;
 let i;
 export const TEST_EXPORTS = {
-  classifyRings
+    classifyRings
 };
 export default class VectorTileFeature {
-  constructor(pbf, end, extent, keys, values, geometryInfo) {
-    this.properties = void 0;
-    this.extent = void 0;
-    this.type = void 0;
-    this.id = void 0;
-    this._pbf = void 0;
-    this._geometry = void 0;
-    this._keys = void 0;
-    this._values = void 0;
-    this._geometryInfo = void 0;
-    this.properties = {};
-    this.extent = extent;
-    this.type = 0;
-    this.id = null;
-    this._pbf = pbf;
-    this._geometry = -1;
-    this._keys = keys;
-    this._values = values;
-    this._geometryInfo = geometryInfo;
-    pbf.readFields(readFeature, this, end);
-  }
-  loadGeometry() {
-    const pbf = this._pbf;
-    pbf.pos = this._geometry;
-    endPos = pbf.readVarint() + pbf.pos;
-    cmd = 1;
-    length = 0;
-    x = 0;
-    y = 0;
-    i = 0;
-    const indices = [];
-    const 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) {
-          indices.push(i);
-        }
-        data.push(x, y);
-        i += 2;
-      } else if (cmd === 7) {
-        if (i > 0) {
-          const start = indices[indices.length - 1];
-          data.push(data[start], data[start + 1]);
-          i += 2;
-        }
-      } else {
-        throw new Error(`unknown command ${cmd}`);
-      }
+    properties;
+    extent;
+    type;
+    id;
+    _pbf;
+    _geometry;
+    _keys;
+    _values;
+    _geometryInfo;
+    // 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(readFeature, this, end);
     }
-    return {
-      data,
-      indices
-    };
-  }
-  _toBinaryCoordinates(transform) {
-    const geom = this.loadGeometry();
-    let geometry;
-    transform(geom.data, this);
-    const coordLength = 2;
-    switch (this.type) {
-      case 1:
-        this._geometryInfo.pointFeaturesCount++;
-        this._geometryInfo.pointPositionsCount += geom.indices.length;
-        geometry = {
-          type: 'Point',
-          ...geom
-        };
-        break;
-      case 2:
-        this._geometryInfo.lineFeaturesCount++;
-        this._geometryInfo.linePathsCount += geom.indices.length;
-        this._geometryInfo.linePositionsCount += geom.data.length / coordLength;
-        geometry = {
-          type: 'LineString',
-          ...geom
-        };
-        break;
-      case 3:
-        geometry = classifyRings(geom);
-        this._geometryInfo.polygonFeaturesCount++;
-        this._geometryInfo.polygonObjectsCount += geometry.indices.length;
-        for (const indices of geometry.indices) {
-          this._geometryInfo.polygonRingsCount += indices.length;
+    // 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}`);
+            }
         }
-        this._geometryInfo.polygonPositionsCount += geometry.data.length / coordLength;
-        break;
-      default:
-        throw new Error(`Invalid geometry type: ${this.type}`);
+        return { data, indices };
     }
-    const result = {
-      type: 'Feature',
-      geometry,
-      properties: this.properties
-    };
-    if (this.id !== null) {
-      result.id = this.id;
+    /**
+     *
+     * @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 = 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;
     }
-    return result;
-  }
-  toBinaryCoordinates(options) {
-    if (typeof options === 'function') {
-      return this._toBinaryCoordinates(options);
+    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) => project(data, x0, y0, size));
     }
-    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 => project(data, x0, y0, size));
-  }
 }
-//# sourceMappingURL=vector-tile-feature.js.map

package/dist/lib/binary-vector-tile/vector-tile-layer.d.ts

@@ -1,4 +1,4 @@
-import VectorTileFeature from './vector-tile-feature';
+import VectorTileFeature from "./vector-tile-feature.js";
 import Protobuf from 'pbf';
 import { GeojsonGeometryInfo } from '@loaders.gl/schema';
 export default class VectorTileLayer {

package/dist/lib/binary-vector-tile/vector-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../../src/lib/binary-vector-tile/vector-tile-layer.ts"],"names":[],"mappings":"AAGA,OAAO,iBAAiB,MAAM,uBAAuB,CAAC;AACtD,OAAO,QAAQ,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;IAC9C,SAAS,EAAE,MAAM,EAAE,CAAC;gBACR,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM;IAkBtC;;;;;;OAMG;IACH,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,mBAAmB,GAAG,iBAAiB;CAiBzE"}
+{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../../src/lib/binary-vector-tile/vector-tile-layer.ts"],"names":[],"mappings":"AAGA,OAAO,iBAAiB,iCAA8B;AACtD,OAAO,QAAQ,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;IAC9C,SAAS,EAAE,MAAM,EAAE,CAAC;gBACR,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM;IAkBtC;;;;;;OAMG;IACH,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,mBAAmB,GAAG,iBAAiB;CAiBzE"}

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

@@ -1,46 +1,93 @@
+/* eslint-disable indent */
+// This code is forked from https://github.com/mapbox/vector-tile-js under BSD 3-clause license.
 import VectorTileFeature from "./vector-tile-feature.js";
 export default class VectorTileLayer {
-  constructor(pbf, end) {
-    this.version = void 0;
-    this.name = void 0;
-    this.extent = void 0;
-    this.length = void 0;
-    this._pbf = void 0;
-    this._keys = void 0;
-    this._values = void 0;
-    this._features = void 0;
-    this.version = 1;
-    this.name = '';
-    this.extent = 4096;
-    this.length = 0;
-    this._pbf = pbf;
-    this._keys = [];
-    this._values = [];
-    this._features = [];
-    pbf.readFields(readLayer, this, end);
-    this.length = this._features.length;
-  }
-  feature(i, geometryInfo) {
-    if (i < 0 || i >= this._features.length) {
-      throw new Error('feature index out of bounds');
+    version;
+    name;
+    extent;
+    length;
+    _pbf;
+    _keys;
+    _values;
+    _features;
+    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 VectorTileFeature(this._pbf, end, this.extent, this._keys, this._values, geometryInfo);
     }
-    this._pbf.pos = this._features[i];
-    const end = this._pbf.readVarint() + this._pbf.pos;
-    return new VectorTileFeature(this._pbf, end, this.extent, this._keys, this._values, geometryInfo);
-  }
 }
+/**
+ *
+ * @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));
-  }
+    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;
+    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;
 }
-//# sourceMappingURL=vector-tile-layer.js.map

package/dist/lib/binary-vector-tile/vector-tile.d.ts

@@ -1,4 +1,4 @@
-import VectorTileLayer from './vector-tile-layer';
+import VectorTileLayer from "./vector-tile-layer.js";
 import Protobuf from 'pbf';
 export default class VectorTile {
     layers: {

package/dist/lib/binary-vector-tile/vector-tile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vector-tile.d.ts","sourceRoot":"","sources":["../../../src/lib/binary-vector-tile/vector-tile.ts"],"names":[],"mappings":"AAEA,OAAO,eAAe,MAAM,qBAAqB,CAAC;AAClD,OAAO,QAAQ,MAAM,KAAK,CAAC;AAE3B,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,MAAM,EAAE;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,eAAe,CAAA;KAAC,CAAC;gBAC3B,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,MAAM;CAGxC"}
+{"version":3,"file":"vector-tile.d.ts","sourceRoot":"","sources":["../../../src/lib/binary-vector-tile/vector-tile.ts"],"names":[],"mappings":"AAEA,OAAO,eAAe,+BAA4B;AAClD,OAAO,QAAQ,MAAM,KAAK,CAAC;AAE3B,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,MAAM,EAAE;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,eAAe,CAAA;KAAC,CAAC;gBAC3B,GAAG,EAAE,QAAQ,EAAE,GAAG,CAAC,EAAE,MAAM;CAGxC"}

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

@@ -1,18 +1,24 @@
+// This code is forked from https://github.com/mapbox/vector-tile-js under BSD 3-clause license.
 import VectorTileLayer from "./vector-tile-layer.js";
 export default class VectorTile {
-  constructor(pbf, end) {
-    this.layers = void 0;
-    this.layers = pbf.readFields(readTile, {}, end);
-  }
+    layers;
+    constructor(pbf, end) {
+        this.layers = pbf.readFields(readTile, {}, end);
+    }
 }
+/**
+ *
+ * @param tag
+ * @param layers
+ * @param pbf
+ */
 function readTile(tag, layers, pbf) {
-  if (tag === 3) {
-    if (pbf) {
-      const layer = new VectorTileLayer(pbf, pbf.readVarint() + pbf.pos);
-      if (layer.length && layers) {
-        layers[layer.name] = layer;
-      }
+    if (tag === 3) {
+        if (pbf) {
+            const layer = new VectorTileLayer(pbf, pbf.readVarint() + pbf.pos);
+            if (layer.length && layers) {
+                layers[layer.name] = layer;
+            }
+        }
     }
-  }
 }
-//# sourceMappingURL=vector-tile.js.map

package/dist/lib/geojson-tiler/clip.d.ts

@@ -1,4 +1,4 @@
-import type { GeoJSONTileFeature } from './tile';
+import type { GeoJSONTileFeature } from "./tile.js";
 /**
  * Clip features between two vertical or horizontal axis-parallel lines:
  *     |        |

package/dist/lib/geojson-tiler/clip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clip.d.ts","sourceRoot":"","sources":["../../../src/lib/geojson-tiler/clip.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,QAAQ,CAAC;AAK/C;;;;;;;;;;GAUG;AAEH,wBAAgB,IAAI,CAClB,QAAQ,EAAE,kBAAkB,EAAE,EAC9B,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,IAAI,KAAA,EACJ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAC,WAAW,EAAE,OAAO,CAAA;CAAC,GAC9B,kBAAkB,EAAE,GAAG,IAAI,CA4E7B"}
+{"version":3,"file":"clip.d.ts","sourceRoot":"","sources":["../../../src/lib/geojson-tiler/clip.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,kBAAkB,EAAC,kBAAe;AAK/C;;;;;;;;;;GAUG;AAEH,wBAAgB,IAAI,CAClB,QAAQ,EAAE,kBAAkB,EAAE,EAC9B,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,IAAI,KAAA,EACJ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAC,WAAW,EAAE,OAAO,CAAA;CAAC,GAC9B,kBAAkB,EAAE,GAAG,IAAI,CA4E7B"}