@loaders.gl/tile-converter 4.3.0-alpha.5 → 4.3.0-alpha.7

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

@@ -88,8 +88,7 @@ function printHelp() {
     console.log('--split-nodes [Prevent to merge similar materials that could lead to incorrect visualization (I3S to 3DTiles conversion only)]');
     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('--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]');
@@ -198,8 +197,7 @@ function parseOptions(args) {
         generateBoundingVolumes: false,
         validate: false,
         addHash: false,
-        quiet: false,
-        noEgm: false
+        quiet: false
     };
     // eslint-disable-next-line complexity
     args.forEach((arg, index) => {
@@ -232,9 +230,6 @@ function parseOptions(args) {
                 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;