@loaders.gl/tile-converter 3.1.0-alpha.4 → 3.1.0-beta.5

package/dist/esm/i3s-converter/i3s-converter.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { load } from '@loaders.gl/core';
+import { load, encode } from '@loaders.gl/core';
 import { Tileset3D } from '@loaders.gl/tiles';
-import { CesiumIonLoader } from '@loaders.gl/3d-tiles';
+import { CesiumIonLoader, Tiles3DLoader } from '@loaders.gl/3d-tiles';
 import { join } from 'path';
 import { v4 as uuidv4 } from 'uuid';
 import process from 'process';
@@ -20,6 +20,7 @@ import { LAYERS as layersTemplate } from './json-templates/layers';
 import { NODE as nodeTemplate } from './json-templates/node';
 import { SHARED_RESOURCES_TEMPLATE } from './json-templates/shared-resources';
 import { validateNodeBoundingVolumes } from './helpers/node-debug';
+import { KTX2BasisUniversalTextureWriter } from '@loaders.gl/textures';
 const ION_DEFAULT_TOKEN = process.env.IonToken || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ';
 const HARDCODED_NODES_PER_PAGE = 64;
 const _3D_TILES = '3DTILES';
@@ -29,6 +30,7 @@ const SHORT_INT_TYPE = 'Int32';
 const DOUBLE_TYPE = 'double';
 const OBJECT_ID_TYPE = 'OBJECTID';
 const REFRESH_TOKEN_TIMEOUT = 1800;
