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

package/dist/lib/parsers/parse-i3s-tile-content.js

@@ -35,9 +35,8 @@ export async function parseI3STileContent(arrayBuffer, tileOptions, tilesetOptio
         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); // options?.fetch
@@ -51,7 +50,6 @@ export async function parseI3STileContent(arrayBuffer, tileOptions, tilesetOptio
                     // Image constructor is not supported in worker thread.
                     // Do parsing image data on the main thread by using context to avoid worker issues.
                     const texture = await parseFromContext(arrayBuffer, [], options, context);
-                    // @ts-expect-error
                     content.texture = texture;
                 }
                 catch (e) {
@@ -85,26 +83,6 @@ export async function parseI3STileContent(arrayBuffer, tileOptions, tilesetOptio
     }
     return await parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options);
 }
-/**
- * Get the URL inside SLPK archive
- * @param url - full url with *.slpk prefix
- * @returns URL inside SLPK archive
- */
-function getInternalPathFromUrl(url) {
-    const slpkUrlParts = url.split('.slpk');
-    let filename;
-    // Not '.slpk'. The file will be loaded with global fetch function
-    if (slpkUrlParts.length === 1) {
-        filename = url;
-    }
-    else if (slpkUrlParts.length === 2) {
-        filename = slpkUrlParts[1].slice(1);
-    }
-    else {
-        filename = url;
-    }
-    return filename;
-}
 /* eslint-disable max-statements */
 async function parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options) {
     const contentByteLength = arrayBuffer.byteLength;
@@ -233,11 +211,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;

package/dist/lib/parsers/parse-slpk/slpk-archieve.js

@@ -40,6 +40,11 @@ const PATH_DESCRIPTIONS = [
  * Class for handling information about slpk file
  */
 export class SLPKArchive 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
@@ -48,9 +53,6 @@ export class SLPKArchive extends IndexedArchive {
      */
     constructor(fileProvider, hashTable, fileName) {
         super(fileProvider, hashTable, fileName);
-        this._textEncoder = new TextEncoder();
-        this._textDecoder = new TextDecoder();
-        this._md5Hash = new MD5Hash();
         this.hashTable = hashTable;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-beta.1",
   "description": "i3s .",
   "license": "MIT",
   "type": "module",
@@ -42,14 +42,16 @@
     "build-worker-node": "esbuild src/workers/i3s-content-worker-node.ts --outfile=dist/i3s-content-worker-node.js --platform=node --target=node16 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.2.0-alpha.5",
-    "@loaders.gl/crypto": "4.2.0-alpha.5",
-    "@loaders.gl/draco": "4.2.0-alpha.5",
-    "@loaders.gl/images": "4.2.0-alpha.5",
-    "@loaders.gl/loader-utils": "4.2.0-alpha.5",
-    "@loaders.gl/schema": "4.2.0-alpha.5",
-    "@loaders.gl/textures": "4.2.0-alpha.5",
-    "@loaders.gl/tiles": "4.2.0-alpha.5",
+    "@loaders.gl/compression": "4.2.0-beta.1",
+    "@loaders.gl/crypto": "4.2.0-beta.1",
+    "@loaders.gl/draco": "4.2.0-beta.1",
+    "@loaders.gl/images": "4.2.0-beta.1",
+    "@loaders.gl/loader-utils": "4.2.0-beta.1",
+    "@loaders.gl/math": "4.2.0-beta.1",
+    "@loaders.gl/schema": "4.2.0-beta.1",
+    "@loaders.gl/textures": "4.2.0-beta.1",
+    "@loaders.gl/tiles": "4.2.0-beta.1",
+    "@loaders.gl/zip": "4.2.0-beta.1",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geospatial": "^4.0.0"
@@ -57,5 +59,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "32d95a81971f104e4dfeb88ab57065f05321a76a"
+  "gitHead": "c386a9196516fe3ff24847b40e6c77be039cf905"
 }

package/src/arcgis-webscene-loader.ts

@@ -13,11 +13,9 @@ export type ArcGISWebSceneLoaderOptions = LoaderOptions & {};
  * Loader for ArcGIS WebScene
  * Spec - https://developers.arcgis.com/web-scene-specification/objects/webscene/
  */
-export const ArcGISWebSceneLoader: LoaderWithParser<
-  ArcGISWebSceneData,
-  never,
-  ArcGISWebSceneLoaderOptions
-> = {
+export const ArcGISWebSceneLoader = {
+  dataType: null as unknown as ArcGISWebSceneData,
+  batchType: null as never,
   name: 'ArcGIS Web Scene Loader',
   id: 'arcgis-web-scene',
   module: 'i3s',
@@ -26,7 +24,7 @@ export const ArcGISWebSceneLoader: LoaderWithParser<
   parse,
   extensions: ['json'],
   options: {}
-};
+} as const satisfies LoaderWithParser<ArcGISWebSceneData, never, ArcGISWebSceneLoaderOptions>;
 
 /**
  * Parse ArcGIS webscene

package/src/i3s-attribute-loader.ts

@@ -14,7 +14,9 @@ const REJECTED_STATUS = 'rejected';
 /**
  * Loader for I3S attributes
  */
-export const I3SAttributeLoader: LoaderWithParser<I3STileAttributes, never, I3SLoaderOptions> = {
+export const I3SAttributeLoader = {
+  dataType: null as unknown as I3STileAttributes,
+  batchType: null as never,
   name: 'I3S Attribute',
   id: 'i3s-attribute',
   module: 'i3s',
@@ -24,7 +26,7 @@ export const I3SAttributeLoader: LoaderWithParser<I3STileAttributes, never, I3SL
   extensions: ['bin'],
   options: {},
   binary: true
-};
+} as const satisfies LoaderWithParser<I3STileAttributes, never, I3SLoaderOptions>;
 
 
 // TODO - these seem to use the loader rather than being part of the loader. Move to different file...

package/src/i3s-building-scene-layer-loader.ts

@@ -8,14 +8,14 @@ import {parseBuildingSceneLayer} from './lib/parsers/parse-i3s-building-scene-la
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
 
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+
 /**
  * Loader for I3S - Building Scene Layer
  */
-export const I3SBuildingSceneLayerLoader: LoaderWithParser<
-  BuildingSceneLayerTileset,
-  never,
-  I3SLoaderOptions
-> = {
+export const I3SBuildingSceneLayerLoader = {
+  dataType: null as unknown as BuildingSceneLayerTileset,
+  batchType: null as never,
+
   name: 'I3S Building Scene Layer',
   id: 'i3s-building-scene-layer',
   module: 'i3s',
@@ -24,7 +24,7 @@ export const I3SBuildingSceneLayerLoader: LoaderWithParser<
   parse,
   extensions: ['json'],
   options: {}
-};
+} as const satisfies LoaderWithParser<BuildingSceneLayerTileset, never, I3SLoaderOptions>;
 
 async function parse(
   data: ArrayBuffer,

package/src/i3s-content-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderWithParser, LoaderContext} from '@loaders.gl/loader-utils';
 import type {I3SLoaderOptions} from './i3s-loader';
 import {parseI3STileContent} from './lib/parsers/parse-i3s-tile-content';
@@ -11,7 +15,10 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 /**
  * Loader for I3S - Indexed 3D Scene Layer
  */
-export const I3SContentLoader: LoaderWithParser<I3STileContent | null, never, I3SLoaderOptions> = {
+export const I3SContentLoader = {
+  dataType: null as unknown as I3STileContent | null,
+  batchType: null as never,
+
   name: 'I3S Content (Indexed Scene Layers)',
   id: 'i3s-content',
   module: 'i3s',
@@ -23,7 +30,7 @@ export const I3SContentLoader: LoaderWithParser<I3STileContent | null, never, I3
   options: {
     'i3s-content': {}
   }
-};
+} as const satisfies LoaderWithParser<I3STileContent | null, never, I3SLoaderOptions>;
 
 async function parse(data, options?: I3SLoaderOptions, context?: LoaderContext) {
   const {tile, _tileOptions, tileset, _tilesetOptions} = options?.i3s || {};

package/src/i3s-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
 import {parse} from '@loaders.gl/core';
 import type {I3STilesetHeader} from './types';
@@ -12,6 +16,7 @@ import {getUrlWithoutParams} from './lib/utils/url-utils';
 const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : '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';
@@ -23,7 +28,10 @@ export type I3SLoaderOptions = LoaderOptions & {
 /**
  * Loader for I3S - Indexed 3D Scene Layer
  */
-export const I3SLoader: LoaderWithParser<I3STilesetHeader, never, LoaderOptions> = {
+export const I3SLoader = {
+  dataType: null as unknown as I3STilesetHeader,
+  batchType: null as never,
+
   name: 'I3S (Indexed Scene Layers)',
   id: 'i3s',
   module: 'i3s',
@@ -46,7 +54,7 @@ export const I3SLoader: LoaderWithParser<I3STilesetHeader, never, LoaderOptions>
       coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS
     }
   }
-};
+} as const satisfies LoaderWithParser<I3STilesetHeader, never, LoaderOptions>;
 
 async function parseI3S(data, options: I3SLoaderOptions = {}, context): Promise<I3STilesetHeader> {
   const url = context.url;
@@ -63,7 +71,7 @@ async function parseI3S(data, options: I3SLoaderOptions = {}, context): Promise<
   // 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/src/i3s-node-page-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import type {I3SLoaderOptions} from './i3s-loader';
 import type {NodePage} from './types';
@@ -9,7 +13,10 @@ const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
 /**
  * Loader for I3S node pages
  */
-export const I3SNodePageLoader: LoaderWithParser<NodePage, never, I3SLoaderOptions> = {
+export const I3SNodePageLoader = {
+  dataType: null as unknown as NodePage,
+  batchType: null as never,
+
   name: 'I3S Node Page',
   id: 'i3s-node-page',
   module: 'i3s',
@@ -20,7 +27,7 @@ export const I3SNodePageLoader: LoaderWithParser<NodePage, never, I3SLoaderOptio
   options: {
     i3s: {}
   }
-};
+} as const satisfies LoaderWithParser<NodePage, never, I3SLoaderOptions>;
 
 async function parseNodePage(data: ArrayBuffer, options?: LoaderOptions): Promise<NodePage> {
   return JSON.parse(new TextDecoder().decode(data)) as NodePage;

package/src/i3s-slpk-loader.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import type {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import {DataViewFile} from '@loaders.gl/loader-utils';
 import {parseSLPKArchive} from './lib/parsers/parse-slpk/parse-slpk';
@@ -21,7 +25,10 @@ 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 const SLPKLoader: LoaderWithParser<ArrayBuffer, never, SLPKLoaderOptions> = {
+export const SLPKLoader = {
+  dataType: null as unknown as ArrayBuffer,
+  batchType: null as never,
+
   name: 'I3S SLPK (Scene Layer Package)',
   id: 'slpk',
   module: 'i3s',
@@ -33,4 +40,4 @@ export const SLPKLoader: LoaderWithParser<ArrayBuffer, never, SLPKLoaderOptions>
     const archive = await parseSLPKArchive(new DataViewFile(new DataView(data)));
     return archive.getFile(options.slpk?.path ?? '', options.slpk?.pathMode);
   }
-};
+} as const satisfies LoaderWithParser<ArrayBuffer, never, SLPKLoaderOptions>;

package/src/lib/helpers/i3s-nodepages-tiles.ts

@@ -58,9 +58,7 @@ export default class I3SNodePagesTiles {
     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
       );

package/src/lib/parsers/parse-i3s-tile-content.ts

@@ -61,11 +61,8 @@ export async function parseI3STileContent(
   };
 
   if (tileOptions.textureUrl) {
-    const url = getUrlWithToken(
-      getInternalPathFromUrl(tileOptions.textureUrl),
-      // @ts-expect-error options is not properly typed
-      options?.i3s?.token
-    );
+    // @ts-expect-error options is not properly typed
+    const url = getUrlWithToken(tileOptions.textureUrl, options?.i3s?.token);
     const loader = getLoaderForTextureFormat(tileOptions.textureFormat);
     const fetchFunc = context?.fetch || fetch;
     const response = await fetchFunc(url); // options?.fetch
@@ -79,17 +76,16 @@ export async function parseI3STileContent(
         try {
           // Image constructor is not supported in worker thread.
           // Do parsing image data on the main thread by using context to avoid worker issues.
-          const texture = await parseFromContext(arrayBuffer, [], options, context!);
-          // @ts-expect-error
+          const texture: any = await parseFromContext(arrayBuffer, [], options, context!);
           content.texture = texture;
         } catch (e) {
           // context object is different between worker and node.js conversion script.
           // To prevent error we parse data in ordinary way if it is not parsed by using context.
-          const texture = await parse(arrayBuffer, loader, options, context);
+          const texture: any = await parse(arrayBuffer, loader, options, context);
           content.texture = texture;
         }
       } else if (loader === CompressedTextureLoader || loader === BasisLoader) {
-        let texture = await load(arrayBuffer, loader, tileOptions.textureLoaderOptions);
+        let texture: any = await load(arrayBuffer, loader, tileOptions.textureLoaderOptions);
         if (loader === BasisLoader) {
           texture = texture[0];
         }
@@ -114,25 +110,6 @@ export async function parseI3STileContent(
   return await parseI3SNodeGeometry(arrayBuffer, content, tileOptions, tilesetOptions, options);
 }
 
-/**
- * Get the URL inside SLPK archive
- * @param url - full url with *.slpk prefix
- * @returns URL inside SLPK archive
- */
-function getInternalPathFromUrl(url: string): string {
-  const slpkUrlParts = url.split('.slpk');
-  let filename: string | null;
-  // Not '.slpk'. The file will be loaded with global fetch function
-  if (slpkUrlParts.length === 1) {
-    filename = url;
-  } else if (slpkUrlParts.length === 2) {
-    filename = slpkUrlParts[1].slice(1);
-  } else {
-    filename = url;
-  }
-  return filename;
-}
-
 /* eslint-disable max-statements */
 async function parseI3SNodeGeometry(
   arrayBuffer: ArrayBuffer,
@@ -315,11 +292,11 @@ function parseHeaders(arrayBuffer: ArrayBuffer, options: I3STilesetOptions) {
   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;