@loaders.gl/i3s 4.2.0-alpha.5 → 4.2.0-beta.1

package/dist/i3s-loader.d.ts

@@ -1,5 +1,6 @@
-import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
 import type { I3STilesetHeader } from "./types.js";
+import { COORDINATE_SYSTEM } from "./lib/parsers/constants.js";
 import { I3SParseOptions } from "./types.js";
 export type I3SLoaderOptions = LoaderOptions & {
     i3s?: I3SParseOptions;
@@ -7,5 +8,32 @@ export type I3SLoaderOptions = LoaderOptions & {
 /**
  * Loader for I3S - Indexed 3D Scene Layer
  */
-export declare const I3SLoader: LoaderWithParser<I3STilesetHeader, never, LoaderOptions>;
+export declare const I3SLoader: {
+    readonly dataType: I3STilesetHeader;
+    readonly batchType: never;
+    readonly name: "I3S (Indexed Scene Layers)";
+    readonly id: "i3s";
+    readonly module: "i3s";
+    readonly version: any;
+    readonly mimeTypes: ["application/octet-stream"];
+    readonly parse: typeof parseI3S;
+    readonly extensions: ["bin"];
+    readonly options: {
+        readonly i3s: {
+            readonly token: null;
+            readonly isTileset: "auto";
+            readonly isTileHeader: "auto";
+            readonly tile: null;
+            readonly tileset: null;
+            readonly _tileOptions: null;
+            readonly _tilesetOptions: null;
+            readonly useDracoGeometry: true;
+            readonly useCompressedTextures: true;
+            readonly decodeTextures: true;
+            readonly coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS;
+        };
+    };
+};
+declare function parseI3S(data: any, options: I3SLoaderOptions | undefined, context: any): Promise<I3STilesetHeader>;
+export {};
 //# sourceMappingURL=i3s-loader.d.ts.map

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":"AAIA,OAAO,KAAK,EAAmB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAE9E,OAAO,KAAK,EAAC,gBAAgB,EAAC,mBAAgB;AAG9C,OAAO,EAAC,iBAAiB,EAAC,mCAAgC;AAC1D,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;;;;;;;;;;;;;;;;;;;;;;;;;CA0BuD,CAAC;AAE9E,iBAAe,QAAQ,CAAC,IAAI,KAAA,EAAE,OAAO,8BAAuB,EAAE,OAAO,KAAA,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAoChG"}

package/dist/i3s-loader.js

@@ -1,3 +1,6 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 import { parse } from '@loaders.gl/core';
 import { I3SContentLoader } from "./i3s-content-loader.js";
 import { normalizeTileData, normalizeTilesetData } from "./lib/parsers/parse-i3s.js";
@@ -5,8 +8,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.6" !== 'undefined' ? "4.2.0-alpha.6" : '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';
@@ -14,6 +18,8 @@ const POINT_CLOUD = 'PointCloud';
  * Loader for I3S - Indexed 3D Scene Layer
  */
 export const I3SLoader = {
+    dataType: null,
+    batchType: null,
     name: 'I3S (Indexed Scene Layers)',
     id: 'i3s',
     module: 'i3s',
@@ -49,7 +55,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.d.ts

@@ -1,8 +1,22 @@
-import type { LoaderWithParser } from '@loaders.gl/loader-utils';
-import type { I3SLoaderOptions } from "./i3s-loader.js";
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
 import type { NodePage } from "./types.js";
 /**
  * Loader for I3S node pages
  */
-export declare const I3SNodePageLoader: LoaderWithParser<NodePage, never, I3SLoaderOptions>;
+export declare const I3SNodePageLoader: {
+    readonly dataType: NodePage;
+    readonly batchType: never;
+    readonly name: "I3S Node Page";
+    readonly id: "i3s-node-page";
+    readonly module: "i3s";
+    readonly version: any;
+    readonly mimeTypes: ["application/json"];
+    readonly parse: typeof parseNodePage;
+    readonly extensions: ["json"];
+    readonly options: {
+        readonly i3s: {};
+    };
+};
+declare function parseNodePage(data: ArrayBuffer, options?: LoaderOptions): Promise<NodePage>;
+export {};
 //# sourceMappingURL=i3s-node-page-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i3s-node-page-loader.d.ts","sourceRoot":"","sources":["../src/i3s-node-page-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,KAAK,EAAC,gBAAgB,EAAC,wBAAqB;AACnD,OAAO,KAAK,EAAC,QAAQ,EAAC,mBAAgB;AAMtC;;GAEG;AACH,eAAO,MAAM,iBAAiB,EAAE,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,gBAAgB,CAWjF,CAAC"}
+{"version":3,"file":"i3s-node-page-loader.d.ts","sourceRoot":"","sources":["../src/i3s-node-page-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAmB,MAAM,0BAA0B,CAAC;AAE9E,OAAO,KAAK,EAAC,QAAQ,EAAC,mBAAgB;AAMtC;;GAEG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;CAc0C,CAAC;AAEzE,iBAAe,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,CAE1F"}

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

@@ -1,10 +1,15 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 // __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.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
  * Loader for I3S node pages
  */
 export const I3SNodePageLoader = {
+    dataType: null,
+    batchType: null,
     name: 'I3S Node Page',
     id: 'i3s-node-page',
     module: 'i3s',

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

@@ -1,4 +1,4 @@
-import type { LoaderOptions, LoaderWithParser } from '@loaders.gl/loader-utils';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
 /** options to load data from SLPK */
 export type SLPKLoaderOptions = LoaderOptions & {
     slpk?: {
@@ -13,5 +13,16 @@ export type SLPKLoaderOptions = LoaderOptions & {
  * @todo - this reloads the entire archive for every tile, should be optimized
  * @todo - this should be updated to use `parseFile` and ReadableFile
  */
-export declare const SLPKLoader: LoaderWithParser<ArrayBuffer, never, SLPKLoaderOptions>;
+export declare const SLPKLoader: {
+    readonly dataType: ArrayBuffer;
+    readonly batchType: never;
+    readonly name: "I3S SLPK (Scene Layer Package)";
+    readonly id: "slpk";
+    readonly module: "i3s";
+    readonly version: any;
+    readonly mimeTypes: ["application/octet-stream"];
+    readonly extensions: ["slpk"];
+    readonly options: {};
+    readonly parse: (data: ArrayBuffer, options?: SLPKLoaderOptions) => Promise<ArrayBuffer>;
+};
 //# sourceMappingURL=i3s-slpk-loader.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"i3s-slpk-loader.d.ts","sourceRoot":"","sources":["../src/i3s-slpk-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAQ9E,qCAAqC;AACrC,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE;QACL,mCAAmC;QACnC,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,uBAAuB;QACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,EAAE,gBAAgB,CAAC,WAAW,EAAE,KAAK,EAAE,iBAAiB,CAY9E,CAAC"}
+{"version":3,"file":"i3s-slpk-loader.d.ts","sourceRoot":"","sources":["../src/i3s-slpk-loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,aAAa,EAAmB,MAAM,0BAA0B,CAAC;AAQ9E,qCAAqC;AACrC,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAC9C,IAAI,CAAC,EAAE;QACL,mCAAmC;QACnC,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,uBAAuB;QACvB,QAAQ,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;2BAWD,WAAW,YAAW,iBAAiB,KAAQ,QAAQ,WAAW,CAAC;CAIb,CAAC"}

package/dist/i3s-slpk-loader.js

@@ -1,14 +1,19 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
 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.6" !== 'undefined' ? "4.2.0-alpha.6" : 'latest';
 /**
  * Loader for SLPK - Scene Layer Package (Archive I3S format)
  * @todo - this reloads the entire archive for every tile, should be optimized
  * @todo - this should be updated to use `parseFile` and ReadableFile
  */
 export const SLPKLoader = {
+    dataType: null,
+    batchType: null,
     name: 'I3S SLPK (Scene Layer Package)',
     id: 'slpk',
     module: 'i3s',

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,8 +517,10 @@ function getFeatureIdsFromFeatureIndexMetadata(featureIndex) {
 }
 
 // dist/i3s-content-loader.js
-var VERSION = true ? "4.2.0-alpha.4" : "latest";
+var VERSION = true ? "4.2.0-alpha.6" : "latest";
 var I3SContentLoader = {
+  dataType: null,
+  batchType: null,
   name: "I3S Content (Indexed Scene Layers)",
   id: "i3s-content",
   module: "i3s",
@@ -568,8 +554,10 @@ 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.6" : "latest";
 var I3SNodePageLoader = {
+  dataType: null,
+  batchType: null,
   name: "I3S Node Page",
   id: "i3s-node-page",
   module: "i3s",
@@ -587,6 +575,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 +594,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 +611,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,12 +900,15 @@ 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.6" : "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";
 var I3SLoader = {
+  dataType: null,
+  batchType: null,
   name: "I3S (Indexed Scene Layers)",
   id: "i3s",
   module: "i3s",
@@ -945,7 +942,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 +1028,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 +1041,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,8 +1149,10 @@ 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.6" : "latest";
 var SLPKLoader = {
+  dataType: null,
+  batchType: null,
   name: "I3S SLPK (Scene Layer Package)",
   id: "slpk",
   module: "i3s",
@@ -1227,10 +1228,12 @@ function parseStringsAttribute(arrayBuffer) {
 }
 
 // dist/i3s-attribute-loader.js
-var VERSION5 = true ? "4.2.0-alpha.4" : "latest";
+var VERSION5 = true ? "4.2.0-alpha.6" : "latest";
 var EMPTY_VALUE = "";
 var REJECTED_STATUS = "rejected";
 var I3SAttributeLoader = {
+  dataType: null,
+  batchType: null,
   name: "I3S Attribute",
   id: "i3s-attribute",
   module: "i3s",
@@ -1365,8 +1368,10 @@ 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.6" : "latest";
 var I3SBuildingSceneLayerLoader = {
+  dataType: null,
+  batchType: null,
   name: "I3S Building Scene Layer",
   id: "i3s-building-scene-layer",
   module: "i3s",
@@ -1399,6 +1404,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,8 +1462,10 @@ 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.6" : "latest";
 var ArcGISWebSceneLoader = {
+  dataType: null,
+  batchType: null,
   name: "ArcGIS Web Scene Loader",
   id: "arcgis-web-scene",
   module: "i3s",