@loaders.gl/mvt 4.0.0-alpha.5 → 4.0.0-alpha.7

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

@@ -1,202 +1,170 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { readFeature, classifyRings } from '../../helpers/mapbox-util-functions';
-export default class VectorTileFeature {
-  static get types() {
-    return ['Unknown', 'Point', 'LineString', 'Polygon'];
-  }
-
-  constructor(pbf, end, extent, keys, values) {
-    _defineProperty(this, "properties", void 0);
-
-    _defineProperty(this, "extent", void 0);
-
-    _defineProperty(this, "type", void 0);
-
-    _defineProperty(this, "id", void 0);
-
-    _defineProperty(this, "_pbf", void 0);
-
-    _defineProperty(this, "_geometry", void 0);
-
-    _defineProperty(this, "_keys", void 0);
-
-    _defineProperty(this, "_values", 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;
-    pbf.readFields(readFeature, this, end);
-  }
-
-  loadGeometry() {
-    const pbf = this._pbf;
-    pbf.pos = this._geometry;
-    const end = pbf.readVarint() + pbf.pos;
-    let cmd = 1;
-    let length = 0;
-    let x = 0;
-    let y = 0;
-    const lines = [];
-    let line;
-
-    while (pbf.pos < end) {
-      if (length <= 0) {
-        const cmdLen = pbf.readVarint();
-        cmd = cmdLen & 0x7;
-        length = cmdLen >> 3;
-      }
-
-      length--;
-
-      if (cmd === 1 || cmd === 2) {
-        x += pbf.readSVarint();
-        y += pbf.readSVarint();
-
-        if (cmd === 1) {
-          if (line) lines.push(line);
-          line = [];
-        }
-
-        if (line) line.push([x, y]);
-      } else if (cmd === 7) {
-        if (line) {
-          line.push(line[0].slice());
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mapbox_util_functions_1 = require("../../helpers/mapbox-util-functions");
+class VectorTileFeature {
+    static get types() {
+        return ['Unknown', 'Point', 'LineString', 'Polygon'];
+    }
+    constructor(pbf, end, extent, keys, values) {
+        // 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;
+        pbf.readFields(mapbox_util_functions_1.readFeature, this, end);
+    }
+    // eslint-disable-next-line complexity, max-statements
+    loadGeometry() {
+        const pbf = this._pbf;
+        pbf.pos = this._geometry;
+        const end = pbf.readVarint() + pbf.pos;
+        let cmd = 1;
+        let length = 0;
+        let x = 0;
+        let y = 0;
+        const lines = [];
+        let line;
+        while (pbf.pos < end) {
+            if (length <= 0) {
+                const cmdLen = pbf.readVarint();
+                cmd = cmdLen & 0x7;
+                length = cmdLen >> 3;
+            }
+            length--;
+            if (cmd === 1 || cmd === 2) {
+                x += pbf.readSVarint();
+                y += pbf.readSVarint();
+                if (cmd === 1) {
+                    // moveTo
+                    if (line)
+                        lines.push(line);
+                    line = [];
+                }
+                if (line)
+                    line.push([x, y]);
+            }
+            else if (cmd === 7) {
+                // Workaround for https://github.com/mapbox/mapnik-vector-tile/issues/90
+                if (line) {
+                    line.push(line[0].slice()); // closePolygon
+                }
+            }
+            else {
+                throw new Error(`unknown command ${cmd}`);
+            }
         }
-      } else {
-        throw new Error("unknown command ".concat(cmd));
-      }
+        if (line)
+            lines.push(line);
+        return lines;
     }
-
-    if (line) lines.push(line);
-    return lines;
-  }
-
-  bbox() {
-    const pbf = this._pbf;
-    pbf.pos = this._geometry;
-    const end = pbf.readVarint() + pbf.pos;
-    let cmd = 1;
-    let length = 0;
-    let x = 0;
-    let y = 0;
-    let x1 = Infinity;
-    let x2 = -Infinity;
-    let y1 = Infinity;
-    let y2 = -Infinity;
-
-    while (pbf.pos < end) {
-      if (length <= 0) {
-        const cmdLen = pbf.readVarint();
-        cmd = cmdLen & 0x7;
-        length = cmdLen >> 3;
-      }
-
-      length--;
-
-      if (cmd === 1 || cmd === 2) {
-        x += pbf.readSVarint();
-        y += pbf.readSVarint();
-        if (x < x1) x1 = x;
-        if (x > x2) x2 = x;
-        if (y < y1) y1 = y;
-        if (y > y2) y2 = y;
-      } else if (cmd !== 7) {
-        throw new Error("unknown command ".concat(cmd));
-      }
+    // eslint-disable-next-line max-statements
+    bbox() {
+        const pbf = this._pbf;
+        pbf.pos = this._geometry;
+        const end = pbf.readVarint() + pbf.pos;
+        let cmd = 1;
+        let length = 0;
+        let x = 0;
+        let y = 0;
+        let x1 = Infinity;
+        let x2 = -Infinity;
+        let y1 = Infinity;
+        let y2 = -Infinity;
+        while (pbf.pos < end) {
+            if (length <= 0) {
+                const cmdLen = pbf.readVarint();
+                cmd = cmdLen & 0x7;
+                length = cmdLen >> 3;
+            }
+            length--;
+            if (cmd === 1 || cmd === 2) {
+                x += pbf.readSVarint();
+                y += pbf.readSVarint();
+                if (x < x1)
+                    x1 = x;
+                if (x > x2)
+                    x2 = x;
+                if (y < y1)
+                    y1 = y;
+                if (y > y2)
+                    y2 = y;
+            }
+            else if (cmd !== 7) {
+                throw new Error(`unknown command ${cmd}`);
+            }
+        }
+        return [x1, y1, x2, y2];
     }
-
-    return [x1, y1, x2, y2];
-  }
-
-  _toGeoJSON(transform) {
-    let coords = this.loadGeometry();
-    let type = VectorTileFeature.types[this.type];
-    let i;
-    let j;
-
-    switch (this.type) {
-      case 1:
-        const points = [];
-
-        for (i = 0; i < coords.length; i++) {
-          points[i] = coords[i][0];
+    _toGeoJSON(transform) {
+        let coords = this.loadGeometry();
+        let type = VectorTileFeature.types[this.type];
+        let i;
+        let j;
+        // eslint-disable-next-line default-case
+        switch (this.type) {
+            case 1:
+                const points = [];
+                for (i = 0; i < coords.length; i++) {
+                    points[i] = coords[i][0];
+                }
+                coords = points;
+                transform(coords, this);
+                break;
+            case 2:
+                for (i = 0; i < coords.length; i++) {
+                    transform(coords[i], this);
+                }
+                break;
+            case 3:
+                coords = (0, mapbox_util_functions_1.classifyRings)(coords);
+                for (i = 0; i < coords.length; i++) {
+                    for (j = 0; j < coords[i].length; j++) {
+                        transform(coords[i][j], this);
+                    }
+                }
+                break;
         }
-
-        coords = points;
-        transform(coords, this);
-        break;
-
-      case 2:
-        for (i = 0; i < coords.length; i++) {
-          transform(coords[i], this);
+        if (coords.length === 1) {
+            coords = coords[0];
         }
-
-        break;
-
-      case 3:
-        coords = classifyRings(coords);
-
-        for (i = 0; i < coords.length; i++) {
-          for (j = 0; j < coords[i].length; j++) {
-            transform(coords[i][j], this);
-          }
+        else {
+            type = `Multi${type}`;
         }
-
-        break;
-    }
-
-    if (coords.length === 1) {
-      coords = coords[0];
-    } else {
-      type = "Multi".concat(type);
-    }
-
-    const result = {
-      type: 'Feature',
-      geometry: {
-        type,
-        coordinates: coords
-      },
-      properties: this.properties
-    };
-
-    if (this.id !== null) {
-      result.id = this.id;
-    }
-
-    return result;
-  }
-
-  toGeoJSON(options) {
-    if (typeof options === 'function') {
-      return this._toGeoJSON(options);
+        const result = {
+            type: 'Feature',
+            geometry: {
+                type,
+                coordinates: coords
+            },
+            properties: this.properties
+        };
+        if (this.id !== null) {
+            result.id = this.id;
+        }
+        return result;
     }
-
-    const {
-      x,
-      y,
-      z
-    } = options;
-    const size = this.extent * Math.pow(2, z);
-    const x0 = this.extent * x;
-    const y0 = this.extent * y;
-
-    function project(line) {
-      for (let j = 0; j < line.length; j++) {
-        const p = line[j];
-        p[0] = (p[0] + x0) * 360 / size - 180;
-        const y2 = 180 - (p[1] + y0) * 360 / size;
-        p[1] = 360 / Math.PI * Math.atan(Math.exp(y2 * Math.PI / 180)) - 90;
-      }
+    toGeoJSON(options) {
+        if (typeof options === 'function') {
+            return this._toGeoJSON(options);
+        }
+        const { x, y, z } = options;
+        const size = this.extent * Math.pow(2, z);
+        const x0 = this.extent * x;
+        const y0 = this.extent * y;
+        function project(line) {
+            for (let j = 0; j < line.length; j++) {
+                const p = line[j];
+                p[0] = ((p[0] + x0) * 360) / size - 180;
+                const y2 = 180 - ((p[1] + y0) * 360) / size;
+                p[1] = (360 / Math.PI) * Math.atan(Math.exp((y2 * Math.PI) / 180)) - 90;
+            }
+        }
+        return this._toGeoJSON(project);
     }
-
-    return this._toGeoJSON(project);
-  }
-
 }
-//# sourceMappingURL=vector-tile-feature.js.map
+exports.default = VectorTileFeature;

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

@@ -1,64 +1,89 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import VectorTileFeature from './vector-tile-feature';
-export default class VectorTileLayer {
-  constructor(pbf, end) {
-    _defineProperty(this, "version", void 0);
-
-    _defineProperty(this, "name", void 0);
-
-    _defineProperty(this, "extent", void 0);
-
-    _defineProperty(this, "length", void 0);
-
-    _defineProperty(this, "_pbf", void 0);
-
-    _defineProperty(this, "_keys", void 0);
-
-    _defineProperty(this, "_values", void 0);
-
-    _defineProperty(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) {
-    if (i < 0 || i >= this._features.length) {
-      throw new Error('feature index out of bounds');
+"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
+     * @returns feature
+     */
+    feature(i) {
+        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);
     }
-
-    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);
-  }
-
 }
-
+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));
-  }
+    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/mapbox-vector-tile/vector-tile.js

@@ -1,23 +1,29 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import VectorTileLayer from './vector-tile-layer';
-export default class VectorTile {
-  constructor(pbf, end) {
-    _defineProperty(this, "layers", void 0);
-
-    this.layers = pbf.readFields(readTile, {}, end);
-  }
-
+"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 VectorTileLayer(pbf, pbf.readVarint() + pbf.pos);
-
-      if (layer.length && layers) {
-        layers[layer.name] = layer;
-      }
+    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;
+            }
+        }
     }
-  }
 }
-//# sourceMappingURL=vector-tile.js.map

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

@@ -1,5 +1,5 @@
-import type { MvtMapboxCoordinates } from '../lib/types';
-import { LoaderOptions } from '@loaders.gl/loader-utils';
+import type { Feature, BinaryFeatures, GeoJSONRowTable } from '@loaders.gl/schema';
+import type { MVTLoaderOptions } from '../lib/types';
 /**
  * Parse MVT arrayBuffer and return GeoJSON.
  *
@@ -7,11 +7,8 @@ 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): (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;
+export default function parseMVT(arrayBuffer: ArrayBuffer, options?: MVTLoaderOptions): BinaryFeatures | GeoJSONRowTable | Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>[] | {
+    shape: string;
+    data: 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":"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"}
+{"version":3,"file":"parse-mvt.d.ts","sourceRoot":"","sources":["../../src/lib/parse-mvt.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,OAAO,EAEP,cAAc,EACd,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAmC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAOrF;;;;;;GAMG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,gBAAgB;;;EAuBpF"}