+const CESIUM_DATASET_PREFIX = 'https://';
 export default class I3SConverter {
   constructor() {
     _defineProperty(this, "nodePages", void 0);
@@ -63,6 +65,8 @@ export default class I3SConverter {
 
     _defineProperty(this, "geoidHeightModel", void 0);
 
+    _defineProperty(this, "Loader", Tiles3DLoader);
+
     this.nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE);
     this.fileMap = {};
     this.options = {};
@@ -104,6 +108,7 @@ export default class I3SConverter {
       inputUrl
     };
     this.validate = validate;
+    this.Loader = inputUrl.indexOf(CESIUM_DATASET_PREFIX) !== -1 ? CesiumIonLoader : Tiles3DLoader;
     console.log('Loading egm file...');
     this.geoidHeightModel = await load(egmFilePath, PGMLoader);
     console.log('Loading egm file completed!');
@@ -124,7 +129,7 @@ export default class I3SConverter {
     }
 
     Object.assign(tilesetOptions, preloadOptions);
-    const sourceTilesetJson = await load(inputUrl, CesiumIonLoader, tilesetOptions.loadOptions);
+    const sourceTilesetJson = await load(inputUrl, this.Loader, tilesetOptions.loadOptions);
     this.sourceTileset = new Tileset3D(sourceTilesetJson, tilesetOptions);
     await this._createAndSaveTileset(outputPath, tilesetName);
     await this._finishConversion({
@@ -136,7 +141,7 @@ export default class I3SConverter {
   }
 
   async _createAndSaveTileset(outputPath, tilesetName) {
-    const tilesetPath = join(`${outputPath}`, `${tilesetName}`);
+    const tilesetPath = join("".concat(outputPath), "".concat(tilesetName));
 
     try {
       await removeDir(tilesetPath);
@@ -171,12 +176,12 @@ export default class I3SConverter {
   _formLayers0(tilesetName) {
     const extent = convertCommonToI3SExtentCoordinate(this.sourceTileset);
     const layers0data = {
-      version: `{${uuidv4().toUpperCase()}}`,
+      version: "{".concat(uuidv4().toUpperCase(), "}"),
       id: 0,
       name: tilesetName,
       href: './layers/0',
       store: {
-        id: `{${uuidv4().toUpperCase()}}`,
+        id: "{".concat(uuidv4().toUpperCase(), "}"),
         extent
       },
       nodePages: {
@@ -189,7 +194,7 @@ export default class I3SConverter {
 
   _formRootNodeIndexDocument(boundingVolumes) {
     const root0data = {
-      version: `{${uuidv4().toUpperCase()}}`,
+      version: "{".concat(uuidv4().toUpperCase(), "}"),
       id: 'root',
       level: 0,
       lodSelection: [{
@@ -244,7 +249,7 @@ export default class I3SConverter {
 
   async _writeNodeIndexDocument(root0, nodePath, rootPath) {
     if (this.options.slpk) {
-      this.fileMap[`nodes/${nodePath}/3dNodeIndexDocument.json.gz`] = await writeFileForSlpk(rootPath, JSON.stringify(root0), '3dNodeIndexDocument.json');
+      this.fileMap["nodes/".concat(nodePath, "/3dNodeIndexDocument.json.gz")] = await writeFileForSlpk(rootPath, JSON.stringify(root0), '3dNodeIndexDocument.json');
     } else {
       await writeFile(rootPath, JSON.stringify(root0));
     }
@@ -253,7 +258,7 @@ export default class I3SConverter {
   async _createSlpk(tilesetPath) {
     if (this.options.slpk) {
       const slpkTilesetPath = join(tilesetPath, 'SceneServer', 'layers', '0');
-      const slpkFileName = `${tilesetPath}.slpk`;
+      const slpkFileName = "".concat(tilesetPath, ".slpk");
       await compressWithChildProcess(slpkTilesetPath, slpkFileName, 0, '.', this.options.sevenZipExe);
 
       try {
@@ -301,7 +306,7 @@ export default class I3SConverter {
         for (const child of children) {
           parentNode.children.push({
             id: child.id,
-            href: `../${child.path}`,
+            href: "../".concat(child.path),
             ...boundingVolumes
           });
           childNodes.push(child);
@@ -330,7 +335,7 @@ export default class I3SConverter {
           });
         }
       } else {
-        console.warn(`Node ${node.id}: neighbors attribute is omited because of large number of neigbors`);
+        console.warn("Node ".concat(node.id, ": neighbors attribute is omited because of large number of neigbors"));
         delete node.neighbors;
       }
 
@@ -425,7 +430,8 @@ export default class I3SConverter {
       meshMaterial,
       texture,
       vertexCount,
-      featureCount
+      featureCount,
+      geometry
     } = resources;
     const nodeInPage = {
       lodThreshold: maxScreenThresholdSQ.maxError,
@@ -434,7 +440,7 @@ export default class I3SConverter {
       mesh: null
     };
 
-    if (sourceTile.content && sourceTile.content.type === 'b3dm') {
+    if (geometry && sourceTile.content && sourceTile.content.type === 'b3dm') {
       nodeInPage.mesh = {
         geometry: {
           definition: texture ? 0 : 1
@@ -483,7 +489,7 @@ export default class I3SConverter {
       lodSelection,
       parentNode: {
         id: parentNode.id,
-        href: `../${parentNode.id}`,
+        href: "../".concat(parentNode.id),
         mbs: parentNode.mbs,
         obb: parentNode.obb
       },
@@ -503,6 +509,8 @@ export default class I3SConverter {
       if (texture) {
         node.textureData = [{
           href: './textures/0'
+        }, {
+          href: './textures/1'
         }];
       }
 
@@ -512,7 +520,7 @@ export default class I3SConverter {
         for (let index = 0; index < attributes.length; index++) {
           const folderName = this.layers0.attributeStorageInfo[index].key;
           node.attributeData.push({
-            href: `./attributes/${folderName}/0`
+            href: "./attributes/".concat(folderName, "/0")
           });
         }
       }
@@ -540,7 +548,7 @@ export default class I3SConverter {
   async _writeGeometries(geometryBuffer, compressedGeometry, childPath, slpkChildPath) {
     if (this.options.slpk) {
       const slpkGeometryPath = join(childPath, 'geometries');
-      this.fileMap[`${slpkChildPath}/geometries/0.bin.gz`] = await writeFileForSlpk(slpkGeometryPath, geometryBuffer, '0.bin');
+      this.fileMap["".concat(slpkChildPath, "/geometries/0.bin.gz")] = await writeFileForSlpk(slpkGeometryPath, geometryBuffer, '0.bin');
     } else {
       const geometryPath = join(childPath, 'geometries/0/');
       await writeFile(geometryPath, geometryBuffer, 'index.bin');
@@ -549,7 +557,7 @@ export default class I3SConverter {
     if (this.options.draco) {
       if (this.options.slpk) {
         const slpkCompressedGeometryPath = join(childPath, 'geometries');
-        this.fileMap[`${slpkChildPath}/geometries/1.bin.gz`] = await writeFileForSlpk(slpkCompressedGeometryPath, compressedGeometry, '1.bin');
+        this.fileMap["".concat(slpkChildPath, "/geometries/1.bin.gz")] = await writeFileForSlpk(slpkCompressedGeometryPath, compressedGeometry, '1.bin');
       } else {
         const compressedGeometryPath = join(childPath, 'geometries/1/');
         await writeFile(compressedGeometryPath, compressedGeometry, 'index.bin');
@@ -564,7 +572,7 @@ export default class I3SConverter {
 
     if (this.options.slpk) {
       const slpkSharedPath = join(childPath, 'shared');
-      this.fileMap[`${slpkChildPath}/shared/sharedResource.json.gz`] = await writeFileForSlpk(slpkSharedPath, sharedDataStr, 'sharedResource.json');
+      this.fileMap["".concat(slpkChildPath, "/shared/sharedResource.json.gz")] = await writeFileForSlpk(slpkSharedPath, sharedDataStr, 'sharedResource.json');
     } else {
       const sharedPath = join(childPath, 'shared/');
       await writeFile(sharedPath, sharedDataStr);
@@ -580,19 +588,26 @@ export default class I3SConverter {
           formats: [{
             name: '0',
             format
+          }, {
+            name: '1',
+            format: 'ktx2'
           }]
         });
       }
 
       const textureData = texture.bufferView.data;
+      const ktx2TextureData = await encode(texture.image, KTX2BasisUniversalTextureWriter);
 
       if (this.options.slpk) {
         const slpkTexturePath = join(childPath, 'textures');
         const compress = false;
-        this.fileMap[`${slpkChildPath}/textures/0.${format}`] = await writeFileForSlpk(slpkTexturePath, textureData, `0.${format}`, compress);
+        this.fileMap["".concat(slpkChildPath, "/textures/0.").concat(format)] = await writeFileForSlpk(slpkTexturePath, textureData, "0.".concat(format), compress);
+        this.fileMap["".concat(slpkChildPath, "/textures/1.ktx2")] = await writeFileForSlpk(slpkTexturePath, ktx2TextureData, "1.ktx2", compress);
       } else {
         const texturePath = join(childPath, 'textures/0/');
-        await writeFile(texturePath, textureData, `index.${format}`);
+        await writeFile(texturePath, textureData, "index.".concat(format));
+        const ktx2TexturePath = join(childPath, 'textures/1/');
+        await writeFile(ktx2TexturePath, ktx2TextureData, "index.ktx2");
       }
     }
   }
@@ -605,9 +620,9 @@ export default class I3SConverter {
 
         if (this.options.slpk) {
           const slpkAttributesPath = join(childPath, 'attributes', folderName);
-          this.fileMap[`${slpkChildPath}/attributes/${folderName}.bin.gz`] = await writeFileForSlpk(slpkAttributesPath, fileBuffer, '0.bin');
+          this.fileMap["".concat(slpkChildPath, "/attributes/").concat(folderName, ".bin.gz")] = await writeFileForSlpk(slpkAttributesPath, fileBuffer, '0.bin');
         } else {
-          const attributesPath = join(childPath, `attributes/${folderName}/0`);
+          const attributesPath = join(childPath, "attributes/".concat(folderName, "/0"));
           await writeFile(attributesPath, fileBuffer, 'index.bin');
         }
       }
@@ -641,7 +656,7 @@ export default class I3SConverter {
 
   _createdStorageAttribute(attributeIndex, key, attributeType) {
     const storageAttribute = {
-      key: `f_${attributeIndex}`,
+      key: "f_".concat(attributeIndex),
       name: key,
       ordering: ['attributeValues'],
       header: [{
@@ -818,22 +833,26 @@ export default class I3SConverter {
     const filesSize = await calculateFilesSize(params);
     const diff = process.hrtime(this.conversionStartTime);
     const conversionTime = timeConverter(diff);
-    console.log(`------------------------------------------------`);
-    console.log(`Finishing conversion of ${_3D_TILES}`);
-    console.log(`Total conversion time: ${conversionTime}`);
-    console.log(`Vertex count: `, this.vertexCounter);
-    console.log(`File(s) size: `, filesSize, ' bytes');
-    console.log(`Percentage of tiles with "ADD" refinement type:`, addRefinementPercentage, '%');
-    console.log(`------------------------------------------------`);
+    console.log("------------------------------------------------");
+    console.log("Finishing conversion of ".concat(_3D_TILES));
+    console.log("Total conversion time: ".concat(conversionTime));
+    console.log("Vertex count: ", this.vertexCounter);
+    console.log("File(s) size: ", filesSize, ' bytes');
+    console.log("Percentage of tiles with \"ADD\" refinement type:", addRefinementPercentage, '%');
+    console.log("------------------------------------------------");
   }
 
   async _fetchPreloadOptions() {
+    if (!this.Loader.preload) {
+      return {};
+    }
+
     const options = {
       'cesium-ion': {
         accessToken: this.options.token || ION_DEFAULT_TOKEN
       }
     };
-    const preloadOptions = await CesiumIonLoader.preload(this.options.inputUrl, options);
+    const preloadOptions = await this.Loader.preload(this.options.inputUrl, options);
     this.refreshTokenTime = process.hrtime();
     return { ...options,
       ...preloadOptions