@loaders.gl/mvt 4.3.2 → 4.4.0-alpha.2

package/dist/index.cjs

@@ -302,7 +302,7 @@ function attributeTypeToFieldType(aType) {
 }
 
 // dist/tilejson-loader.js
-var VERSION = true ? "4.3.1" : "latest";
+var VERSION = true ? "4.4.0-alpha.1" : "latest";
 var TileJSONLoader = {
   dataType: null,
   batchType: null,
@@ -979,15 +979,11 @@ function getDecodedFeatureBinary(feature, options, layerName) {
   return decodedFeature;
 }
 
-// dist/mvt-loader.js
-var VERSION2 = true ? "4.3.1" : "latest";
-var MVTWorkerLoader = {
-  dataType: null,
-  batchType: null,
+// dist/mvt-format.js
+var MVTFormat = {
   name: "Mapbox Vector Tile",
   id: "mvt",
   module: "mvt",
-  version: VERSION2,
   // Note: ArcGIS uses '.pbf' extension and 'application/octet-stream'
   extensions: ["mvt", "pbf"],
   mimeTypes: [
@@ -996,8 +992,17 @@ var MVTWorkerLoader = {
     "application/x-protobuf"
     // 'application/octet-stream'
   ],
+  category: "geometry"
+};
+
+// dist/mvt-loader.js
+var VERSION2 = true ? "4.4.0-alpha.1" : "latest";
+var MVTWorkerLoader = {
+  ...MVTFormat,
+  dataType: null,
+  batchType: null,
+  version: VERSION2,
   worker: true,
-  category: "geometry",
   options: {
     mvt: {
       shape: "geojson",
@@ -1020,42 +1025,32 @@ var import_loader_utils2 = require("@loaders.gl/loader-utils");
 var import_images = require("@loaders.gl/images");
 var import_mvt = require("@loaders.gl/mvt");
 var MVTSource = {
-  name: "MVT",
-  id: "mvt",
-  module: "mvt",
+  ...MVTFormat,
   version: "0.0.0",
-  extensions: ["mvt"],
-  mimeTypes: ["application/octet-stream"],
-  options: {
+  type: "mvt",
+  fromUrl: true,
+  fromBlob: false,
+  defaultOptions: {
     mvt: {
       // TODO - add options here
     }
   },
-  type: "mvt",
-  fromUrl: true,
-  fromBlob: false,
   testURL: (url) => true,
-  createDataSource(url, props) {
-    return new MVTTileSource(url, props);
+  createDataSource(url, options) {
+    return new MVTTileSource(url, options);
   }
 };
 var MVTTileSource = class extends import_loader_utils2.DataSource {
-  props;
-  url;
   metadataUrl = null;
-  data;
   schema = "tms";
   metadata;
   extension;
   mimeType = null;
-  constructor(url, props) {
+  constructor(url, options) {
     var _a, _b;
-    super(props);
-    this.props = props;
-    this.url = (0, import_loader_utils2.resolvePath)(url);
-    this.metadataUrl = ((_a = props.mvt) == null ? void 0 : _a.metadataUrl) || `${this.url}/tilejson.json`;
-    this.extension = ((_b = props.mvt) == null ? void 0 : _b.extension) || ".png";
-    this.data = this.url;
+    super(url, options, MVTSource.defaultOptions);
+    this.metadataUrl = ((_a = options.mvt) == null ? void 0 : _a.metadataUrl) || `${this.url}/tilejson.json`;
+    this.extension = ((_b = options.mvt) == null ? void 0 : _b.extension) || ".png";
     this.getTileData = this.getTileData.bind(this);
     this.metadata = this.getMetadata();
     if (isURLTemplate(this.url)) {
@@ -1181,7 +1176,7 @@ function stringHash(s) {
 
 // dist/table-tile-source.js
 var import_loader_utils3 = require("@loaders.gl/loader-utils");
-var import_schema = require("@loaders.gl/schema");
+var import_schema_utils = require("@loaders.gl/schema-utils");
 var import_stats = require("@probe.gl/stats");
 
 // dist/lib/vector-tiler/proto-tile.js
@@ -1870,10 +1865,14 @@ function shiftCoords(points, offset) {
 var TableTileSource = {
   name: "TableTiler",
   id: "table-tiler",
+  module: "mvt",
   version: "0.0.0",
   extensions: ["mvt"],
   mimeTypes: ["application/octet-stream"],
-  options: {
+  type: "table",
+  fromUrl: false,
+  fromBlob: false,
+  defaultOptions: {
     table: {
       coordinates: "local",
       promoteId: void 0,
@@ -1886,28 +1885,17 @@ var TableTileSource = {
       generateId: void 0
     }
   },
-  type: "table",
   testURL: (url) => url.endsWith(".geojson"),
   createDataSource(url, options) {
     var _a, _b;
     const needsLoading = typeof url === "string" || url instanceof Blob;
-    const loader = (_b = (_a = options == null ? void 0 : options.table) == null ? void 0 : _a.loaders) == null ? void 0 : _b[0];
+    const loader = (_b = (_a = options == null ? void 0 : options.core) == null ? void 0 : _a.loaders) == null ? void 0 : _b[0];
     const tablePromise = needsLoading ? loadTable(url, loader) : url;
-    return new DynamicVectorTileSource(tablePromise, options);
+    return new TableVectorTileSource(tablePromise, options);
   }
-  // @ts-expect-error
 };
-async function loadTable(url, loader) {
-  if (typeof url === "string") {
-    const response = await fetch(url);
-    const data2 = await response.arrayBuffer();
-    return await loader.parse(data2);
-  }
-  const data = await url.arrayBuffer();
-  return await loader.parse(data);
-}
-var _DynamicVectorTileSource = class {
-  /** Stats for this DynamicVectorTileSource */
+var _TableVectorTileSource = class extends import_loader_utils3.DataSource {
+  /** Stats for this TableVectorTileSource */
   stats = new import_stats.Stats({
     id: "table-tile-source",
     stats: [new import_stats.Stat("tiles", "count"), new import_stats.Stat("features", "count")]
@@ -1915,9 +1903,7 @@ var _DynamicVectorTileSource = class {
   /** MIME type of the tiles emitted by this tile source */
   mimeType = "application/vnd.mapbox-vector-tile";
   localCoordinates = true;
-  /** The props that this tile source was created with */
-  // @ts-expect-error
-  props;
+  tableOptions;
   /* Schema of the data */
   schema = null;
   /** Map of generated tiles, indexed by stringified tile coordinates */
@@ -1928,20 +1914,21 @@ var _DynamicVectorTileSource = class {
   ready;
   /** Metadata for the tile source (generated TileJSON/tilestats */
   metadata;
-  constructor(table, props) {
-    this.props = { ...TableTileSource.options.table, ...props == null ? void 0 : props.table };
+  constructor(table, options) {
+    super(table, options, TableTileSource.defaultOptions);
+    this.tableOptions = (0, import_loader_utils3.getRequiredOptions)(this.options).table;
     this.getTileData = this.getTileData.bind(this);
     this.ready = this.initializeTilesAsync(table);
     this.metadata = this.getMetadata();
   }
   async initializeTilesAsync(tablePromise) {
     const table = await tablePromise;
-    this.schema = (0, import_schema.deduceTableSchema)(table);
+    this.schema = (0, import_schema_utils.deduceTableSchema)(table);
     this.createRootTiles(table);
   }
   async getMetadata() {
     await this.ready;
-    return { schema: this.schema, minZoom: 0, maxZoom: this.props.maxZoom };
+    return { schema: this.schema, minZoom: 0, maxZoom: this.tableOptions.maxZoom };
   }
   async getSchema() {
     await this.ready;
@@ -1978,9 +1965,9 @@ var _DynamicVectorTileSource = class {
       return null;
     }
     return convertTileToGeoJSON(protoTile, {
-      coordinates: this.props.coordinates,
+      coordinates: this.tableOptions.coordinates,
       tileIndex,
-      extent: this.props.extent
+      extent: this.tableOptions.extent
     });
   }
   /**
@@ -1988,27 +1975,27 @@ var _DynamicVectorTileSource = class {
    * @note the tiles stores all the features together with additional data
    */
   createRootTiles(table) {
-    if (this.props.maxZoom < 0 || this.props.maxZoom > 24) {
+    if (this.tableOptions.maxZoom < 0 || this.tableOptions.maxZoom > 24) {
       throw new Error("maxZoom should be in the 0-24 range");
     }
-    if (this.props.promoteId && this.props.generateId) {
+    if (this.tableOptions.promoteId && this.tableOptions.generateId) {
       throw new Error("promoteId and generateId cannot be used together.");
     }
-    import_loader_utils3.log.log(1, "DynamicVectorTileSource creating root tiles", this.props)();
+    import_loader_utils3.log.log(1, "TableVectorTileSource creating root tiles", this.tableOptions)();
     import_loader_utils3.log.time(1, "preprocess table")();
-    let features2 = convertFeaturesToProtoFeature(table, this.props);
+    let features2 = convertFeaturesToProtoFeature(table, this.tableOptions);
     import_loader_utils3.log.timeEnd(1, "preprocess table")();
     import_loader_utils3.log.time(1, "generate tiles")();
-    features2 = wrapFeatures(features2, this.props);
+    features2 = wrapFeatures(features2, this.tableOptions);
     if (features2.length === 0) {
-      import_loader_utils3.log.log(1, "DynamicVectorTileSource: no features generated")();
+      import_loader_utils3.log.log(1, "TableVectorTileSource: no features generated")();
       return;
     }
     this.splitTile(features2, 0, 0, 0);
     const rootTile = this.tiles[0];
     import_loader_utils3.log.log(1, `root tile features: ${rootTile.numFeatures}, points: ${rootTile.numPoints}`)();
     import_loader_utils3.log.timeEnd(1, "generate tiles")();
-    import_loader_utils3.log.log(1, `DynamicVectorTileSource: tiles generated: ${this.stats.get("total").count}`, this.stats)();
+    import_loader_utils3.log.log(1, `TableVectorTileSource: tiles generated: ${this.stats.get("total").count}`, this.stats)();
   }
   /**
    * Return geojsonvt-style "half formed" vector tile
@@ -2018,7 +2005,7 @@ var _DynamicVectorTileSource = class {
   getProtoTile(tileIndex) {
     const { z, y } = tileIndex;
     let { x } = tileIndex;
-    const { extent } = this.props;
+    const { extent } = this.tableOptions;
     if (z < 0 || z > 24) {
       return null;
     }
@@ -2054,7 +2041,7 @@ var _DynamicVectorTileSource = class {
    * @param cz, cx, and cy are the coordinates of the target tile
    *
    * If no target tile is specified, splitting stops when we reach the maximum
-   * zoom or the number of points is low as specified in the props.
+   * zoom or the number of points is low as specified in the options.
    */
   // eslint-disable-next-line max-params, max-statements, complexity
   splitTile(features2, z, x, y, cz, cx, cy) {
@@ -2069,26 +2056,26 @@ var _DynamicVectorTileSource = class {
       let tile = this.tiles[id];
       if (!tile) {
         import_loader_utils3.log.time(2, "tile creation")();
-        tile = this.tiles[id] = createProtoTile(features2, z, x, y, this.props);
+        tile = this.tiles[id] = createProtoTile(features2, z, x, y, this.tableOptions);
         this.tileCoords.push({ z, x, y });
         const key = `z${z}`;
         let stat = this.stats.get(key, "count");
         stat.incrementCount();
         stat = this.stats.get("total");
         stat.incrementCount();
-        stat = _DynamicVectorTileSource.stats.get(key, "count");
+        stat = _TableVectorTileSource.stats.get(key, "count");
         stat.incrementCount();
-        stat = _DynamicVectorTileSource.stats.get("total");
+        stat = _TableVectorTileSource.stats.get("total");
         stat.incrementCount();
         import_loader_utils3.log.log(2, "tile z%d-%d-%d (features: %d, points: %d, simplified: %d)", z, x, y, tile.numFeatures, tile.numPoints, tile.numSimplified)();
         import_loader_utils3.log.timeEnd(2, "tile creation")();
       }
       tile.sourceFeatures = features2;
       if (cz === void 0) {
-        if (z === this.props.indexMaxZoom || tile.numPoints <= this.props.maxPointsPerTile) {
+        if (z === this.tableOptions.indexMaxZoom || tile.numPoints <= this.tableOptions.maxPointsPerTile) {
           continue;
         }
-      } else if (z === this.props.maxZoom || z === cz) {
+      } else if (z === this.tableOptions.maxZoom || z === cz) {
         continue;
       } else if (cz !== void 0) {
         const zoomSteps = cz - z;
@@ -2100,7 +2087,7 @@ var _DynamicVectorTileSource = class {
       if (features2.length === 0)
         continue;
       import_loader_utils3.log.time(2, "clipping tile")();
-      const k1 = 0.5 * this.props.buffer / this.props.extent;
+      const k1 = 0.5 * this.tableOptions.buffer / this.tableOptions.extent;
       const k2 = 0.5 - k1;
       const k3 = 0.5 + k1;
       const k4 = 1 + k1;
@@ -2108,17 +2095,17 @@ var _DynamicVectorTileSource = class {
       let bl = null;
       let tr = null;
       let br = null;
-      let left = clipFeatures(features2, z2, x - k1, x + k3, 0, tile.minX, tile.maxX, this.props);
-      let right = clipFeatures(features2, z2, x + k2, x + k4, 0, tile.minX, tile.maxX, this.props);
+      let left = clipFeatures(features2, z2, x - k1, x + k3, 0, tile.minX, tile.maxX, this.tableOptions);
+      let right = clipFeatures(features2, z2, x + k2, x + k4, 0, tile.minX, tile.maxX, this.tableOptions);
       features2 = null;
       if (left) {
-        tl = clipFeatures(left, z2, y - k1, y + k3, 1, tile.minY, tile.maxY, this.props);
-        bl = clipFeatures(left, z2, y + k2, y + k4, 1, tile.minY, tile.maxY, this.props);
+        tl = clipFeatures(left, z2, y - k1, y + k3, 1, tile.minY, tile.maxY, this.tableOptions);
+        bl = clipFeatures(left, z2, y + k2, y + k4, 1, tile.minY, tile.maxY, this.tableOptions);
         left = null;
       }
       if (right) {
-        tr = clipFeatures(right, z2, y - k1, y + k3, 1, tile.minY, tile.maxY, this.props);
-        br = clipFeatures(right, z2, y + k2, y + k4, 1, tile.minY, tile.maxY, this.props);
+        tr = clipFeatures(right, z2, y - k1, y + k3, 1, tile.minY, tile.maxY, this.tableOptions);
+        br = clipFeatures(right, z2, y + k2, y + k4, 1, tile.minY, tile.maxY, this.tableOptions);
         right = null;
       }
       import_loader_utils3.log.timeEnd(2, "clipping tile")();
@@ -2129,13 +2116,22 @@ var _DynamicVectorTileSource = class {
     }
   }
 };
-var DynamicVectorTileSource = _DynamicVectorTileSource;
+var TableVectorTileSource = _TableVectorTileSource;
 /** Global stats for all DynamicVectorTileSources */
-__publicField(DynamicVectorTileSource, "stats", new import_stats.Stats({
+__publicField(TableVectorTileSource, "stats", new import_stats.Stats({
   id: "table-tile-source-all",
   stats: [new import_stats.Stat("count", "tiles"), new import_stats.Stat("count", "features")]
 }));
 function toID(z, x, y) {
   return ((1 << z) * y + x) * 32 + z;
 }
+async function loadTable(url, loader) {
+  if (typeof url === "string") {
+    const response = await fetch(url);
+    const data2 = await response.arrayBuffer();
+    return await loader.parse(data2);
+  }
+  const data = await url.arrayBuffer();
+  return await loader.parse(data);
+}
 //# sourceMappingURL=index.cjs.map