@loaders.gl/i3s 4.2.0-alpha.5 → 4.2.0-alpha.6

package/dist/arcgis-webscene-loader.js

@@ -1,7 +1,7 @@
 import { parseWebscene } from "./lib/parsers/parse-arcgis-webscene.js";
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.2.0-alpha.4" !== 'undefined' ? "4.2.0-alpha.4" : 'latest';
+const VERSION = typeof "4.2.0-alpha.5" !== 'undefined' ? "4.2.0-alpha.5" : 'latest';
 /**
  * Loader for ArcGIS WebScene
  * Spec - https://developers.arcgis.com/web-scene-specification/objects/webscene/

package/dist/dist.dev.js

@@ -4600,10 +4600,11 @@ var __exports__ = (() => {
   // ../loader-utils/src/lib/files/node-file-facade.ts
   var NOT_IMPLEMENTED = new Error("Not implemented");
   var NodeFileFacade = class {
+    handle;
+    size = 0;
+    bigsize = 0n;
+    url = "";
     constructor(url, flags, mode) {
-      this.size = 0;
-      this.bigsize = 0n;
-      this.url = "";
       if (globalThis.loaders?.NodeFile) {
         return new globalThis.loaders.NodeFile(url, flags, mode);
       }
@@ -4644,6 +4645,8 @@ var __exports__ = (() => {
 
   // ../loader-utils/src/lib/file-provider/file-handle-file.ts
   var FileHandleFile = class {
+    /** The FileHandle from which data is provided */
+    file;
     /** Create a new FileHandleFile */
     constructor(path, append = false) {
       this.file = new NodeFileFacade(path, append ? "a+" : "r");
@@ -4743,6 +4746,8 @@ var __exports__ = (() => {
     return Number(bigint);
   };
   var DataViewFile = class {
+    /** The DataView from which data is provided */
+    file;
     constructor(file) {
       this.file = file;
     }
@@ -9865,6 +9870,9 @@ var __exports__ = (() => {
   };
   var INDEX_ITEM_SIZE = 4;
   var DracoParser = class {
+    draco;
+    decoder;
+    metadataQuerier;
     // draco - the draco decoder, either import `draco3d` or load dynamically
     constructor(draco) {
       this.draco = draco;
@@ -11492,11 +11500,7 @@ var __exports__ = (() => {
       texture: null
     };
     if (tileOptions.textureUrl) {
-      const url = getUrlWithToken(
-        getInternalPathFromUrl(tileOptions.textureUrl),
-        // @ts-expect-error options is not properly typed
-        options?.i3s?.token
-      );
+      const url = getUrlWithToken(tileOptions.textureUrl, options?.i3s?.token);
       const loader = getLoaderForTextureFormat(tileOptions.textureFormat);
       const fetchFunc = context?.fetch || fetch;
       const response = await fetchFunc(url);
@@ -11534,18 +11538,6 @@ var __exports__ = (() => {
     }
     return await parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options);
   }
-  function getInternalPathFromUrl(url) {
-    const slpkUrlParts = url.split(".slpk");
-    let filename;
-    if (slpkUrlParts.length === 1) {
-      filename = url;
-    } else if (slpkUrlParts.length === 2) {
-      filename = slpkUrlParts[1].slice(1);
-    } else {
-      filename = url;
-    }
-    return filename;
-  }
   async function parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options) {
     const contentByteLength = arrayBuffer.byteLength;
     let attributes;
@@ -11673,11 +11665,11 @@ var __exports__ = (() => {
     for (const { property, type } of options.store.defaultGeometrySchema.header) {
       const TypedArrayTypeHeader = getConstructorForDataFormat(type);
       switch (property) {
-        case "vertexCount" /* vertexCount */:
+        case "vertexCount" /* vertexCount */.toString():
           vertexCount = new TypedArrayTypeHeader(arrayBuffer, 0, 4)[0];
           byteOffset += sizeOf(type);
           break;
-        case "featureCount" /* featureCount */:
+        case "featureCount" /* featureCount */.toString():
           featureCount = new TypedArrayTypeHeader(arrayBuffer, 4, 4)[0];
           byteOffset += sizeOf(type);
           break;
@@ -12381,6 +12373,16 @@ var __exports__ = (() => {
 
   // src/lib/helpers/i3s-nodepages-tiles.ts
   var I3SNodePagesTiles = class {
+    tileset;
+    nodePages = [];
+    pendingNodePages = [];
+    nodesPerPage;
+    options;
+    lodSelectionMetricType;
+    textureDefinitionsSelectedFormats = [];
+    nodesInNodePages;
+    url;
+    textureLoaderOptions = {};
     /**
      * @constructs
      * Create a I3SNodePagesTiles instance.
@@ -12389,10 +12391,6 @@ var __exports__ = (() => {
      * @param options - i3s loader options
      */
     constructor(tileset, url = "", options) {
-      this.nodePages = [];
-      this.pendingNodePages = [];
-      this.textureDefinitionsSelectedFormats = [];
-      this.textureLoaderOptions = {};
       this.tileset = { ...tileset };
       this.url = url;
       this.nodesPerPage = tileset.nodePages?.nodesPerPage || 64;
@@ -12409,7 +12407,7 @@ var __exports__ = (() => {
       const pageIndex = Math.floor(id / this.nodesPerPage);
       if (!this.nodePages[pageIndex] && !this.pendingNodePages[pageIndex]) {
         const nodePageUrl = getUrlWithToken(
-          this.url.indexOf(".slpk") !== -1 ? `nodepages/${pageIndex}` : `${this.url}/nodepages/${pageIndex}`,
+          `${this.url}/nodepages/${pageIndex}`,
           // @ts-expect-error this.options is not properly typed
           this.options.i3s?.token
         );
@@ -12712,6 +12710,7 @@ var __exports__ = (() => {
   // src/i3s-loader.ts
   var VERSION7 = typeof __VERSION__ !== "undefined" ? __VERSION__ : "latest";
   var TILESET_REGEX = /layers\/[0-9]+$/;
+  var LOCAL_SLPK_REGEX = /\.slpk$/;
   var TILE_HEADER_REGEX = /nodes\/([0-9-]+|root)$/;
   var SLPK_HEX = "504b0304";
   var POINT_CLOUD = "PointCloud";
@@ -12749,7 +12748,7 @@ var __exports__ = (() => {
     const urlWithoutParams = getUrlWithoutParams(url);
     let isTileset;
     if (options.i3s.isTileset === "auto") {
-      isTileset = TILESET_REGEX.test(urlWithoutParams);
+      isTileset = TILESET_REGEX.test(urlWithoutParams) || LOCAL_SLPK_REGEX.test(urlWithoutParams);
     } else {
       isTileset = options.i3s.isTileset;
     }
@@ -13810,9 +13809,10 @@ var __exports__ = (() => {
 
   // ../crypto/src/lib/md5-hash.ts
   var MD5Hash = class extends Hash {
+    name = "md5";
+    options;
     constructor(options = {}) {
       super();
-      this.name = "md5";
       this.options = options;
     }
     /**
@@ -13885,13 +13885,14 @@ var __exports__ = (() => {
   var import_pako = __toESM(require_pako(), 1);
   var import_zlib = __toESM(require_zlib(), 1);
   var DeflateCompression = class extends Compression {
+    name = "deflate";
+    extensions = [];
+    contentEncodings = ["deflate"];
+    isSupported = true;
+    options;
+    _chunks = [];
     constructor(options = {}) {
       super(options);
-      this.name = "deflate";
-      this.extensions = [];
-      this.contentEncodings = ["deflate"];
-      this.isSupported = true;
-      this._chunks = [];
       this.options = options;
     }
     async compress(input) {
@@ -13998,12 +13999,12 @@ var __exports__ = (() => {
 
   // ../compression/src/lib/gzip-compression.ts
   var GZipCompression = class extends DeflateCompression {
+    name = "gzip";
+    extensions = ["gz", "gzip"];
+    contentEncodings = ["gzip", "x-gzip"];
+    isSupported = true;
     constructor(options) {
       super({ ...options, deflate: { ...options?.gzip, gzip: true } });
-      this.name = "gzip";
-      this.extensions = ["gz", "gzip"];
-      this.contentEncodings = ["gzip", "x-gzip"];
-      this.isSupported = true;
     }
   };
 
@@ -14019,14 +14020,15 @@ var __exports__ = (() => {
     }
   };
   var ZipFileSystem = class {
+    /** FileProvider instance promise */
+    fileProvider = null;
+    fileName;
+    archive = null;
     /**
      * Constructor
      * @param file - instance of FileProvider or file path string
      */
     constructor(file) {
-      /** FileProvider instance promise */
-      this.fileProvider = null;
-      this.archive = null;
       if (typeof file === "string") {
         this.fileName = file;
         if (!isBrowser) {
@@ -14078,6 +14080,9 @@ var __exports__ = (() => {
      * @returns - Response with file data
      */
     async fetch(filename) {
+      if (this.fileName && filename.indexOf(this.fileName) === 0) {
+        filename = filename.substring(this.fileName.length + 1);
+      }
       let uncompressedFile;
       if (this.archive) {
         uncompressedFile = await this.archive.getFile(filename, "http");
@@ -14135,6 +14140,8 @@ var __exports__ = (() => {
 
   // ../zip/src/filesystems/IndexedArchive.ts
   var IndexedArchive = class {
+    fileProvider;
+    fileName;
     /**
      * Constructor
      * @param fileProvider - instance of a binary data reader
@@ -14224,6 +14231,11 @@ var __exports__ = (() => {
     }
   ];
   var SLPKArchive = class extends IndexedArchive {
+    // Maps hex-encoded md5 filename hashes to bigint offsets into the archive
+    hashTable;
+    _textEncoder = new TextEncoder();
+    _textDecoder = new TextDecoder();
+    _md5Hash = new MD5Hash();
     /**
      * Constructor
      * @param fileProvider - instance of a binary data reader
@@ -14232,9 +14244,6 @@ var __exports__ = (() => {
      */
     constructor(fileProvider, hashTable, fileName) {
       super(fileProvider, hashTable, fileName);
-      this._textEncoder = new TextEncoder();
-      this._textDecoder = new TextDecoder();
-      this._md5Hash = new MD5Hash();
       this.hashTable = hashTable;
     }
     /**