@loaders.gl/tile-converter 4.3.0-alpha.4 → 4.3.0-alpha.6

package/dist/i3s-server/bin/www.js

@@ -28,6 +28,11 @@ const options = {
     key: fs.readFileSync(path.join(__dirname, '../certs/key.pem')),
     cert: fs.readFileSync(path.join(__dirname, '../certs/cert.pem'))
 };
+if (!app) {
+    // eslint-disable-next-line no-console
+    console.error('This server supports *.slpk files only');
+    process.exit(1); // eslint-disable-line no-process-exit
+}
 const httpServer = http.createServer(app);
 const httpsServer = https.createServer(options, app);
 /** Listen on provided port, on all network interfaces. */

package/dist/index.cjs

@@ -456,15 +456,8 @@ var NodePages = class {
    * @returns file path and file name
    */
   getNodePageFileName(nodePageId) {
-    let filePath;
-    let fileName;
-    if (this.converter.options.slpk) {
-      filePath = (0, import_path2.join)(this.converter.layers0Path, "nodepages");
-      fileName = `${nodePageId.toString()}.json`;
-    } else {
-      filePath = (0, import_path2.join)(this.converter.layers0Path, "nodepages", nodePageId.toString());
-      fileName = "index.json";
-    }
+    const filePath = (0, import_path2.join)(this.converter.layers0Path, "nodepages");
+    const fileName = `${nodePageId.toString()}.json`;
     return { filePath, fileName };
   }
   /**
@@ -564,16 +557,10 @@ var NodePages = class {
       nodePage.nodes.push(node);
     }
     const nodePageStr = JSON.stringify(nodePage);
-    if (this.converter.options.slpk) {
-      await this.converter.writeQueue.enqueue({
-        archiveKey: `nodePages/${nodePageIndex.toString()}.json.gz`,
-        writePromise: () => this.writeFile(filePath, nodePageStr, fileName, true, this.converter.compressList)
-      }, true);
-    } else {
-      await this.converter.writeQueue.enqueue({
-        writePromise: () => this.writeFile(filePath, nodePageStr)
-      }, true);
-    }
+    await this.converter.writeQueue.enqueue({
+      archiveKey: `nodePages/${nodePageIndex.toString()}.json.gz`,
+      writePromise: () => this.writeFile(filePath, nodePageStr, fileName, true, this.converter.compressList)
+    }, true);
   }
   /**
    * Save metadata file (for slpk only)
@@ -595,25 +582,15 @@ var NodePages = class {
       await this.saveMetadata();
       return;
     }
-    if (this.converter.options.slpk) {
-      for (const [index, nodePage] of this.nodePages.entries()) {
-        const nodePageStr = JSON.stringify(nodePage);
-        const slpkPath = (0, import_path2.join)(this.converter.layers0Path, "nodepages");
-        await this.converter.writeQueue.enqueue({
-          archiveKey: `nodePages/${index.toString()}.json.gz`,
-          writePromise: () => this.writeFile(slpkPath, nodePageStr, `${index.toString()}.json`)
-        });
-      }
-      await this.saveMetadata();
-    } else {
-      for (const [index, nodePage] of this.nodePages.entries()) {
-        const nodePageStr = JSON.stringify(nodePage);
-        const nodePagePath = (0, import_path2.join)(this.converter.layers0Path, "nodepages", index.toString());
-        await this.converter.writeQueue.enqueue({
-          writePromise: () => this.writeFile(nodePagePath, nodePageStr)
-        });
-      }
+    for (const [index, nodePage] of this.nodePages.entries()) {
+      const nodePageStr = JSON.stringify(nodePage);
+      const slpkPath = (0, import_path2.join)(this.converter.layers0Path, "nodepages");
+      await this.converter.writeQueue.enqueue({
+        archiveKey: `nodePages/${index.toString()}.json.gz`,
+        writePromise: () => this.writeFile(slpkPath, nodePageStr, `${index.toString()}.json`)
+      });
     }
+    await this.saveMetadata();
   }
   /**
    * Update resource index in node.mesh object
@@ -693,7 +670,7 @@ var NodePages = class {
   }
 };
 
-// dist/lib/utils/statistic-utills.js
+// dist/lib/utils/statistic-utils.js
 var import_path3 = require("path");
 var import_fs3 = require("fs");
 function timeConverter(time) {
@@ -729,7 +706,7 @@ function timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds) {
   }
   return result;
 }
-async function calculateFilesSize(params) {
+async function calculateDatasetSize(params) {
   const { slpk, outputPath, tilesetName } = params;
   const fullOutputPath = getAbsoluteFilePath(outputPath);
   try {
@@ -739,20 +716,20 @@ async function calculateFilesSize(params) {
       return stat.size;
     }
     const directoryPath = (0, import_path3.join)(fullOutputPath, tilesetName);
-    const totalSize = await getTotalFilesSize(directoryPath);
+    const totalSize = await getDirectorySize(directoryPath);
     return totalSize;
   } catch (error) {
     console.log("Calculate file sizes error: ", error);
     return null;
   }
 }
-async function getTotalFilesSize(dirPath) {
+async function getDirectorySize(dirPath) {
   let totalFileSize = 0;
   const files = await import_fs3.promises.readdir(dirPath);
   for (const file of files) {
     const fileStat = await import_fs3.promises.stat((0, import_path3.join)(dirPath, file));
     if (fileStat.isDirectory()) {
-      totalFileSize += await getTotalFilesSize((0, import_path3.join)(dirPath, file));
+      totalFileSize += await getDirectorySize((0, import_path3.join)(dirPath, file));
     } else {
       totalFileSize += fileStat.size;
     }
@@ -2348,7 +2325,7 @@ function convertScreenThresholdToGeometricError(node) {
 
 // dist/pgm-loader.js
 var import_geoid = require("@math.gl/geoid");
-var VERSION = true ? "4.3.0-alpha.3" : "latest";
+var VERSION = true ? "4.3.0-alpha.5" : "latest";
 var PGMLoader = {
   dataType: null,
   batchType: null,
@@ -3266,14 +3243,10 @@ var NodeIndexDocument = class {
    */
   async write(node) {
     const path = (0, import_path5.join)(this.converter.layers0Path, "nodes", this.id);
-    if (this.converter.options.slpk) {
-      await this.converter.writeQueue.enqueue({
-        archiveKey: `nodes/${this.id}/3dNodeIndexDocument.json.gz`,
-        writePromise: () => writeFileForSlpk(path, JSON.stringify(node), "3dNodeIndexDocument.json", true, this.converter.compressList)
-      }, true);
-    } else {
-      await this.converter.writeQueue.enqueue({ writePromise: () => writeFile(path, JSON.stringify(node)) }, true);
-    }
+    await this.converter.writeQueue.enqueue({
+      archiveKey: `nodes/${this.id}/3dNodeIndexDocument.json.gz`,
+      writePromise: () => writeFileForSlpk(path, JSON.stringify(node), "3dNodeIndexDocument.json", true, this.converter.compressList)
+    }, true);
   }
   /**
    * Load 3DNodeIndexDocument data from file on disk
@@ -3285,10 +3258,7 @@ var NodeIndexDocument = class {
     }
     const path = this.id;
     const parentNodePath = (0, import_path5.join)(this.converter.layers0Path, "nodes", path);
-    let parentNodeFileName = "index.json";
-    if (this.converter.options.slpk) {
-      parentNodeFileName = "3dNodeIndexDocument.json";
-    }
+    const parentNodeFileName = "3dNodeIndexDocument.json";
     return await openJson(parentNodePath, parentNodeFileName);
   }
   /**
@@ -4367,8 +4337,6 @@ var I3SConverter = class {
    * @param options.outputPath the output filename
    * @param options.tilesetName the output name of the tileset
    * @param options.maxDepth The max tree depth of conversion
-   * @param options.slpk Generate slpk (Scene Layer Packages) output file
-   * @param options.sevenZipExe Location of 7z.exe archiver to create slpk on Windows
    * @param options.egmFilePath location of *.pgm file to convert heights from ellipsoidal to gravity-related format
    * @param options.token Token for Cesium ION tilesets authentication
    * @param options.draco Generate I3S 1.7 draco compressed geometries
@@ -4384,13 +4352,11 @@ var I3SConverter = class {
       return BROWSER_ERROR_MESSAGE;
     }
     this.conversionStartTime = import_process4.default.hrtime();
-    const { tilesetName, slpk, egmFilePath, inputUrl, validate, outputPath, draco = true, sevenZipExe, maxDepth, token, generateTextures, generateBoundingVolumes, instantNodeWriting = false, mergeMaterials: mergeMaterials2 = true, inquirer, metadataClass, analyze = false, noEgm = false } = options;
+    const { tilesetName, egmFilePath, inputUrl, validate, outputPath, draco = true, maxDepth, token, generateTextures, generateBoundingVolumes, instantNodeWriting = false, mergeMaterials: mergeMaterials2 = true, inquirer, metadataClass, analyze = false } = options;
     this.options = {
       outputPath,
       tilesetName,
       maxDepth,
-      slpk,
-      sevenZipExe,
       egmFilePath,
       draco,
       token,
@@ -4408,16 +4374,14 @@ var I3SConverter = class {
     this.generateBoundingVolumes = Boolean(generateBoundingVolumes);
     this.writeQueue = new WriteQueue(this.conversionDump);
     this.writeQueue.startListening();
-    if (!noEgm) {
-      console.log("--no-egm option selected, skip loading egm file");
+    if (egmFilePath.toLowerCase() === "none") {
+      console.log('--egm chousen to be "none", skip loading egm file');
     } else {
       console.log("Loading egm file...");
       this.geoidHeightModel = await (0, import_core9.load)(egmFilePath, PGMLoader);
       console.log("Loading egm file completed!");
     }
-    if (slpk) {
-      this.nodePages.useWriteFunction(writeFileForSlpk);
-    }
+    this.nodePages.useWriteFunction(writeFileForSlpk);
     try {
       const preloadOptions = await this._fetchPreloadOptions();
       let tilesetUrl = inputUrl;
@@ -4433,7 +4397,7 @@ var I3SConverter = class {
         const selectMetadataClassResult = await this.selectMetadataClass();
         if (selectMetadataClassResult) {
           await this._createAndSaveTileset(outputPath, tilesetName);
-          await this._finishConversion({ slpk: Boolean(slpk), outputPath, tilesetName });
+          await this._finishConversion({ outputPath, tilesetName });
         }
       }
     } catch (error) {
@@ -4664,16 +4628,10 @@ var I3SConverter = class {
    * Write 3DSceneLayer https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DSceneLayer.cmn.md in file
    */
   async _writeLayers0() {
-    if (this.options.slpk) {
-      await this.writeQueue.enqueue({
-        archiveKey: "3dSceneLayer.json.gz",
-        writePromise: () => writeFileForSlpk(this.layers0Path, JSON.stringify(this.layers0), "3dSceneLayer.json")
-      });
-    } else {
-      await this.writeQueue.enqueue({
-        writePromise: () => writeFile(this.layers0Path, JSON.stringify(this.layers0))
-      });
-    }
+    await this.writeQueue.enqueue({
+      archiveKey: "3dSceneLayer.json.gz",
+      writePromise: () => writeFileForSlpk(this.layers0Path, JSON.stringify(this.layers0), "3dSceneLayer.json")
+    });
   }
   /**
    * Pack files into *.slpk archive
@@ -4681,17 +4639,15 @@ var I3SConverter = class {
    */
   async _createSlpk(tilesetPath) {
     await this.conversionDump.deleteDumpFile();
-    if (this.options.slpk) {
-      const slpkTilesetPath = (0, import_path7.join)(tilesetPath, "SceneServer", "layers", "0");
-      const slpkFileName = `${tilesetPath}.slpk`;
-      await (0, import_zip2.createZip)(slpkTilesetPath, slpkFileName, async (fileList) => ({
-        path: "@specialIndexFileHASH128@",
-        file: await (0, import_zip2.composeHashFile)(fileList)
-      }));
-      try {
-        await removeDir(tilesetPath);
-      } catch (e) {
-      }
+    const slpkTilesetPath = (0, import_path7.join)(tilesetPath, "SceneServer", "layers", "0");
+    const slpkFileName = `${tilesetPath}.slpk`;
+    await (0, import_zip2.createZip)(slpkTilesetPath, slpkFileName, async (fileList) => ({
+      path: "@specialIndexFileHASH128@",
+      file: await (0, import_zip2.composeHashFile)(fileList)
+    }));
+    try {
+      await removeDir(tilesetPath);
+    } catch (e) {
     }
   }
   /**
@@ -4928,9 +4884,9 @@ var I3SConverter = class {
       propertyTable,
       featuresHashArray: this.featuresHashArray,
       attributeStorageInfo: this.attributeMetadataInfo.attributeStorageInfo,
-      draco: this.options.draco,
+      draco: this.options.draco ?? false,
       generateBoundingVolumes: this.generateBoundingVolumes,
-      shouldMergeMaterials: this.options.mergeMaterials,
+      shouldMergeMaterials: this.options.mergeMaterials ?? false,
       geoidHeightModel: this.geoidHeightModel,
       libraries: this.loadOptions.modules,
       metadataClass: this.options.metadataClass
@@ -5057,45 +5013,25 @@ var I3SConverter = class {
       return;
     }
     this.conversionDump.updateDoneStatus(sourceId, nodeId, ResourceType.GEOMETRY, false);
-    if (this.options.slpk) {
-      const slpkGeometryPath = (0, import_path7.join)(childPath, "geometries");
-      await this.writeQueue.enqueue({
-        archiveKey: `${slpkChildPath}/geometries/0.bin.gz`,
-        sourceId,
-        outputId: nodeId,
-        resourceType: ResourceType.GEOMETRY,
-        writePromise: () => writeFileForSlpk(slpkGeometryPath, geometryBuffer, "0.bin")
-      });
-    } else {
-      const geometryPath = (0, import_path7.join)(childPath, "geometries/0/");
+    const slpkGeometryPath = (0, import_path7.join)(childPath, "geometries");
+    await this.writeQueue.enqueue({
+      archiveKey: `${slpkChildPath}/geometries/0.bin.gz`,
+      sourceId,
+      outputId: nodeId,
+      resourceType: ResourceType.GEOMETRY,
+      writePromise: () => writeFileForSlpk(slpkGeometryPath, geometryBuffer, "0.bin")
+    });
+    if (this.options.draco && compressedGeometry) {
+      this.conversionDump.updateDoneStatus(sourceId, nodeId, ResourceType.DRACO_GEOMETRY, false);
+      const slpkCompressedGeometryPath = (0, import_path7.join)(childPath, "geometries");
       await this.writeQueue.enqueue({
+        archiveKey: `${slpkChildPath}/geometries/1.bin.gz`,
         sourceId,
         outputId: nodeId,
-        resourceType: ResourceType.GEOMETRY,
-        writePromise: () => writeFile(geometryPath, geometryBuffer, "index.bin")
+        resourceType: ResourceType.DRACO_GEOMETRY,
+        writePromise: () => writeFileForSlpk(slpkCompressedGeometryPath, compressedGeometry, "1.bin")
       });
     }
-    if (this.options.draco && compressedGeometry) {
-      this.conversionDump.updateDoneStatus(sourceId, nodeId, ResourceType.DRACO_GEOMETRY, false);
-      if (this.options.slpk) {
-        const slpkCompressedGeometryPath = (0, import_path7.join)(childPath, "geometries");
-        await this.writeQueue.enqueue({
-          archiveKey: `${slpkChildPath}/geometries/1.bin.gz`,
-          sourceId,
-          outputId: nodeId,
-          resourceType: ResourceType.DRACO_GEOMETRY,
-          writePromise: () => writeFileForSlpk(slpkCompressedGeometryPath, compressedGeometry, "1.bin")
-        });
-      } else {
-        const compressedGeometryPath = (0, import_path7.join)(childPath, "geometries/1/");
-        await this.writeQueue.enqueue({
-          sourceId,
-          outputId: nodeId,
-          resourceType: ResourceType.DRACO_GEOMETRY,
-          writePromise: () => writeFile(compressedGeometryPath, compressedGeometry, "index.bin")
-        });
-      }
-    }
   }
   /**
    * Write shared resources in a file
@@ -5114,24 +5050,14 @@ var I3SConverter = class {
     const sharedData = (0, import_json_map_transform8.default)(sharedResources, SHARED_RESOURCES());
     const sharedDataStr = JSON.stringify(sharedData);
     this.conversionDump.updateDoneStatus(sourceId, nodeId, ResourceType.SHARED, false);
-    if (this.options.slpk) {
-      const slpkSharedPath = (0, import_path7.join)(childPath, "shared");
-      await this.writeQueue.enqueue({
-        archiveKey: `${slpkChildPath}/shared/sharedResource.json.gz`,
-        sourceId,
-        outputId: nodeId,
-        resourceType: ResourceType.SHARED,
-        writePromise: () => writeFileForSlpk(slpkSharedPath, sharedDataStr, "sharedResource.json")
-      });
-    } else {
-      const sharedPath = (0, import_path7.join)(childPath, "shared/");
-      await this.writeQueue.enqueue({
-        sourceId,
-        outputId: nodeId,
-        resourceType: ResourceType.SHARED,
-        writePromise: () => writeFile(sharedPath, sharedDataStr)
-      });
-    }
+    const slpkSharedPath = (0, import_path7.join)(childPath, "shared");
+    await this.writeQueue.enqueue({
+      archiveKey: `${slpkChildPath}/shared/sharedResource.json.gz`,
+      sourceId,
+      outputId: nodeId,
+      resourceType: ResourceType.SHARED,
+      writePromise: () => writeFileForSlpk(slpkSharedPath, sharedDataStr, "sharedResource.json")
+    });
   }
   /**
    * Generates textures based on texture mime type and fill in textureSetDefinitions data.
@@ -5243,25 +5169,15 @@ var I3SConverter = class {
    * @param nodeId
    */
   async writeTextureFile({ textureData, name, format, childPath, slpkChildPath, sourceId, nodeId }) {
-    if (this.options.slpk) {
-      const slpkTexturePath = (0, import_path7.join)(childPath, "textures");
-      const compress = false;
-      await this.writeQueue.enqueue({
-        archiveKey: `${slpkChildPath}/textures/${name}.${format}`,
-        sourceId,
-        outputId: nodeId,
-        resourceType: `${ResourceType.TEXTURE}/${format}`,
-        writePromise: () => writeFileForSlpk(slpkTexturePath, textureData, `${name}.${format}`, compress)
-      });
-    } else {
-      const texturePath = (0, import_path7.join)(childPath, `textures/${name}/`);
-      await this.writeQueue.enqueue({
-        sourceId,
-        outputId: nodeId,
-        resourceType: `${ResourceType.TEXTURE}/${format}`,
-        writePromise: () => writeFile(texturePath, textureData, `index.${format}`)
-      });
-    }
+    const slpkTexturePath = (0, import_path7.join)(childPath, "textures");
+    const compress = false;
+    await this.writeQueue.enqueue({
+      archiveKey: `${slpkChildPath}/textures/${name}.${format}`,
+      sourceId,
+      outputId: nodeId,
+      resourceType: `${ResourceType.TEXTURE}/${format}`,
+      writePromise: () => writeFileForSlpk(slpkTexturePath, textureData, `${name}.${format}`, compress)
+    });
   }
   /**
    * Write feature attributes in files
@@ -5278,24 +5194,14 @@ var I3SConverter = class {
         const folderName = this.attributeMetadataInfo.attributeStorageInfo[index].key;
         const fileBuffer = new Uint8Array(attributes[index]);
         this.conversionDump.updateDoneStatus(sourceId, nodeId, `${ResourceType.ATTRIBUTES}/${folderName}`, false);
-        if (this.options.slpk) {
-          const slpkAttributesPath = (0, import_path7.join)(childPath, "attributes", folderName);
-          await this.writeQueue.enqueue({
-            archiveKey: `${slpkChildPath}/attributes/${folderName}.bin.gz`,
-            sourceId,
-            outputId: nodeId,
-            resourceType: `${ResourceType.ATTRIBUTES}/${folderName}`,
-            writePromise: () => writeFileForSlpk(slpkAttributesPath, fileBuffer, "0.bin")
-          });
-        } else {
-          const attributesPath = (0, import_path7.join)(childPath, `attributes/${folderName}/0`);
-          await this.writeQueue.enqueue({
-            sourceId,
-            outputId: nodeId,
-            resourceType: `${ResourceType.ATTRIBUTES}/${folderName}`,
-            writePromise: () => writeFile(attributesPath, fileBuffer, "index.bin")
-          });
-        }
+        const slpkAttributesPath = (0, import_path7.join)(childPath, "attributes", folderName);
+        await this.writeQueue.enqueue({
+          archiveKey: `${slpkChildPath}/attributes/${folderName}.bin.gz`,
+          sourceId,
+          outputId: nodeId,
+          resourceType: `${ResourceType.ATTRIBUTES}/${folderName}`,
+          writePromise: () => writeFileForSlpk(slpkAttributesPath, fileBuffer, "0.bin")
+        });
       }
     }
   }
@@ -5371,7 +5277,7 @@ var I3SConverter = class {
   async _finishConversion(params) {
     const { tilesCount, tilesWithAddRefineCount } = this.refinementCounter;
     const addRefinementPercentage = tilesWithAddRefineCount ? tilesWithAddRefineCount / tilesCount * 100 : 0;
-    const filesSize = await calculateFilesSize(params);
+    const filesSize = await calculateDatasetSize(params);
     const diff = import_process4.default.hrtime(this.conversionStartTime);
     const conversionTime = timeConverter(diff);
     console.log("------------------------------------------------");
@@ -5392,7 +5298,7 @@ var I3SConverter = class {
     const options = {
       "cesium-ion": { accessToken: this.options.token || ION_DEFAULT_TOKEN }
     };
-    const preloadOptions = await this.Loader.preload(this.options.inputUrl, options);
+    const preloadOptions = await this.Loader.preload(this.options.inputUrl ?? "", options);
     this.refreshTokenTime = import_process4.default.hrtime();
     return { ...options, ...preloadOptions };
   }
@@ -5859,15 +5765,16 @@ async function getNodeCount(fileSystem) {
   if (!(fileSystem == null ? void 0 : fileSystem.fileProvider)) {
     return 0;
   }
-  let count = 0;
+  const nodeSet = /* @__PURE__ */ new Set();
   const filesIterator = (0, import_zip3.makeZipCDHeaderIterator)(fileSystem.fileProvider);
   for await (const file of filesIterator) {
     const filename = file.fileName;
-    if (filename.indexOf("3dNodeIndexDocument.json.gz") >= 0) {
-      count++;
+    const nodeNumberSearchResult = /^nodes\/(\d+)\//.exec(filename);
+    if (nodeNumberSearchResult) {
+      nodeSet.add(nodeNumberSearchResult[1]);
     }
   }
-  return count;
+  return nodeSet.size;
 }
 
 // dist/3d-tiles-converter/3d-tiles-converter.js
@@ -6207,7 +6114,7 @@ var Tiles3DConverter = class {
    * @param params - output files data
    */
   async _finishConversion(params) {
-    const filesSize = await calculateFilesSize(params);
+    const filesSize = await calculateDatasetSize(params);
     const diff = import_process5.default.hrtime(this.conversionStartTime);
     const conversionTime = timeConverter(diff);
     console.log(`------------------------------------------------`);