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

package/dist/3d-tiles-converter/3d-tiles-converter.d.ts

@@ -4,6 +4,7 @@ import { I3SLoaderOptions } from '@loaders.gl/i3s/src/i3s-loader';
 import { ZipFileSystem } from "../../../zip/src.js";
 import { ConversionDump } from "../lib/utils/conversion-dump.js";
 import { Progress } from "../i3s-converter/helpers/progress.js";
+import { PromptModule } from 'inquirer';
 /**
  * Converter from i3s to 3d-tiles
  */
@@ -38,7 +39,9 @@ export default class Tiles3DConverter {
         tilesetName: string;
         maxDepth?: number;
         egmFilePath: string;
-        inquirer?: Promise<unknown>;
+        inquirer?: {
+            prompt: PromptModule;
+        };
         analyze?: boolean;
     }): Promise<string | undefined>;
     /**

package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAGpB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAcrC,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAC/C,OAAO,EAAC,cAAc,EAAwB,wCAAqC;AACnF,OAAO,EAAC,QAAQ,EAAC,6CAA0C;AAI3D;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACvC,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC;IACrD,YAAY,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;IAC3C,cAAc,EAAE,aAAa,GAAG,IAAI,CAAQ;IAC5C,aAAa,EAAE,gBAAgB,CAU7B;IACF,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;;IAenB;;;;;;;;OAQG;IAEU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAoG/B;;;OAGG;YACW,oBAAoB;IA8BlC;;;;;;OAMG;YAEW,gBAAgB;IAyE9B;;;;;OAKG;YACW,YAAY;IAa1B;;;;;OAKG;YACW,cAAc;IA4B5B;;;;OAIG;IACH,OAAO,CAAC,6BAA6B;IAsBrC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;OAKG;YACW,oBAAoB;IAsBlC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;OAGG;YACW,iBAAiB;CAgBhC"}
+{"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAGpB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAcrC,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAC/C,OAAO,EAAC,cAAc,EAAwB,wCAAqC;AACnF,OAAO,EAAC,QAAQ,EAAC,6CAA0C;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAItC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACvC,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC;IACrD,YAAY,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;IAC3C,cAAc,EAAE,aAAa,GAAG,IAAI,CAAQ;IAC5C,aAAa,EAAE,gBAAgB,CAU7B;IACF,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;;IAenB;;;;;;;;OAQG;IAEU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE;YAAC,MAAM,EAAE,YAAY,CAAA;SAAC,CAAC;QAClC,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAoG/B;;;OAGG;YACW,oBAAoB;IA8BlC;;;;;;OAMG;YAEW,gBAAgB;IAyE9B;;;;;OAKG;YACW,YAAY;IAa1B;;;;;OAKG;YACW,cAAc;IA4B5B;;;;OAIG;IACH,OAAO,CAAC,6BAA6B;IAsBrC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;OAKG;YACW,oBAAoB;IAsBlC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;OAGG;YACW,iBAAiB;CAgBhC"}

package/dist/3d-tiles-converter/3d-tiles-converter.js

@@ -7,7 +7,7 @@ import { PGMLoader } from "../pgm-loader.js";
 import { i3sObbTo3dTilesObb } from "./helpers/i3s-obb-to-3d-tiles-obb.js";
 import { convertScreenThresholdToGeometricError } from "../lib/utils/lod-conversion-utils.js";
 import { writeFile, removeDir } from "../lib/utils/file-utils.js";
-import { calculateFilesSize, timeConverter } from "../lib/utils/statistic-utills.js";
+import { calculateDatasetSize, timeConverter } from "../lib/utils/statistic-utils.js";
 import { TILESET as tilesetTemplate } from "./json-templates/tileset.js";
 import { createObbFromMbs } from "../i3s-converter/helpers/coordinate-converter.js";
 import { WorkerFarm } from '@loaders.gl/worker-utils';
@@ -371,7 +371,7 @@ export default class Tiles3DConverter {
      * @param params - output files data
      */
     async _finishConversion(params) {
-        const filesSize = await calculateFilesSize(params);
+        const filesSize = await calculateDatasetSize(params);
         const diff = process.hrtime(this.conversionStartTime);
         const conversionTime = timeConverter(diff);
         console.log(`------------------------------------------------`); // eslint-disable-line

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

@@ -1 +1 @@
-{"version":3,"file":"load-i3s.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/load-i3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAO,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,cAAc,EACd,aAAa,EACb,gBAAgB,EAEhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAC,CAAC;AAE5E;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,kBACV,gBAAgB,GAAG,IAAI,cAC1B,aAAa,sBACL,gBAAgB,kBACpB,aAAa,GAAG,IAAI,KACnC,QAAQ,cAAc,GAAG,IAAI,CAuC/B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAUzE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,aAAa,GAAG,IAAI,gBAUjC;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAapF"}
+{"version":3,"file":"load-i3s.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/load-i3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAO,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,cAAc,EACd,aAAa,EACb,gBAAgB,EAEhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAC,CAAC;AAE5E;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,kBACV,gBAAgB,GAAG,IAAI,cAC1B,aAAa,sBACL,gBAAgB,kBACpB,aAAa,GAAG,IAAI,KACnC,QAAQ,cAAc,GAAG,IAAI,CAuC/B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAUzE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,aAAa,GAAG,IAAI,gBAUjC;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAcpF"}

package/dist/3d-tiles-converter/helpers/load-i3s.js

@@ -85,13 +85,14 @@ export async function getNodeCount(fileSystem) {
     if (!fileSystem?.fileProvider) {
         return 0;
     }
-    let count = 0;
+    const nodeSet = new Set();
     const filesIterator = 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;
 }

package/dist/converter-cli.js

@@ -86,12 +86,9 @@ function printHelp() {
     console.log('--output [Output folder, default: "data" folder]');
     console.log('--instant-node-writing [Keep created 3DNodeIndexDocument files on disk instead of memory. This option reduce memory usage but decelerates conversion speed]');
     console.log('--split-nodes [Prevent to merge similar materials that could lead to incorrect visualization (I3S to 3DTiles conversion only)]');
-    console.log('--slpk [Generate slpk (Scene Layer Packages) I3S output file]');
     console.log('--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]');
     console.log('--input-type [tileset input type: I3S or 3DTILES]');
-    console.log('--7zExe [location of 7z.exe archiver to create slpk on Windows, default: "C:\\Program Files\\7-Zip\\7z.exe"]');
-    console.log('--egm [location of Earth Gravity Model *.pgm file to convert heights from ellipsoidal to gravity-related format. A model file can be loaded from GeographicLib https://geographiclib.sourceforge.io/html/geoid.html], default: "./deps/egm2008-5.zip"');
-    console.log('--no-egm [Disable Geod transformation via the EGM file]');
+    console.log('--egm [location of Earth Gravity Model *.pgm file to convert heights from ellipsoidal to gravity-related format or "None" to not use it. A model file can be loaded from GeographicLib https://geographiclib.sourceforge.io/html/geoid.html], default: "./deps/egm2008-5.zip"');
     console.log('--token [Token for Cesium ION tilesets authentication]');
     console.log('--no-draco [Disable draco compression for geometry]');
     console.log('--generate-textures [Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture if only KTX2 is provided]');
@@ -131,8 +128,6 @@ async function convert(options) {
                 outputPath: options.output,
                 tilesetName: options.name,
                 maxDepth: options.maxDepth,
-                slpk: options.slpk,
-                sevenZipExe: options.sevenZipExe,
                 egmFilePath: options.egm,
                 token: options.token,
                 draco: options.draco,
@@ -163,7 +158,6 @@ function validateOptions(options, addHash) {
             condition: (value) => addHash || Boolean(value) || Boolean(options.analyze)
         },
         output: { getMessage: () => console.log('Missed: --output [Output path name]') },
-        sevenZipExe: { getMessage: () => console.log('Missed: --7zExe [7z archiver executable path]') },
         egm: { getMessage: () => console.log('Missed: --egm [*.pgm earth gravity model file path]') },
         tileset: { getMessage: () => console.log('Missed: --tileset [tileset.json file]') },
         inputType: {
@@ -196,17 +190,14 @@ function parseOptions(args) {
         output: 'data',
         instantNodeWriting: false,
         mergeMaterials: true,
-        sevenZipExe: 'C:\\Program Files\\7-Zip\\7z.exe',
         egm: join(process.cwd(), 'deps', 'egm2008-5.pgm'),
         draco: true,
         installDependencies: false,
         generateTextures: false,
         generateBoundingVolumes: false,
         validate: false,
-        slpk: false,
         addHash: false,
-        quiet: false,
-        noEgm: false
+        quiet: false
     };
     // eslint-disable-next-line complexity
     args.forEach((arg, index) => {
@@ -233,21 +224,12 @@ function parseOptions(args) {
                 case '--max-depth':
                     opts.maxDepth = getIntegerValue(index, args);
                     break;
-                case '--slpk':
-                    opts.slpk = getBooleanValue(index, args);
-                    break;
                 case '--add-hash':
                     opts.addHash = getBooleanValue(index, args);
                     break;
-                case '--7zExe':
-                    opts.sevenZipExe = getStringValue(index, args);
-                    break;
                 case '--egm':
                     opts.egm = getStringValue(index, args);
                     break;
-                case '--no-egm':
-                    opts.noEgm = getBooleanValue(index, args);
-                    break;
                 case '--token':
                     opts.token = getStringValue(index, args);
                     break;