@loaders.gl/i3s 4.4.0-alpha.2 → 4.4.0-alpha.9

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

@@ -91,15 +91,18 @@ export async function normalizeTilesetData(tileset : SceneLayer3D, options : Loa
     nodePagesTile = new I3SNodePagesTiles(tileset, url, options);
     root = await nodePagesTile.formTileFromNodePages(0);
   } else {
-    const parseOptions = options.i3s as I3SParseOptions;
+    const parseOptions =
+      (options.i3s && typeof options.i3s === 'object' ? options.i3s : {}) as I3SParseOptions;
     const rootNodeUrl = getUrlWithToken(`${url}/nodes/root`, parseOptions.token);
     // eslint-disable-next-line no-use-before-define
     root = await load(rootNodeUrl, I3SLoader, {
       ...options,
       i3s: {
-        // @ts-expect-error options is not properly typed
-        ...options.i3s,
-        loadContent: false, isTileHeader: true, isTileset: false}
+        ...parseOptions,
+        loadContent: false,
+        isTileHeader: true,
+        isTileset: false
+      }
     });
   }
 

package/src/lib/parsers/parse-slpk/parse-slpk.ts

@@ -1,22 +1,23 @@
-import {FileProviderInterface} from '@loaders.gl/loader-utils';
+import type {ReadableFile} from '@loaders.gl/loader-utils';
 import {
   parseZipCDFileHeader,
   CD_HEADER_SIGNATURE,
   parseZipLocalFileHeader,
   searchFromTheEnd,
   parseHashTable,
-  makeHashTableFromZipHeaders
+  makeHashTableFromZipHeaders,
+  readRange
 } from '@loaders.gl/zip';
 import {SLPKArchive} from './slpk-archieve';
 
 /**
  * Creates slpk file handler from raw file
- * @param fileProvider raw file data
+ * @param fileProvider raw readable file data
  * @param cb is called with information message during parsing
  * @returns slpk file handler
  */
 export async function parseSLPKArchive(
-  fileProvider: FileProviderInterface,
+  fileProvider: ReadableFile,
   cb?: (msg: string) => void,
   fileName?: string
 ): Promise<SLPKArchive> {
@@ -41,7 +42,8 @@ export async function parseSLPKArchive(
     }
 
     const fileDataOffset = localFileHeader.fileDataOffset;
-    const hashFile = await fileProvider.slice(
+    const hashFile = await readRange(
+      fileProvider,
       fileDataOffset,
       fileDataOffset + localFileHeader.compressedSize
     );

package/src/lib/parsers/parse-slpk/slpk-archieve.ts

@@ -1,6 +1,6 @@
 import {MD5Hash} from '@loaders.gl/crypto';
-import {FileProviderInterface} from '@loaders.gl/loader-utils';
-import {IndexedArchive, parseZipLocalFileHeader} from '@loaders.gl/zip';
+import type {ReadableFile} from '@loaders.gl/loader-utils';
+import {IndexedArchive, parseZipLocalFileHeader, readRange} from '@loaders.gl/zip';
 import {GZipCompression} from '@loaders.gl/compression';
 
 /** Description of real paths for different file types */
@@ -56,15 +56,11 @@ export class SLPKArchive extends IndexedArchive {
 
   /**
    * Constructor
-   * @param fileProvider - instance of a binary data reader
+   * @param fileProvider - readable file handle for random access
    * @param hashTable - pre-loaded hashTable. If presented, getFile will skip reading the hash file
    * @param fileName - name of the archive. It is used to add to an URL of a loader context
    */
-  constructor(
-    fileProvider: FileProviderInterface,
-    hashTable?: Record<string, bigint>,
-    fileName?: string
-  ) {
+  constructor(fileProvider: ReadableFile, hashTable?: Record<string, bigint>, fileName?: string) {
     super(fileProvider, hashTable, fileName);
     this.hashTable = hashTable;
   }
@@ -145,12 +141,13 @@ export class SLPKArchive extends IndexedArchive {
         return undefined;
       }
 
-      const localFileHeader = await parseZipLocalFileHeader(offset, this.fileProvider);
+      const localFileHeader = await parseZipLocalFileHeader(offset, this.file);
       if (!localFileHeader) {
         return undefined;
       }
 
-      compressedFile = await this.fileProvider.slice(
+      compressedFile = await readRange(
+        this.file,
         localFileHeader.fileDataOffset,
         localFileHeader.fileDataOffset + localFileHeader.compressedSize
       );

package/src/lib/utils/customize-colors.ts

@@ -161,8 +161,10 @@ async function loadFeatureAttributeData(
   const objectIdAttributeUrl = getUrlWithToken(attributeUrls[attributeIndex], token);
   const attributeType = getAttributeValueType(attributeStorageInfo[attributeIndex]);
   const objectIdAttributeData = await load(objectIdAttributeUrl, I3SAttributeLoader, {
-    attributeName,
-    attributeType
+    i3s: {
+      attributeName,
+      attributeType
+    }
   });
 
   return objectIdAttributeData;