@loaders.gl/tile-converter 3.2.0-alpha.2 → 3.2.0

package/src/deps-installer/{deps-installer.js → deps-installer.ts}

@@ -5,8 +5,18 @@ import {join} from 'path';
 
 const PGM_LINK = 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/egm/egm2008-5.zip';
 
+/**
+ * Install external dependencies for converter:
+ * * PGM file (implemented);
+ * * Draco library (not implemented);
+ * * 7z archiver (not implemented);
+ */
 export class DepsInstaller {
-  async install(path = '') {
+  /**
+   * Run instalation
+   * @param path destination folder
+   */
+  async install(path: string = ''): Promise<void> {
     console.log('Installing "EGM2008-5" model...'); // eslint-disable-line no-console
     const fileMap = await load(PGM_LINK, ZipLoader, {});
 

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

@@ -371,6 +371,10 @@ function getCompositeTransformationMatrix(node, matrix) {
     transformationMatrix = matrix.multiplyRight(nodeMatrix);
   }
 
+  if (translation) {
+    transformationMatrix = transformationMatrix.translate(translation);
+  }
+
   if (rotation) {
     transformationMatrix = transformationMatrix.rotateXYZ(rotation);
   }
@@ -379,10 +383,6 @@ function getCompositeTransformationMatrix(node, matrix) {
     transformationMatrix = transformationMatrix.scale(scale);
   }
 
-  if (translation) {
-    transformationMatrix = transformationMatrix.translate(translation);
-  }
-
   return transformationMatrix;
 }
 

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

@@ -16,7 +16,7 @@ import type {
   PopupInfo,
   FieldInfo
 } from '@loaders.gl/i3s';
-import {load, encode, fetchFile, getLoaderOptions} from '@loaders.gl/core';
+import {load, encode, fetchFile, getLoaderOptions, isBrowser} from '@loaders.gl/core';
 import {Tileset3D} from '@loaders.gl/tiles';
 import {CesiumIonLoader, Tiles3DLoader} from '@loaders.gl/3d-tiles';
 import {Geoid} from '@math.gl/geoid';
@@ -48,7 +48,7 @@ import {NODE as nodeTemplate} from './json-templates/node';
 import {SHARED_RESOURCES as sharedResourcesTemplate} from './json-templates/shared-resources';
 import {validateNodeBoundingVolumes} from './helpers/node-debug';
 import TileHeader from '@loaders.gl/tiles/src/tileset/tile-3d';
-import {KTX2BasisWriter} from '@loaders.gl/textures';
+import {KTX2BasisWriterWorker} from '@loaders.gl/textures';
 import {LoaderWithParser} from '@loaders.gl/loader-utils';
 import {I3SMaterialDefinition, TextureSetDefinitionFormats} from '@loaders.gl/i3s/src/types';
 import {ImageWriter} from '@loaders.gl/images';
@@ -58,9 +58,10 @@ import {getWorkerURL, WorkerFarm} from '@loaders.gl/worker-utils';
 import {DracoWriterWorker} from '@loaders.gl/draco';
 import WriteQueue from '../lib/utils/write-queue';
 import {I3SAttributesWorker} from '../i3s-attributes-worker';
+import {BROWSER_ERROR_MESSAGE} from '../constants';
 
 const ION_DEFAULT_TOKEN =
-  process.env.IonToken || // eslint-disable-line
+  process.env?.IonToken || // eslint-disable-line
   'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ'; // eslint-disable-line
 const HARDCODED_NODES_PER_PAGE = 64;
 const _3D_TILES = '3DTILES';
@@ -148,9 +149,11 @@ export default class I3SConverter {
     validate?: boolean;
     generateTextures?: boolean;
     generateBoundingVolumes?: boolean;
-    /** @deprecated */
-    inputType?: string;
   }): Promise<any> {
+    if (isBrowser) {
+      console.log(BROWSER_ERROR_MESSAGE);
+      return BROWSER_ERROR_MESSAGE;
+    }
     this.conversionStartTime = process.hrtime();
     const {
       tilesetName,
@@ -185,24 +188,27 @@ export default class I3SConverter {
 
     await this.loadWorkers();
 
-    const preloadOptions = await this._fetchPreloadOptions();
-    const tilesetOptions: Tileset3DProps = {loadOptions: {basis: {format: 'rgba32'}}};
-    if (preloadOptions.headers) {
-      tilesetOptions.loadOptions!.fetch = {headers: preloadOptions.headers};
+    try {
+      const preloadOptions = await this._fetchPreloadOptions();
+      const tilesetOptions: Tileset3DProps = {loadOptions: {basis: {format: 'rgba32'}}};
+      if (preloadOptions.headers) {
+        tilesetOptions.loadOptions!.fetch = {headers: preloadOptions.headers};
+      }
+      Object.assign(tilesetOptions, preloadOptions);
+      const sourceTilesetJson = await load(inputUrl, this.Loader, tilesetOptions.loadOptions);
+      // console.log(tilesetJson); // eslint-disable-line
+      this.sourceTileset = new Tileset3D(sourceTilesetJson, tilesetOptions);
+
+      await this._createAndSaveTileset(outputPath, tilesetName);
+      await this._finishConversion({slpk: Boolean(slpk), outputPath, tilesetName});
+      return sourceTilesetJson;
+    } catch (error) {
+      throw error;
+    } finally {
+      // Clean up worker pools
+      const workerFarm = WorkerFarm.getWorkerFarm({});
+      workerFarm.destroy();
     }
-    Object.assign(tilesetOptions, preloadOptions);
-    const sourceTilesetJson = await load(inputUrl, this.Loader, tilesetOptions.loadOptions);
-    // console.log(tilesetJson); // eslint-disable-line
-    this.sourceTileset = new Tileset3D(sourceTilesetJson, tilesetOptions);
-
-    await this._createAndSaveTileset(outputPath, tilesetName);
-    await this._finishConversion({slpk: Boolean(slpk), outputPath, tilesetName});
-
-    // Clean up worker pools
-    const workerFarm = WorkerFarm.getWorkerFarm({});
-    workerFarm.destroy();
-
-    return sourceTilesetJson;
   }
 
   /**
@@ -278,9 +284,9 @@ export default class I3SConverter {
       nodePages: {
         nodesPerPage: HARDCODED_NODES_PER_PAGE
       },
-      compressGeometry: this.options.draco
+      compressGeometry: this.options.draco,
+      fullExtent
     };
-
     this.layers0 = transform(layers0data, layersTemplate());
   }
 
@@ -932,7 +938,13 @@ export default class I3SConverter {
 
           if (this.generateTextures) {
             formats.push({name: '1', format: 'ktx2'});
-            const ktx2TextureData = new Uint8Array(await encode(texture.image, KTX2BasisWriter));
+            const ktx2TextureData = encode(texture.image, KTX2BasisWriterWorker, {
+              ...KTX2BasisWriterWorker.options,
+              source: this.workerSource.ktx2,
+              reuseWorkers: true,
+              _nodeWorkers: true
+            });
+
             await this.writeTextureFile(ktx2TextureData, '1', 'ktx2', childPath, slpkChildPath);
           }
 
@@ -945,9 +957,7 @@ export default class I3SConverter {
 
           if (this.generateTextures) {
             formats.push({name: '0', format: 'jpg'});
-            const decodedFromKTX2TextureData = new Uint8Array(
-              await encode(texture.image!.data[0], ImageWriter)
-            );
+            const decodedFromKTX2TextureData = encode(texture.image!.data[0], ImageWriter);
             await this.writeTextureFile(
               decodedFromKTX2TextureData,
               '0',
@@ -974,7 +984,7 @@ export default class I3SConverter {
    * @param slpkChildPath
    */
   private async writeTextureFile(
-    textureData: ArrayBuffer,
+    textureData: Promise<ArrayBuffer>,
     name: string,
     format: 'jpg' | 'png' | 'ktx2',
     childPath: string,
@@ -1346,6 +1356,13 @@ export default class I3SConverter {
       this.workerSource.draco = source;
     }
 
+    if (this.generateTextures) {
+      const url = getWorkerURL(KTX2BasisWriterWorker, {...getLoaderOptions()});
+      const sourceResponse = await fetchFile(url);
+      const source = await sourceResponse.text();
+      this.workerSource.ktx2 = source;
+    }
+
     const i3sAttributesWorkerUrl = getWorkerURL(I3SAttributesWorker, {...getLoaderOptions()});
     const sourceResponse = await fetchFile(i3sAttributesWorkerUrl);
     const source = await sourceResponse.text();

package/src/i3s-converter/json-templates/layers.ts

@@ -115,6 +115,27 @@ const NODE_PAGES = () => ({
   }
 });
 
+const FULL_EXTENT = () => ({
+  xmin: {
+    path: 'xmin'
+  },
+  ymin: {
+    path: 'ymin'
+  },
+  xmax: {
+    path: 'xmax'
+  },
+  ymax: {
+    path: 'ymax'
+  },
+  zmin: {
+    path: 'zmin'
+  },
+  zmax: {
+    path: 'zmax'
+  }
+});
+
 export const LAYERS = () => ({
   version: {
     path: 'version',
@@ -147,6 +168,10 @@ export const LAYERS = () => ({
     path: 'store',
     transform: (val) => transform(val, STORE)
   },
+  fullExtent: {
+    path: 'fullExtent',
+    transform: (val) => transform(val, FULL_EXTENT())
+  },
   heightModelInfo: {
     path: 'heightModelInfo',
     transform: (val) => transform(val, HEIGHT_MODEL_INFO())

package/src/index.ts

@@ -1,7 +1,2 @@
 export {default as I3SConverter} from './i3s-converter/i3s-converter';
-export {default as NodePages} from './i3s-converter/helpers/node-pages';
-
 export {default as Tiles3DConverter} from './3d-tiles-converter/3d-tiles-converter';
-
-export {DepsInstaller} from './deps-installer/deps-installer';
-export {prepareDataForAttributesConversion} from './i3s-converter/helpers/gltf-attributes';

package/dist/es5/deps-installer/deps-installer.d.ts

@@ -1,10 +0,0 @@
-/**
- * Install external dependencies for converter:
- * * PGM file (implemented);
- * * Draco library (not implemented);
- * * 7z archiver (not implemented);
- */
-export class DepsInstaller {
-  // Run installation
-  install(path?: string): Promise<void>;
-}

package/dist/esm/deps-installer/deps-installer.d.ts

@@ -1,10 +0,0 @@
-/**
- * Install external dependencies for converter:
- * * PGM file (implemented);
- * * Draco library (not implemented);
- * * 7z archiver (not implemented);
- */
-export class DepsInstaller {
-  // Run installation
-  install(path?: string): Promise<void>;
-}

package/src/deps-installer/deps-installer.d.ts

@@ -1,10 +0,0 @@
-/**
- * Install external dependencies for converter:
- * * PGM file (implemented);
- * * Draco library (not implemented);
- * * 7z archiver (not implemented);
- */
-export class DepsInstaller {
-  // Run installation
-  install(path?: string): Promise<void>;
-}