@loaders.gl/tile-converter 4.0.0-alpha.21 → 4.0.0-alpha.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.0.0-alpha.21",
+  "version": "4.0.0-alpha.22",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -45,18 +45,18 @@
     "build-i3s-server-bundle": "esbuild src/i3s-server/bin/www.ts --outfile=dist/esm/i3s-server/bin/i3s-server.min.js --platform=node --target=esnext,node14 --external:join-images --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.0.0-alpha.21",
-    "@loaders.gl/crypto": "4.0.0-alpha.21",
-    "@loaders.gl/draco": "4.0.0-alpha.21",
-    "@loaders.gl/gltf": "4.0.0-alpha.21",
-    "@loaders.gl/i3s": "4.0.0-alpha.21",
-    "@loaders.gl/images": "4.0.0-alpha.21",
-    "@loaders.gl/loader-utils": "4.0.0-alpha.21",
-    "@loaders.gl/polyfills": "4.0.0-alpha.21",
-    "@loaders.gl/textures": "4.0.0-alpha.21",
-    "@loaders.gl/tiles": "4.0.0-alpha.21",
-    "@loaders.gl/worker-utils": "4.0.0-alpha.21",
-    "@loaders.gl/zip": "4.0.0-alpha.21",
+    "@loaders.gl/3d-tiles": "4.0.0-alpha.22",
+    "@loaders.gl/crypto": "4.0.0-alpha.22",
+    "@loaders.gl/draco": "4.0.0-alpha.22",
+    "@loaders.gl/gltf": "4.0.0-alpha.22",
+    "@loaders.gl/i3s": "4.0.0-alpha.22",
+    "@loaders.gl/images": "4.0.0-alpha.22",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.22",
+    "@loaders.gl/polyfills": "4.0.0-alpha.22",
+    "@loaders.gl/textures": "4.0.0-alpha.22",
+    "@loaders.gl/tiles": "4.0.0-alpha.22",
+    "@loaders.gl/worker-utils": "4.0.0-alpha.22",
+    "@loaders.gl/zip": "4.0.0-alpha.22",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geoid": "^3.5.1",
@@ -80,7 +80,7 @@
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "df5d670b136192b26941396e944f9c46be788e83",
+  "gitHead": "0da838c506d1275383f2fd3d244d9c72b25397d2",
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/node": "^20.4.2"

package/src/i3s-converter/helpers/load-3d-tiles.ts

@@ -4,7 +4,8 @@ import type {
   Tiles3DTileJSONPostprocessed,
   Tiles3DTilesetJSONPostprocessed
 } from '@loaders.gl/3d-tiles';
