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

package/dist/i3s-content-worker.js

@@ -106,7 +106,7 @@
         );
         globalThis._loadersgl_.version = NPM_TAG;
       } else {
-        globalThis._loadersgl_.version = "4.2.0-alpha.4";
+        globalThis._loadersgl_.version = "4.2.0-alpha.5";
       }
     }
     return globalThis._loadersgl_.version;
@@ -627,7 +627,9 @@
       }
       getParentPort().then((parentPort2) => {
         if (parentPort2) {
-          parentPort2.on("message", handleMessage);
+          parentPort2.on("message", (message) => {
+            handleMessage(message);
+          });
           parentPort2.on("exit", () => console.debug("Node worker closing"));
         } else {
           globalThis.onmessage = handleMessage;
@@ -1442,7 +1444,7 @@
   var navigator_ = globalThis.navigator || {};
 
   // ../../node_modules/@probe.gl/log/node_modules/@probe.gl/env/dist/utils/globals.js
-  var VERSION2 = true ? "4.2.0-alpha.4" : "untranspiled source";
+  var VERSION2 = true ? "4.2.0-alpha.5" : "untranspiled source";
   var isBrowser4 = isBrowser3();
 
   // ../../node_modules/@probe.gl/log/dist/utils/local-storage.js
@@ -5312,7 +5314,7 @@
   _defineProperty(Ellipsoid, "WGS84", new Ellipsoid(WGS84_RADIUS_X, WGS84_RADIUS_Y, WGS84_RADIUS_Z));
 
   // ../images/src/lib/utils/version.ts
-  var VERSION3 = true ? "4.2.0-alpha.4" : "latest";
+  var VERSION3 = true ? "4.2.0-alpha.5" : "latest";
 
   // ../images/src/lib/category-api/image-type.ts
   var parseImageNode = globalThis.loaders?.parseImageNode;
@@ -5718,7 +5720,7 @@
   };
 
   // ../draco/src/lib/utils/version.ts
-  var VERSION4 = true ? "4.2.0-alpha.4" : "latest";
+  var VERSION4 = true ? "4.2.0-alpha.5" : "latest";
 
   // ../draco/src/draco-loader.ts
   var DracoLoader = {
@@ -6321,7 +6323,7 @@
   }
 
   // ../textures/src/lib/utils/version.ts
-  var VERSION5 = true ? "4.2.0-alpha.4" : "latest";
+  var VERSION5 = true ? "4.2.0-alpha.5" : "latest";
 
   // ../textures/src/lib/parsers/basis-module-loader.ts
   var BASIS_EXTERNAL_LIBRARIES = {
@@ -7483,11 +7485,7 @@
       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);
@@ -7525,18 +7523,6 @@
     }
     return await parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options);
   }
-  function getInternalPathFromUrl(url) {
-    const slpkUrlParts = url.split(".slpk");
-    let filename2;
-    if (slpkUrlParts.length === 1) {
-      filename2 = url;
-    } else if (slpkUrlParts.length === 2) {
-      filename2 = slpkUrlParts[1].slice(1);
-    } else {
-      filename2 = url;
-    }
-    return filename2;
-  }
   async function parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options) {
     const contentByteLength = arrayBuffer.byteLength;
     let attributes;
@@ -7664,11 +7650,11 @@
     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;
@@ -7866,7 +7852,7 @@
   }
 
   // src/i3s-content-loader.ts
