@loaders.gl/i3s 4.2.0-alpha.4 → 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
@@ -2031,7 +2033,9 @@
   function getGlobalLoaderState() {
     globalThis.loaders = globalThis.loaders || {};
     const { loaders } = globalThis;
-    loaders._state = loaders._state || {};
+    if (!loaders._state) {
+      loaders._state = {};
+    }
     return loaders._state;
   }
   function getGlobalLoaderOptions() {
@@ -5310,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;
@@ -5716,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 = {
@@ -6319,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 = {
@@ -7481,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);
@@ -7523,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;
@@ -7662,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;
@@ -7864,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

@@ -1,6 +1,6 @@
 import type { LoaderWithParser, LoaderOptions } from '@loaders.gl/loader-utils';
-import type { I3STilesetHeader } from './types';
-import { I3SParseOptions } from './types';
+import type { I3STilesetHeader } from "./types.js";
+import { I3SParseOptions } from "./types.js";
 export type I3SLoaderOptions = LoaderOptions & {
     i3s?: I3SParseOptions;
 };

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,MAAM,SAAS,CAAC;AAI9C,OAAO,EAAC,eAAe,EAAC,MAAM,SAAS,CAAC;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

@@ -3,85 +3,97 @@ import { I3SContentLoader } from "./i3s-content-loader.js";
 import { normalizeTileData, normalizeTilesetData } from "./lib/parsers/parse-i3s.js";
 import { COORDINATE_SYSTEM } from "./lib/parsers/constants.js";
 import { getUrlWithoutParams } from "./lib/utils/url-utils.js";
-const VERSION = typeof "4.2.0-alpha.4" !== 'undefined' ? "4.2.0-alpha.4" : 'latest';
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+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';
+/**
+ * Loader for I3S - Indexed 3D Scene Layer
+ */
 export const I3SLoader = {
-  name: 'I3S (Indexed Scene Layers)',
-  id: 'i3s',
-  module: 'i3s',
-  version: VERSION,
-  mimeTypes: ['application/octet-stream'],
-  parse: parseI3S,
-  extensions: ['bin'],
-  options: {
-    i3s: {
-      token: null,
-      isTileset: 'auto',
-      isTileHeader: 'auto',
-      tile: null,
-      tileset: null,
-      _tileOptions: null,
-      _tilesetOptions: null,
-      useDracoGeometry: true,
-      useCompressedTextures: true,
-      decodeTextures: true,
-      coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS
+    name: 'I3S (Indexed Scene Layers)',
+    id: 'i3s',
+    module: 'i3s',
+    version: VERSION,
+    mimeTypes: ['application/octet-stream'],
+    parse: parseI3S,
+    extensions: ['bin'],
+    options: {
+        i3s: {
+            token: null,
+            isTileset: 'auto',
+            isTileHeader: 'auto',
+            tile: null,
+            tileset: null,
+            _tileOptions: null,
+            _tilesetOptions: null,
+            useDracoGeometry: true,
+            useCompressedTextures: true,
+            decodeTextures: true,
+            coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS
+        }
     }
-  }
 };
-async function parseI3S(data) {
-  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  let context = arguments.length > 2 ? arguments[2] : undefined;
-  const url = context.url;
-  options.i3s = options.i3s || {};
-  const magicNumber = getMagicNumber(data);
-  if (magicNumber === SLPK_HEX) {
-    throw new Error('Files with .slpk extention currently are not supported by I3SLoader');
-  }
-  const urlWithoutParams = getUrlWithoutParams(url);
-  let isTileset;
-  if (options.i3s.isTileset === 'auto') {
-    isTileset = TILESET_REGEX.test(urlWithoutParams);
-  } else {
-    isTileset = options.i3s.isTileset;
-  }
-  let isTileHeader;
-  if (options.isTileHeader === 'auto') {
-    isTileHeader = TILE_HEADER_REGEX.test(urlWithoutParams);
-  } else {
-    isTileHeader = options.i3s.isTileHeader;
-  }
-  if (isTileset) {
-    data = await parseTileset(data, options, context);
-  } else if (isTileHeader) {
-    data = await parseTile(data, context);
-  } else {
-    data = await parseTileContent(data, options);
-  }
-  return data;
+async function parseI3S(data, options = {}, context) {
+    const url = context.url;
+    options.i3s = options.i3s || {};
+    const magicNumber = getMagicNumber(data);
+    // check if file is slpk
+    if (magicNumber === SLPK_HEX) {
+        throw new Error('Files with .slpk extention currently are not supported by I3SLoader');
+    }
+    const urlWithoutParams = getUrlWithoutParams(url);
+    // auto detect file type based on url
+    let isTileset;
+    if (options.i3s.isTileset === 'auto') {
+        isTileset = TILESET_REGEX.test(urlWithoutParams) || LOCAL_SLPK_REGEX.test(urlWithoutParams);
+    }
+    else {
+        isTileset = options.i3s.isTileset;
+    }
+    let isTileHeader;
+    if (options.isTileHeader === 'auto') {
+        isTileHeader = TILE_HEADER_REGEX.test(urlWithoutParams);
+    }
+    else {
+        isTileHeader = options.i3s.isTileHeader;
+    }
+    if (isTileset) {
+        data = await parseTileset(data, options, context);
+    }
+    else if (isTileHeader) {
+        data = await parseTile(data, context);
+    }
+    else {
+        data = await parseTileContent(data, options);
+    }
+    return data;
 }
 async function parseTileContent(arrayBuffer, options) {
-  return await parse(arrayBuffer, I3SContentLoader, options);
+    return await parse(arrayBuffer, I3SContentLoader, options);
 }
 async function parseTileset(data, options, context) {
-  const tilesetJson = JSON.parse(new TextDecoder().decode(data));
-  if ((tilesetJson === null || tilesetJson === void 0 ? void 0 : tilesetJson.layerType) === POINT_CLOUD) {
-    throw new Error('Point Cloud layers currently are not supported by I3SLoader');
-  }
-  const tilesetPostprocessed = await normalizeTilesetData(tilesetJson, options, context);
-  return tilesetPostprocessed;
+    const tilesetJson = JSON.parse(new TextDecoder().decode(data));
+    if (tilesetJson?.layerType === POINT_CLOUD) {
+        throw new Error('Point Cloud layers currently are not supported by I3SLoader');
+    }
+    const tilesetPostprocessed = await normalizeTilesetData(tilesetJson, options, context);
+    return tilesetPostprocessed;
 }
 async function parseTile(data, context) {
-  data = JSON.parse(new TextDecoder().decode(data));
-  return normalizeTileData(data, context);
+    data = JSON.parse(new TextDecoder().decode(data));
+    return normalizeTileData(data, context);
 }
 function getMagicNumber(data) {
-  if (data instanceof ArrayBuffer) {
-    return [...new Uint8Array(data, 0, 4)].map(value => value.toString(16).padStart(2, '0')).join('');
-  }
-  return null;
+    if (data instanceof ArrayBuffer) {
+        // slice binary data (4 bytes from the beginning) and transform it to hexadecimal numeral system
+        return [...new Uint8Array(data, 0, 4)]
+            .map((value) => value.toString(16).padStart(2, '0'))
+            .join('');
+    }
+    return null;
 }
-//# sourceMappingURL=i3s-loader.js.map

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

@@ -1,6 +1,6 @@
 import type { LoaderWithParser } from '@loaders.gl/loader-utils';
-import type { I3SLoaderOptions } from './i3s-loader';
-import type { NodePage } from './types';
+import type { I3SLoaderOptions } from "./i3s-loader.js";
+import type { NodePage } from "./types.js";
 /**
  * Loader for I3S node pages
  */

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,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;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":"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"}

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

@@ -1,17 +1,21 @@
-const VERSION = typeof "4.2.0-alpha.4" !== 'undefined' ? "4.2.0-alpha.4" : 'latest';
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof "4.2.0-alpha.5" !== 'undefined' ? "4.2.0-alpha.5" : 'latest';
+/**
+ * Loader for I3S node pages
+ */
 export const I3SNodePageLoader = {
-  name: 'I3S Node Page',
-  id: 'i3s-node-page',
-  module: 'i3s',
-  version: VERSION,
-  mimeTypes: ['application/json'],
-  parse: parseNodePage,
-  extensions: ['json'],
-  options: {
-    i3s: {}
-  }
+    name: 'I3S Node Page',
+    id: 'i3s-node-page',
+    module: 'i3s',
+    version: VERSION,
+    mimeTypes: ['application/json'],
+    parse: parseNodePage,
+    extensions: ['json'],
+    options: {
+        i3s: {}
+    }
 };
 async function parseNodePage(data, options) {
-  return JSON.parse(new TextDecoder().decode(data));
+    return JSON.parse(new TextDecoder().decode(data));
 }
-//# sourceMappingURL=i3s-node-page-loader.js.map

package/dist/i3s-slpk-loader.js

@@ -1,19 +1,23 @@
 import { DataViewFile } from '@loaders.gl/loader-utils';
 import { parseSLPKArchive } from "./lib/parsers/parse-slpk/parse-slpk.js";
-const VERSION = typeof "4.2.0-alpha.4" !== 'undefined' ? "4.2.0-alpha.4" : 'latest';
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+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
+ * @todo - this should be updated to use `parseFile` and ReadableFile
+ */
 export const SLPKLoader = {
-  name: 'I3S SLPK (Scene Layer Package)',
-  id: 'slpk',
-  module: 'i3s',
-  version: VERSION,
-  mimeTypes: ['application/octet-stream'],
-  extensions: ['slpk'],
-  options: {},
-  parse: async function (data) {
-    var _options$slpk$path, _options$slpk, _options$slpk2;
-    let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    const archive = await parseSLPKArchive(new DataViewFile(new DataView(data)));
-    return archive.getFile((_options$slpk$path = (_options$slpk = options.slpk) === null || _options$slpk === void 0 ? void 0 : _options$slpk.path) !== null && _options$slpk$path !== void 0 ? _options$slpk$path : '', (_options$slpk2 = options.slpk) === null || _options$slpk2 === void 0 ? void 0 : _options$slpk2.pathMode);
-  }
+    name: 'I3S SLPK (Scene Layer Package)',
+    id: 'slpk',
+    module: 'i3s',
+    version: VERSION,
+    mimeTypes: ['application/octet-stream'],
+    extensions: ['slpk'],
+    options: {},
+    parse: async (data, options = {}) => {
+        const archive = await parseSLPKArchive(new DataViewFile(new DataView(data)));
+        return archive.getFile(options.slpk?.path ?? '', options.slpk?.pathMode);
+    }
 };
-//# sourceMappingURL=i3s-slpk-loader.js.map