-import {load} from '@loaders.gl/core';
+import {Tiles3DArchiveFileSystem} from '@loaders.gl/3d-tiles';
+import {LoaderWithParser, load} from '@loaders.gl/core';
 
 /**
  * Load nested 3DTiles tileset. If the sourceTile is not nested tileset - do nothing
@@ -18,7 +19,7 @@ export const loadNestedTileset = async (
   sourceTile: Tiles3DTileJSONPostprocessed,
   tilesetLoadOptions: Tiles3DLoaderOptions
 ): Promise<void> => {
-  const isTileset = sourceTile.type === 'json';
+  const isTileset = isNestedTileset(sourceTile);
   if (!sourceTileset || !sourceTile.contentUrl || !isTileset) {
     return;
   }
@@ -30,7 +31,11 @@ export const loadNestedTileset = async (
       assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'
     }
   };
-  const tileContent = await load(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
+  const tileContent = await loadFromArchive(
+    sourceTile.contentUrl,
+    sourceTileset.loader,
+    loadOptions
+  );
 
   if (tileContent.root) {
     sourceTile.children = [tileContent.root];
@@ -49,7 +54,7 @@ export const loadTile3DContent = async (
   sourceTile: Tiles3DTileJSONPostprocessed,
   tilesetLoadOptions: Tiles3DLoaderOptions
 ): Promise<Tiles3DTileContent | null> => {
-  const isTileset = sourceTile.type === 'json';
+  const isTileset = isNestedTileset(sourceTile);
   if (!sourceTileset || !sourceTile.contentUrl || isTileset) {
     return null;
   }
@@ -62,7 +67,58 @@ export const loadTile3DContent = async (
       assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'
     }
   };
-  const tileContent = await load(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
+  const tileContent = await loadFromArchive(
+    sourceTile.contentUrl,
+    sourceTileset.loader,
+    loadOptions
+  );
 
   return tileContent;
 };
+
+/**
+ * Load a resource with load options and .3tz format support
+ * @param url - resource URL
+ * @param loader - loader to parse data (Tiles3DLoader / CesiumIonLoader)
+ * @param loadOptions - 3d-tiles loader options
+ * @returns 3d-tiles resource
+ */
+export async function loadFromArchive(
+  url: string,
+  loader: LoaderWithParser,
+  loadOptions: Tiles3DLoaderOptions
+) {
+  const tz3UrlParts = url.split('.3tz');
+  let filename: string | null;
+  // No '.3tz'. The file will be loaded with global fetch function
+  if (tz3UrlParts.length === 1) {
+    filename = null;
+  } else if (tz3UrlParts.length === 2) {
+    filename = tz3UrlParts[1].slice(1);
+    if (filename === '') {
+      filename = 'tileset.json';
+    }
+  } else {
+    throw new Error('Unexpected URL format');
+  }
+  if (filename) {
+    const tz3Path = `${tz3UrlParts[0]}.3tz`;
+    const fileSystem = new Tiles3DArchiveFileSystem(tz3Path);
+    const content = await load(filename, loader, {
+      ...loadOptions,
+      fetch: fileSystem.fetch.bind(fileSystem)
+    });
+    await fileSystem.destroy();
+    return content;
+  }
+  return await load(url, loader, loadOptions);
+}
+
+/**
+ * Check if tile is nested tileset
+ * @param tile - 3DTiles header data
+ * @returns true if tile is nested tileset
+ */
+export function isNestedTileset(tile: Tiles3DTileJSONPostprocessed) {
+  return tile?.type === 'json' || tile?.type === '3tz';
+}

package/src/i3s-converter/i3s-converter.ts

@@ -67,7 +67,12 @@ import {
   getFieldAttributeType
 } from './helpers/feature-attributes';
 import {NodeIndexDocument} from './helpers/node-index-document';
-import {loadNestedTileset, loadTile3DContent} from './helpers/load-3d-tiles';
+import {
+  isNestedTileset,
+  loadNestedTileset,
+  loadTile3DContent,
+  loadFromArchive
+} from './helpers/load-3d-tiles';
 import {Matrix4} from '@math.gl/core';
 import {BoundingSphere, OrientedBoundingBox} from '@math.gl/culling';
 import {createBoundingVolume} from '@loaders.gl/tiles';
@@ -251,7 +256,7 @@ export default class I3SConverter {
       if (preloadOptions.headers) {
         this.loadOptions.fetch = {headers: preloadOptions.headers};
       }
-      this.sourceTileset = await load(tilesetUrl, this.Loader, this.loadOptions);
+      this.sourceTileset = await loadFromArchive(tilesetUrl, this.Loader, this.loadOptions);
 
       const preprocessResult = await this.preprocessConversion();
 
@@ -349,7 +354,8 @@ export default class I3SConverter {
     sourceTile: Tiles3DTileJSONPostprocessed,
     traversalProps: null
   ): Promise<null> {
-    if (sourceTile.type === 'json') {
+    const isTileset = isNestedTileset(sourceTile);
+    if (isTileset) {
       await loadNestedTileset(this.sourceTileset, sourceTile, this.loadOptions);
       return null;
     }
@@ -562,8 +568,9 @@ export default class I3SConverter {
     sourceTile: Tiles3DTileJSONPostprocessed,
     traversalProps: TraversalConversionProps
   ): Promise<TraversalConversionProps> {
-    if (sourceTile.type === 'json' || sourceTile.type === 'empty') {
-      if (sourceTile.type === 'json') {
+    const isTileset = isNestedTileset(sourceTile);
+    if (isTileset || sourceTile.type === 'empty') {
+      if (isTileset) {
         if (sourceTile.id) {
           console.log(`[load]: ${sourceTile.id}`); // eslint-disable-line
         }