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

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
@@ -85,26 +84,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 +212,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-alpha.6",
   "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-alpha.6",
+    "@loaders.gl/crypto": "4.2.0-alpha.6",
+    "@loaders.gl/draco": "4.2.0-alpha.6",
+    "@loaders.gl/images": "4.2.0-alpha.6",
+    "@loaders.gl/loader-utils": "4.2.0-alpha.6",
+    "@loaders.gl/math": "4.2.0-alpha.6",
+    "@loaders.gl/schema": "4.2.0-alpha.6",
+    "@loaders.gl/textures": "4.2.0-alpha.6",
+    "@loaders.gl/tiles": "4.2.0-alpha.6",
+    "@loaders.gl/zip": "4.2.0-alpha.6",
     "@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": "37bd8ca71763529f18727ee4bf29dd176aa914ca"
 }

package/src/i3s-loader.ts

@@ -12,6 +12,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';
@@ -63,7 +64,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/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
@@ -114,25 +111,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 +293,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;