-  var VERSION6 = true ? "4.2.0-alpha.4" : "latest";
+  var VERSION6 = true ? "4.2.0-alpha.5" : "latest";
   var I3SContentLoader = {
     name: "I3S Content (Indexed Scene Layers)",
     id: "i3s-content",

package/dist/i3s-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-loader.d.ts","sourceRoot":"","sources":["../src/i3s-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE9E,OAAO,KAAK,EAAC,gBAAgB,EAAC,mBAAgB;AAI9C,OAAO,EAAC,eAAe,EAAC,mBAAgB;AAYxC,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,gBAAgB,EAAE,KAAK,EAAE,aAAa,CAuB9E,CAAC"}
+{"version":3,"file":"i3s-loader.d.ts","sourceRoot":"","sources":["../src/i3s-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE9E,OAAO,KAAK,EAAC,gBAAgB,EAAC,mBAAgB;AAI9C,OAAO,EAAC,eAAe,EAAC,mBAAgB;AAaxC,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,gBAAgB,CAAC,gBAAgB,EAAE,KAAK,EAAE,aAAa,CAuB9E,CAAC"}

package/dist/i3s-loader.js

@@ -5,8 +5,9 @@ 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.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';
 const TILESET_REGEX = /layers\/[0-9]+$/;
+const LOCAL_SLPK_REGEX = /\.slpk$/;
 const TILE_HEADER_REGEX = /nodes\/([0-9-]+|root)$/;
 const SLPK_HEX = '504b0304';
 const POINT_CLOUD = 'PointCloud';
@@ -49,7 +50,7 @@ async function parseI3S(data, options = {}, context) {
     // auto detect file type based on 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;

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

@@ -1,6 +1,6 @@
 // __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 I3S node pages
  */

package/dist/i3s-slpk-loader.js

@@ -2,7 +2,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.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 SLPK - Scene Layer Package (Archive I3S format)
  * @todo - this reloads the entire archive for every tile, should be optimized

package/dist/index.cjs

@@ -173,11 +173,7 @@ async function parseI3STileContent(arrayBuffer, tileOptions, tilesetOptions, opt
     texture: null
   };
   if (tileOptions.textureUrl) {
-    const url = getUrlWithToken(
-      getInternalPathFromUrl(tileOptions.textureUrl),
-      // @ts-expect-error options is not properly typed
-      (_a = options == null ? void 0 : options.i3s) == null ? void 0 : _a.token
-    );
+    const url = getUrlWithToken(tileOptions.textureUrl, (_a = options == null ? void 0 : options.i3s) == null ? void 0 : _a.token);
     const loader = getLoaderForTextureFormat(tileOptions.textureFormat);
     const fetchFunc = (context == null ? void 0 : context.fetch) || fetch;
     const response = await fetchFunc(url);
@@ -215,18 +211,6 @@ async function parseI3STileContent(arrayBuffer, tileOptions, tilesetOptions, opt
   }
   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) {
   var _a, _b;
   const contentByteLength = arrayBuffer.byteLength;
@@ -331,11 +315,11 @@ function parseHeaders(arrayBuffer, options) {
   for (const { property, type } of options.store.defaultGeometrySchema.header) {
     const TypedArrayTypeHeader = getConstructorForDataFormat(type);
     switch (property) {
-      case HeaderAttributeProperty.vertexCount:
+      case HeaderAttributeProperty.vertexCount.toString():
         vertexCount = new TypedArrayTypeHeader(arrayBuffer, 0, 4)[0];
         byteOffset += sizeOf(type);
         break;
-      case HeaderAttributeProperty.featureCount:
+      case HeaderAttributeProperty.featureCount.toString():
         featureCount = new TypedArrayTypeHeader(arrayBuffer, 4, 4)[0];
         byteOffset += sizeOf(type);
         break;
@@ -533,7 +517,7 @@ function getFeatureIdsFromFeatureIndexMetadata(featureIndex) {
 }
 
 // dist/i3s-content-loader.js
-var VERSION = true ? "4.2.0-alpha.4" : "latest";
+var VERSION = true ? "4.2.0-alpha.5" : "latest";
 var I3SContentLoader = {
   name: "I3S Content (Indexed Scene Layers)",
   id: "i3s-content",
@@ -568,7 +552,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.2.0-alpha.4" : "latest";
+var VERSION2 = true ? "4.2.0-alpha.5" : "latest";
 var I3SNodePageLoader = {
   name: "I3S Node Page",
   id: "i3s-node-page",
@@ -587,6 +571,16 @@ async function parseNodePage(data, options) {
 
 // dist/lib/helpers/i3s-nodepages-tiles.js
 var I3SNodePagesTiles = class {
+  tileset;
+  nodePages = [];
+  pendingNodePages = [];
+  nodesPerPage;
+  options;
+  lodSelectionMetricType;
+  textureDefinitionsSelectedFormats = [];
+  nodesInNodePages;
+  url;
+  textureLoaderOptions = {};
   /**
    * @constructs
    * Create a I3SNodePagesTiles instance.
@@ -596,10 +590,6 @@ var I3SNodePagesTiles = class {
    */
   constructor(tileset, url = "", options) {
     var _a, _b;
-    this.nodePages = [];
-    this.pendingNodePages = [];
-    this.textureDefinitionsSelectedFormats = [];
-    this.textureLoaderOptions = {};
     this.tileset = { ...tileset };
     this.url = url;
     this.nodesPerPage = ((_a = tileset.nodePages) == null ? void 0 : _a.nodesPerPage) || 64;
@@ -617,7 +607,7 @@ var I3SNodePagesTiles = class {
     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
         (_a = this.options.i3s) == null ? void 0 : _a.token
       );
@@ -906,8 +896,9 @@ async function normalizeTilesetData(tileset, options, context) {
 }
 
 // dist/i3s-loader.js
-var VERSION3 = true ? "4.2.0-alpha.4" : "latest";
+var VERSION3 = true ? "4.2.0-alpha.5" : "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";
@@ -945,7 +936,7 @@ async function parseI3S(data, options = {}, context) {
   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;
   }
@@ -1031,6 +1022,11 @@ var PATH_DESCRIPTIONS = [
   }
 ];
 var SLPKArchive = class extends import_zip.IndexedArchive {
+  // Maps hex-encoded md5 filename hashes to bigint offsets into the archive
+  hashTable;
+  _textEncoder = new TextEncoder();
+  _textDecoder = new TextDecoder();
+  _md5Hash = new import_crypto.MD5Hash();
   /**
    * Constructor
    * @param fileProvider - instance of a binary data reader
@@ -1039,9 +1035,6 @@ var SLPKArchive = class extends import_zip.IndexedArchive {
    */
   constructor(fileProvider, hashTable, fileName) {
     super(fileProvider, hashTable, fileName);
-    this._textEncoder = new TextEncoder();
-    this._textDecoder = new TextDecoder();
-    this._md5Hash = new import_crypto.MD5Hash();
     this.hashTable = hashTable;
   }
   /**
@@ -1150,7 +1143,7 @@ async function parseSLPKArchive(fileProvider, cb, fileName) {
 }
 
 // dist/i3s-slpk-loader.js
-var VERSION4 = true ? "4.2.0-alpha.4" : "latest";
+var VERSION4 = true ? "4.2.0-alpha.5" : "latest";
 var SLPKLoader = {
   name: "I3S SLPK (Scene Layer Package)",
   id: "slpk",
@@ -1227,7 +1220,7 @@ function parseStringsAttribute(arrayBuffer) {
 }
 
 // dist/i3s-attribute-loader.js
-var VERSION5 = true ? "4.2.0-alpha.4" : "latest";
+var VERSION5 = true ? "4.2.0-alpha.5" : "latest";
 var EMPTY_VALUE = "";
 var REJECTED_STATUS = "rejected";
 var I3SAttributeLoader = {
@@ -1365,7 +1358,7 @@ function parseSublayersTree(sublayers, url) {
 }
 
 // dist/i3s-building-scene-layer-loader.js
-var VERSION6 = true ? "4.2.0-alpha.4" : "latest";
+var VERSION6 = true ? "4.2.0-alpha.5" : "latest";
 var I3SBuildingSceneLayerLoader = {
   name: "I3S Building Scene Layer",
   id: "i3s-building-scene-layer",
@@ -1399,6 +1392,7 @@ var SUPPORTED_LAYERS_TYPES = [
 var NO_AVAILABLE_SUPPORTED_LAYERS_ERROR = "NO_AVAILABLE_SUPPORTED_LAYERS_ERROR";
 var NOT_SUPPORTED_CRS_ERROR = "NOT_SUPPORTED_CRS_ERROR";
 var LayerError = class extends Error {
+  details;
   constructor(message, details) {
     super(message);
     this.details = details;
@@ -1456,7 +1450,7 @@ async function checkSupportedIndexCRS(layer) {
 }
 
 // dist/arcgis-webscene-loader.js
-var VERSION7 = true ? "4.2.0-alpha.4" : "latest";
+var VERSION7 = true ? "4.2.0-alpha.5" : "latest";
 var ArcGISWebSceneLoader = {
   name: "ArcGIS Web Scene Loader",
   id: "arcgis-web-scene",