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

package/dist/dist.dev.js

@@ -1088,7 +1088,7 @@ var __exports__ = (() => {
     }
   };
 
-  // ../schema/src/lib/table/simple-table/data-type.ts
+  // ../schema-utils/src/lib/schema/data-type.ts
   function getDataTypeFromValue(value, defaultNumberType = "float32") {
     if (value instanceof Date) {
       return "date-millisecond";
@@ -1139,7 +1139,7 @@ var __exports__ = (() => {
     }
   }
 
-  // ../schema/src/lib/table/simple-table/table-schema.ts
+  // ../schema-utils/src/lib/schema/deduce-table-schema.ts
   function deduceTableSchema(table) {
     switch (table.shape) {
       case "array-row-table":
@@ -1720,8 +1720,8 @@ var __exports__ = (() => {
     }
   };
 
-  // ../gis/src/lib/binary-features/flat-geojson-to-binary.ts
-  function flatGeojsonToBinary(features2, geometryInfo, options) {
+  // ../gis/src/lib/feature-collection-converters/convert-flat-geojson-to-binary-features.ts
+  function convertFlatGeojsonToBinaryFeatureCollection(features2, geometryInfo, options) {
     const propArrayTypes = extractNumericPropTypes(features2);
     const numericPropKeys = Object.keys(propArrayTypes).filter((k) => propArrayTypes[k] !== Array);
     return fillArrays(
@@ -2033,14 +2033,14 @@ var __exports__ = (() => {
   var matches = typeof process !== "undefined" && process.version && /v([0-9]*)/.exec(process.version);
   var nodeVersion = matches && parseFloat(matches[1]) || 0;
 
-  // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/lib/globals.js
+  // ../../node_modules/@probe.gl/env/dist/lib/globals.js
   var window_2 = globalThis;
   var document_2 = globalThis.document || {};
   var process_ = globalThis.process || {};
   var console_ = globalThis.console;
   var navigator_ = globalThis.navigator || {};
 
-  // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/lib/is-electron.js
+  // ../../node_modules/@probe.gl/env/dist/lib/is-electron.js
   function isElectron(mockUserAgent) {
     if (typeof window !== "undefined" && window.process?.type === "renderer") {
       return true;
@@ -2053,7 +2053,7 @@ var __exports__ = (() => {
     return Boolean(userAgent && userAgent.indexOf("Electron") >= 0);
   }
 
-  // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/lib/is-browser.js
+  // ../../node_modules/@probe.gl/env/dist/lib/is-browser.js
   function isBrowser2() {
     const isNode = (
       // @ts-expect-error
@@ -2062,7 +2062,7 @@ var __exports__ = (() => {
     return !isNode || isElectron();
   }
 
-  // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/index.js
+  // ../../node_modules/@probe.gl/env/dist/index.js
   var VERSION2 = true ? "4.0.7" : "untranspiled source";
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -2478,6 +2478,32 @@ var __exports__ = (() => {
   }
   var log = createLog();
 
+  // ../loader-utils/src/lib/option-utils/merge-options.ts
+  function getRequiredOptions(options) {
+    return options;
+  }
+  function mergeOptions(baseOptions, newOptions) {
+    return mergeOptionsRecursively(baseOptions || {}, newOptions);
+  }
+  function mergeOptionsRecursively(baseOptions, newOptions, level = 0) {
+    if (level > 3) {
+      return newOptions;
+    }
+    const options = { ...baseOptions };
+    for (const [key, newValue] of Object.entries(newOptions)) {
+      if (newValue && typeof newValue === "object" && !Array.isArray(newValue)) {
+        options[key] = mergeOptionsRecursively(
+          options[key] || {},
+          newOptions[key],
+          level + 1
+        );
+      } else {
+        options[key] = newOptions[key];
+      }
+    }
+    return options;
+  }
+
   // ../../node_modules/@probe.gl/stats/dist/utils/hi-res-timestamp.js
   function getHiResTimestamp2() {
     let timestamp;
@@ -2688,20 +2714,29 @@ var __exports__ = (() => {
   }
 
   // ../loader-utils/src/lib/sources/data-source.ts
-  var DataSource = class {
-    /** A resolved fetch function extracted from loadOptions prop */
-    fetch;
+  var _DataSource = class {
+    optionsType;
+    options;
+    data;
+    url;
     /** The actual load options, if calling a loaders.gl loader */
     loadOptions;
+    /** A resolved fetch function extracted from loadOptions prop */
+    fetch;
     _needsRefresh = true;
-    props;
-    constructor(props) {
-      this.props = { ...props };
-      this.loadOptions = { ...props.loadOptions };
+    constructor(data, options, defaultOptions) {
+      if (defaultOptions) {
+        this.options = mergeOptions({ ...defaultOptions, core: _DataSource.defaultOptions }, options);
+      } else {
+        this.options = { ...options };
+      }
+      this.data = data;
+      this.url = typeof data === "string" ? resolvePath(data) : "";
+      this.loadOptions = { ...this.options.core?.loadOptions };
       this.fetch = getFetchFunction(this.loadOptions);
     }
-    setProps(props) {
-      this.props = Object.assign(this.props, props);
+    setProps(options) {
+      this.options = Object.assign(this.options, options);
       this.setNeedsRefresh();
     }
     /** Mark this data source as needing a refresh (redraw) */
@@ -2720,6 +2755,15 @@ var __exports__ = (() => {
       return needsRefresh;
     }
   };
+  var DataSource = _DataSource;
+  __publicField(DataSource, "defaultOptions", {
+    core: {
+      type: "auto",
+      attributions: [],
+      loadOptions: {},
+      loaders: []
+    }
+  });
   function getFetchFunction(options) {
     const fetchFunction = options?.fetch;
     if (fetchFunction && typeof fetchFunction === "function") {
@@ -3304,7 +3348,7 @@ var __exports__ = (() => {
   }
   function parseToBinary(arrayBuffer, options) {
     const [flatGeoJsonFeatures, geometryInfo] = parseToFlatGeoJson(arrayBuffer, options);
-    const binaryData = flatGeojsonToBinary(flatGeoJsonFeatures, geometryInfo);
+    const binaryData = convertFlatGeojsonToBinaryFeatureCollection(flatGeoJsonFeatures, geometryInfo);
     binaryData.byteLength = arrayBuffer.byteLength;
     return binaryData;
   }
@@ -3391,15 +3435,11 @@ var __exports__ = (() => {
     return decodedFeature;
   }
 
-  // src/mvt-loader.ts
-  var VERSION4 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
-  var MVTWorkerLoader = {
-    dataType: null,
-    batchType: null,
+  // src/mvt-format.ts
+  var MVTFormat = {
     name: "Mapbox Vector Tile",
     id: "mvt",
     module: "mvt",
-    version: VERSION4,
     // Note: ArcGIS uses '.pbf' extension and 'application/octet-stream'
     extensions: ["mvt", "pbf"],
     mimeTypes: [
@@ -3408,8 +3448,17 @@ var __exports__ = (() => {
       "application/x-protobuf"
       // 'application/octet-stream'
     ],
+    category: "geometry"
+  };
+
+  // src/mvt-loader.ts
+  var VERSION4 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
+  var MVTWorkerLoader = {
+    ...MVTFormat,
+    dataType: null,
+    batchType: null,
+    version: VERSION4,
     worker: true,
-    category: "geometry",
     options: {
       mvt: {
         shape: "geojson",
@@ -3837,41 +3886,31 @@ var __exports__ = (() => {
 
   // src/mvt-source.ts
   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 DataSource {
-    props;
-    url;
     metadataUrl = null;
-    data;
     schema = "tms";
     metadata;
     extension;
     mimeType = null;
-    constructor(url, props) {
-      super(props);
-      this.props = props;
-      this.url = resolvePath(url);
-      this.metadataUrl = props.mvt?.metadataUrl || `${this.url}/tilejson.json`;
-      this.extension = props.mvt?.extension || ".png";
-      this.data = this.url;
+    constructor(url, options) {
+      super(url, options, MVTSource.defaultOptions);
+      this.metadataUrl = options.mvt?.metadataUrl || `${this.url}/tilejson.json`;
+      this.extension = options.mvt?.extension || ".png";
       this.getTileData = this.getTileData.bind(this);
       this.metadata = this.getMetadata();
       if (isURLTemplate(this.url)) {
@@ -4684,10 +4723,14 @@ var __exports__ = (() => {
   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,
@@ -4700,27 +4743,16 @@ var __exports__ = (() => {
         generateId: void 0
       }
     },
-    type: "table",
     testURL: (url) => url.endsWith(".geojson"),
     createDataSource(url, options) {
       const needsLoading = typeof url === "string" || url instanceof Blob;
-      const loader = options?.table?.loaders?.[0];
+      const loader = options?.core?.loaders?.[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 DataSource {
+    /** Stats for this TableVectorTileSource */
     stats = new Stats({
       id: "table-tile-source",
       stats: [new Stat("tiles", "count"), new Stat("features", "count")]
@@ -4728,9 +4760,7 @@ var __exports__ = (() => {
     /** 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 */
@@ -4741,8 +4771,9 @@ var __exports__ = (() => {
     ready;
     /** Metadata for the tile source (generated TileJSON/tilestats */
     metadata;
-    constructor(table, props) {
-      this.props = { ...TableTileSource.options.table, ...props?.table };
+    constructor(table, options) {
+      super(table, options, TableTileSource.defaultOptions);
+      this.tableOptions = getRequiredOptions(this.options).table;
       this.getTileData = this.getTileData.bind(this);
       this.ready = this.initializeTilesAsync(table);
       this.metadata = this.getMetadata();
@@ -4754,7 +4785,7 @@ var __exports__ = (() => {
     }
     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;
@@ -4791,9 +4822,9 @@ var __exports__ = (() => {
         return null;
       }
       return convertTileToGeoJSON(protoTile, {
-        coordinates: this.props.coordinates,
+        coordinates: this.tableOptions.coordinates,
         tileIndex,
-        extent: this.props.extent
+        extent: this.tableOptions.extent
       });
     }
     /**
@@ -4801,20 +4832,20 @@ var __exports__ = (() => {
      * @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.");
       }
-      log.log(1, "DynamicVectorTileSource creating root tiles", this.props)();
+      log.log(1, "TableVectorTileSource creating root tiles", this.tableOptions)();
       log.time(1, "preprocess table")();
-      let features2 = convertFeaturesToProtoFeature(table, this.props);
+      let features2 = convertFeaturesToProtoFeature(table, this.tableOptions);
       log.timeEnd(1, "preprocess table")();
       log.time(1, "generate tiles")();
-      features2 = wrapFeatures(features2, this.props);
+      features2 = wrapFeatures(features2, this.tableOptions);
       if (features2.length === 0) {
-        log.log(1, "DynamicVectorTileSource: no features generated")();
+        log.log(1, "TableVectorTileSource: no features generated")();
         return;
       }
       this.splitTile(features2, 0, 0, 0);
@@ -4823,7 +4854,7 @@ var __exports__ = (() => {
       log.timeEnd(1, "generate tiles")();
       log.log(
         1,
-        `DynamicVectorTileSource: tiles generated: ${this.stats.get("total").count}`,
+        `TableVectorTileSource: tiles generated: ${this.stats.get("total").count}`,
         this.stats
       )();
     }
@@ -4835,7 +4866,7 @@ var __exports__ = (() => {
     getProtoTile(tileIndex) {
       const { z, y } = tileIndex;
       let { x } = tileIndex;
-      const { extent } = this.props;
+      const { extent } = this.tableOptions;
       if (z < 0 || z > 24) {
         return null;
       }
@@ -4871,7 +4902,7 @@ var __exports__ = (() => {
      * @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) {
@@ -4886,16 +4917,16 @@ var __exports__ = (() => {
         let tile = this.tiles[id];
         if (!tile) {
           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();
           log.log(
             2,
@@ -4911,10 +4942,10 @@ var __exports__ = (() => {
         }
         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;
@@ -4926,7 +4957,7 @@ var __exports__ = (() => {
         if (features2.length === 0)
           continue;
         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;
@@ -4934,17 +4965,35 @@ var __exports__ = (() => {
         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;
         }
         log.timeEnd(2, "clipping tile")();
@@ -4955,15 +5004,24 @@ var __exports__ = (() => {
       }
     }
   };
-  var DynamicVectorTileSource = _DynamicVectorTileSource;
+  var TableVectorTileSource = _TableVectorTileSource;
   /** Global stats for all DynamicVectorTileSources */
-  __publicField(DynamicVectorTileSource, "stats", new Stats({
+  __publicField(TableVectorTileSource, "stats", new Stats({
     id: "table-tile-source-all",
     stats: [new Stat("count", "tiles"), new 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);
+  }
   return __toCommonJS(bundle_exports);
 })();
 /*! Bundled license information: