@loaders.gl/i3s 4.3.1 → 4.4.0-alpha.1

package/dist/i3s-content-worker.js

@@ -41,14 +41,14 @@
   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;
@@ -61,7 +61,7 @@
     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
@@ -70,7 +70,7 @@
     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 VERSION = true ? "4.0.7" : "untranspiled source";
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -473,7 +473,7 @@
   var dist_default = new Log({ id: "@probe.gl/log" });
 
   // ../loader-utils/src/lib/log-utils/log.ts
-  var VERSION2 = true ? "4.3.0" : "latest";
+  var VERSION2 = true ? "4.4.0-alpha.0" : "latest";
   var version = VERSION2[0] >= "0" && VERSION2[0] <= "9" ? `v${VERSION2}` : "";
   function createLog() {
     const log2 = new Log({ id: "loaders.gl" });
@@ -486,8 +486,8 @@
   }
   var log = createLog();
 
-  // ../loader-utils/src/lib/option-utils/merge-loader-options.ts
-  function mergeLoaderOptions(baseOptions, newOptions) {
+  // ../loader-utils/src/lib/option-utils/merge-options.ts
+  function mergeOptions(baseOptions, newOptions) {
     return mergeOptionsRecursively(baseOptions || {}, newOptions);
   }
   function mergeOptionsRecursively(baseOptions, newOptions, level = 0) {
@@ -520,8 +520,10 @@
     return module || null;
   }
 
+  // ../worker-utils/src/lib/npm-tag.ts
+  var NPM_TAG = "beta";
+
   // ../worker-utils/src/lib/env-utils/version.ts
-  var NPM_TAG = "latest";
   function getVersion() {
     if (!globalThis._loadersgl_?.version) {
       globalThis._loadersgl_ = globalThis._loadersgl_ || {};
@@ -531,7 +533,7 @@
         );
         globalThis._loadersgl_.version = NPM_TAG;
       } else {
-        globalThis._loadersgl_.version = "4.3.0";
+        globalThis._loadersgl_.version = "4.4.0-alpha.0";
       }
     }
     return globalThis._loadersgl_.version;
@@ -2467,7 +2469,7 @@
   }
   async function parseWithLoader(loader, data, options, context) {
     validateWorkerVersion(loader);
-    options = mergeLoaderOptions(loader.options, options);
+    options = mergeOptions(loader.options, options);
     if (isResponse(data)) {
       const response = data;
       const { ok, redirected, status, statusText, type, url } = response;
@@ -2492,7 +2494,7 @@
     throw new Error(`${loader.id} loader - no parser found and worker is disabled`);
   }
 
-  // ../schema/src/lib/table/simple-table/data-type.ts
+  // ../schema-utils/src/lib/schema/data-type.ts
   function getDataTypeFromTypedArray(array) {
     switch (array.constructor) {
       case Int8Array:
@@ -2517,7 +2519,7 @@
     }
   }
 
-  // ../schema/src/lib/mesh/mesh-utils.ts
+  // ../schema-utils/src/lib/mesh/mesh-utils.ts
   function getMeshBoundingBox(attributes) {
     let minX = Infinity;
     let minY = Infinity;
@@ -2544,7 +2546,7 @@
     ];
   }
 
-  // ../schema/src/lib/mesh/deduce-mesh-schema.ts
+  // ../schema-utils/src/lib/mesh/deduce-mesh-schema.ts
   function deduceMeshField(name, attribute, optionalMetadata) {
     const type = getDataTypeFromTypedArray(attribute.value);
     const metadata = optionalMetadata ? optionalMetadata : makeMeshAttributeMetadata(attribute);
@@ -5346,7 +5348,7 @@
   Ellipsoid.WGS84 = new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z);
 
   // ../images/src/lib/utils/version.ts
-  var VERSION4 = true ? "4.3.0" : "latest";
+  var VERSION4 = true ? "4.4.0-alpha.0" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var parseImageNode = globalThis.loaders?.parseImageNode;
@@ -5753,33 +5755,86 @@
     options: DEFAULT_IMAGE_LOADER_OPTIONS
   };
 
-  // ../draco/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.3.0" : "latest";
-
-  // ../draco/src/draco-loader.ts
-  var DracoLoader = {
-    dataType: null,
-    batchType: null,
-    name: "Draco",
-    id: "draco",
-    module: "draco",
-    // shapes: ['mesh'],
-    version: VERSION5,
-    worker: true,
-    extensions: ["drc"],
-    mimeTypes: ["application/octet-stream"],
-    binary: true,
-    tests: ["DRACO"],
-    options: {
-      draco: {
-        decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
-        // 'js' for IE11
-        libraryPath: "libs/",
-        extraAttributes: {},
-        attributeNameEntry: void 0
-      }
-    }
+  // ../draco/src/lib/draco-module-loader.ts
+  var DRACO_DECODER_VERSION = "1.5.6";
+  var DRACO_ENCODER_VERSION = "1.4.1";
+  var STATIC_DECODER_URL = `https://www.gstatic.com/draco/versioned/decoders/${DRACO_DECODER_VERSION}`;
+  var DRACO_EXTERNAL_LIBRARIES = {
+    /** The primary Draco3D encoder, javascript wrapper part */
+    DECODER: "draco_wasm_wrapper.js",
+    /** The primary draco decoder, compiled web assembly part */
+    DECODER_WASM: "draco_decoder.wasm",
+    /** Fallback decoder for non-webassebly environments. Very big bundle, lower performance */
+    FALLBACK_DECODER: "draco_decoder.js",
+    /** Draco encoder */
+    ENCODER: "draco_encoder.js"
   };
+  var DRACO_EXTERNAL_LIBRARY_URLS = {
+    [DRACO_EXTERNAL_LIBRARIES.DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER}`,
+    [DRACO_EXTERNAL_LIBRARIES.DECODER_WASM]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER_WASM}`,
+    [DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER}`,
+    [DRACO_EXTERNAL_LIBRARIES.ENCODER]: `https://raw.githubusercontent.com/google/draco/${DRACO_ENCODER_VERSION}/javascript/${DRACO_EXTERNAL_LIBRARIES.ENCODER}`
+  };
+  var loadDecoderPromise;
+  async function loadDracoDecoderModule(options) {
+    const modules = options.modules || {};
+    if (modules.draco3d) {
+      loadDecoderPromise ||= modules.draco3d.createDecoderModule({}).then((draco) => {
+        return { draco };
+      });
+    } else {
+      loadDecoderPromise ||= loadDracoDecoder(options);
+    }
+    return await loadDecoderPromise;
+  }
+  async function loadDracoDecoder(options) {
+    let DracoDecoderModule;
+    let wasmBinary;
+    switch (options.draco && options.draco.decoderType) {
+      case "js":
+        DracoDecoderModule = await loadLibrary(
+          DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER],
+          "draco",
+          options,
+          DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER
+        );
+        break;
+      case "wasm":
+      default:
+        [DracoDecoderModule, wasmBinary] = await Promise.all([
+          await loadLibrary(
+            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER],
+            "draco",
+            options,
+            DRACO_EXTERNAL_LIBRARIES.DECODER
+          ),
+          await loadLibrary(
+            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER_WASM],
+            "draco",
+            options,
+            DRACO_EXTERNAL_LIBRARIES.DECODER_WASM
+          )
+        ]);
+    }
+    DracoDecoderModule = DracoDecoderModule || globalThis.DracoDecoderModule;
+    return await initializeDracoDecoder(DracoDecoderModule, wasmBinary);
+  }
+  function initializeDracoDecoder(DracoDecoderModule, wasmBinary) {
+    const options = {};
+    if (wasmBinary) {
+      options.wasmBinary = wasmBinary;
+    }
+    return new Promise((resolve2) => {
+      DracoDecoderModule({
+        ...options,
+        onModuleLoaded: (draco) => resolve2({ draco })
+        // Module is Promise-like. Wrap in object to avoid loop.
+      });
+    });
+  }
+
+  // ../draco/src/lib/utils/version.ts
+  var VERSION5 = true ? "4.4.0-alpha.0" : "latest";
 
   // ../draco/src/lib/utils/get-draco-schema.ts
   function getDracoSchema(attributes, loaderData, indices) {
@@ -5980,6 +6035,7 @@
           case "triangle-strip":
             return {
               topology: "triangle-strip",
+              // TODO - mode is wrong?
               mode: 4,
               // GL.TRIANGLES
               attributes,
@@ -5992,6 +6048,7 @@
           default:
             return {
               topology: "triangle-list",
+              // TODO - mode is wrong?
               mode: 5,
               // GL.TRIANGLE_STRIP
               attributes,
@@ -6276,87 +6333,32 @@
     return intArray;
   }
 
-  // ../draco/src/lib/draco-module-loader.ts
-  var DRACO_DECODER_VERSION = "1.5.6";
-  var DRACO_ENCODER_VERSION = "1.4.1";
-  var STATIC_DECODER_URL = `https://www.gstatic.com/draco/versioned/decoders/${DRACO_DECODER_VERSION}`;
-  var DRACO_EXTERNAL_LIBRARIES = {
-    /** The primary Draco3D encoder, javascript wrapper part */
-    DECODER: "draco_wasm_wrapper.js",
-    /** The primary draco decoder, compiled web assembly part */
-    DECODER_WASM: "draco_decoder.wasm",
-    /** Fallback decoder for non-webassebly environments. Very big bundle, lower performance */
-    FALLBACK_DECODER: "draco_decoder.js",
-    /** Draco encoder */
-    ENCODER: "draco_encoder.js"
-  };
-  var DRACO_EXTERNAL_LIBRARY_URLS = {
-    [DRACO_EXTERNAL_LIBRARIES.DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER}`,
-    [DRACO_EXTERNAL_LIBRARIES.DECODER_WASM]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.DECODER_WASM}`,
-    [DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER]: `${STATIC_DECODER_URL}/${DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER}`,
-    [DRACO_EXTERNAL_LIBRARIES.ENCODER]: `https://raw.githubusercontent.com/google/draco/${DRACO_ENCODER_VERSION}/javascript/${DRACO_EXTERNAL_LIBRARIES.ENCODER}`
-  };
-  var loadDecoderPromise;
-  async function loadDracoDecoderModule(options) {
-    const modules = options.modules || {};
-    if (modules.draco3d) {
-      loadDecoderPromise ||= modules.draco3d.createDecoderModule({}).then((draco) => {
-        return { draco };
-      });
-    } else {
-      loadDecoderPromise ||= loadDracoDecoder(options);
-    }
-    return await loadDecoderPromise;
-  }
-  async function loadDracoDecoder(options) {
-    let DracoDecoderModule;
-    let wasmBinary;
-    switch (options.draco && options.draco.decoderType) {
-      case "js":
-        DracoDecoderModule = await loadLibrary(
-          DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER],
-          "draco",
-          options,
-          DRACO_EXTERNAL_LIBRARIES.FALLBACK_DECODER
-        );
-        break;
-      case "wasm":
-      default:
-        [DracoDecoderModule, wasmBinary] = await Promise.all([
-          await loadLibrary(
-            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER],
-            "draco",
-            options,
-            DRACO_EXTERNAL_LIBRARIES.DECODER
-          ),
-          await loadLibrary(
-            DRACO_EXTERNAL_LIBRARY_URLS[DRACO_EXTERNAL_LIBRARIES.DECODER_WASM],
-            "draco",
-            options,
-            DRACO_EXTERNAL_LIBRARIES.DECODER_WASM
-          )
-        ]);
-    }
-    DracoDecoderModule = DracoDecoderModule || globalThis.DracoDecoderModule;
-    return await initializeDracoDecoder(DracoDecoderModule, wasmBinary);
-  }
-  function initializeDracoDecoder(DracoDecoderModule, wasmBinary) {
-    const options = {};
-    if (wasmBinary) {
-      options.wasmBinary = wasmBinary;
+  // ../draco/src/draco-loader.ts
+  var DracoWorkerLoader = {
+    dataType: null,
+    batchType: null,
+    name: "Draco",
+    id: "draco",
+    module: "draco",
+    // shapes: ['mesh'],
+    version: VERSION5,
+    worker: true,
+    extensions: ["drc"],
+    mimeTypes: ["application/octet-stream"],
+    binary: true,
+    tests: ["DRACO"],
+    options: {
+      draco: {
+        decoderType: typeof WebAssembly === "object" ? "wasm" : "js",
+        // 'js' for IE11
+        libraryPath: "libs/",
+        extraAttributes: {},
+        attributeNameEntry: void 0
+      }
     }
-    return new Promise((resolve2) => {
-      DracoDecoderModule({
-        ...options,
-        onModuleLoaded: (draco) => resolve2({ draco })
-        // Module is Promise-like. Wrap in object to avoid loop.
-      });
-    });
-  }
-
-  // ../draco/src/index.ts
-  var DracoLoader2 = {
-    ...DracoLoader,
+  };
+  var DracoLoader = {
+    ...DracoWorkerLoader,
     parse: parse2
   };
   async function parse2(arrayBuffer, options) {
@@ -6370,7 +6372,7 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION6 = true ? "4.3.0" : "latest";
+  var VERSION6 = true ? "4.4.0-alpha.0" : "latest";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
@@ -7732,7 +7734,7 @@
     let featureCount = 0;
     let indices;
     if (tileOptions.isDracoGeometry) {
-      const decompressedGeometry = await parse(arrayBuffer, DracoLoader2, {
+      const decompressedGeometry = await parse(arrayBuffer, DracoLoader, {
         draco: {
           attributeNameEntry: I3S_ATTRIBUTE_TYPE
         }
@@ -8053,7 +8055,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION7 = true ? "4.3.0" : "latest";
+  var VERSION7 = true ? "4.4.0-alpha.0" : "latest";
   var I3SContentLoader = {
     dataType: null,
     batchType: null,

package/dist/i3s-loader.js

@@ -8,7 +8,7 @@ import { COORDINATE_SYSTEM } from "./lib/parsers/constants.js";
 import { getUrlWithoutParams } from "./lib/utils/url-utils.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0" !== 'undefined' ? "4.3.0" : 'latest';
+const VERSION = typeof "4.4.0-alpha.0" !== 'undefined' ? "4.4.0-alpha.0" : 'latest';
 const TILESET_REGEX = /layers\/[0-9]+$/;
 const LOCAL_SLPK_REGEX = /\.slpk$/;
 const TILE_HEADER_REGEX = /nodes\/([0-9-]+|root)$/;

package/dist/i3s-node-page-loader.js

@@ -3,7 +3,7 @@
 // Copyright vis.gl contributors
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0" !== 'undefined' ? "4.3.0" : 'latest';
+const VERSION = typeof "4.4.0-alpha.0" !== 'undefined' ? "4.4.0-alpha.0" : 'latest';
 /**
  * Loader for I3S node pages
  */

package/dist/i3s-slpk-loader.js

@@ -5,7 +5,7 @@ import { DataViewFile } from '@loaders.gl/loader-utils';
 import { parseSLPKArchive } from "./lib/parsers/parse-slpk/parse-slpk.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0" !== 'undefined' ? "4.3.0" : 'latest';
+const VERSION = typeof "4.4.0-alpha.0" !== 'undefined' ? "4.4.0-alpha.0" : 'latest';
 /**
  * Loader for SLPK - Scene Layer Package (Archive I3S format)
  * @todo - this reloads the entire archive for every tile, should be optimized

package/dist/index.cjs

@@ -521,7 +521,7 @@ function getFeatureIdsFromFeatureIndexMetadata(featureIndex) {
 }
 
 // dist/i3s-content-loader.js
-var VERSION = true ? "4.3.0" : "latest";
+var VERSION = true ? "4.4.0-alpha.0" : "latest";
 var I3SContentLoader = {
   dataType: null,
   batchType: null,
@@ -558,7 +558,7 @@ var import_core3 = require("@loaders.gl/core");
 var import_textures2 = require("@loaders.gl/textures");
 
 // dist/i3s-node-page-loader.js
-var VERSION2 = true ? "4.3.0" : "latest";
+var VERSION2 = true ? "4.4.0-alpha.0" : "latest";
 var I3SNodePageLoader = {
   dataType: null,
   batchType: null,
@@ -904,7 +904,7 @@ async function normalizeTilesetData(tileset, options, context) {
 }
 
 // dist/i3s-loader.js
-var VERSION3 = true ? "4.3.0" : "latest";
+var VERSION3 = true ? "4.4.0-alpha.0" : "latest";
 var TILESET_REGEX = /layers\/[0-9]+$/;
 var LOCAL_SLPK_REGEX = /\.slpk$/;
 var TILE_HEADER_REGEX = /nodes\/([0-9-]+|root)$/;
@@ -1003,31 +1003,35 @@ var PATH_DESCRIPTIONS = [
     extensions: ["3dSceneLayer.json.gz"]
   },
   {
-    test: /^nodepages\/\d+$/,
+    test: /nodepages\/\d+$/,
     extensions: [".json.gz"]
   },
   {
-    test: /^nodes\/(\d+|root)$/,
+    test: /sublayers\/\d+$/,
+    extensions: ["/3dSceneLayer.json.gz"]
+  },
+  {
+    test: /nodes\/(\d+|root)$/,
     extensions: ["/3dNodeIndexDocument.json.gz"]
   },
   {
-    test: /^nodes\/\d+\/textures\/.+$/,
+    test: /nodes\/\d+\/textures\/.+$/,
     extensions: [".jpg", ".png", ".bin.dds.gz", ".ktx", ".ktx2"]
   },
   {
-    test: /^nodes\/\d+\/geometries\/\d+$/,
+    test: /nodes\/\d+\/geometries\/\d+$/,
     extensions: [".bin.gz", ".draco.gz"]
   },
   {
-    test: /^nodes\/\d+\/attributes\/f_\d+\/\d+$/,
+    test: /nodes\/\d+\/attributes\/f_\d+\/\d+$/,
     extensions: [".bin.gz"]
   },
   {
-    test: /^statistics\/f_\d+\/\d+$/,
+    test: /statistics\/(f_\d+\/\d+|summary)$/,
     extensions: [".json.gz"]
   },
   {
-    test: /^nodes\/\d+\/shared$/,
+    test: /nodes\/\d+\/shared$/,
     extensions: ["/sharedResource.json.gz"]
   }
 ];
@@ -1153,7 +1157,7 @@ async function parseSLPKArchive(fileProvider, cb, fileName) {
 }
 
 // dist/i3s-slpk-loader.js
-var VERSION4 = true ? "4.3.0" : "latest";
+var VERSION4 = true ? "4.4.0-alpha.0" : "latest";
 var SLPKLoader = {
   dataType: null,
   batchType: null,
@@ -1232,7 +1236,7 @@ function parseStringsAttribute(arrayBuffer) {
 }
 
 // dist/i3s-attribute-loader.js
-var VERSION5 = true ? "4.3.0" : "latest";
+var VERSION5 = true ? "4.4.0-alpha.0" : "latest";
 var EMPTY_VALUE = "";
 var REJECTED_STATUS = "rejected";
 var I3SAttributeLoader = {
@@ -1372,7 +1376,7 @@ function parseSublayersTree(sublayers, url) {
 }
 
 // dist/i3s-building-scene-layer-loader.js
-var VERSION6 = true ? "4.3.0" : "latest";
+var VERSION6 = true ? "4.4.0-alpha.0" : "latest";
 var I3SBuildingSceneLayerLoader = {
   dataType: null,
   batchType: null,
@@ -1466,7 +1470,7 @@ async function checkSupportedIndexCRS(layer) {
 }
 
 // dist/arcgis-webscene-loader.js
-var VERSION7 = true ? "4.3.0" : "latest";
+var VERSION7 = true ? "4.4.0-alpha.0" : "latest";
 var ArcGISWebSceneLoader = {
   dataType: null,
   batchType: null,