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

package/dist/lib/utils/statistic-utils.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Converts time value to string.
+ * @param time - high-resolution real time in a [seconds, nanoseconds] tuple Array, or a value on milliseconds.
+ * @returns string representation of the time
+ */
+export declare function timeConverter(time: number | [number, number]): string;
+/**
+ * Calculates overall datatset size
+ * @param params - params object
+ * @param params.slpk - if dataset is in slpk format
+ * @param params.outputPath - path to the folder containing the dataset
+ * @param params.tilesetName - tileset name
+ * @returns dataset size in bytes
+ */
+export declare function calculateDatasetSize(params: {
+    slpk?: boolean;
+    outputPath: string;
+    tilesetName: string;
+}): Promise<number | null>;
+//# sourceMappingURL=statistic-utils.d.ts.map

package/dist/lib/utils/statistic-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"statistic-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/statistic-utils.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAarE;AA6BD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkBzB"}

package/dist/lib/utils/{statistic-utills.js → statistic-utils.js}

@@ -41,16 +41,48 @@ function timeConverterFromSecondsAndMilliseconds(timeInSeconds, milliseconds) {
     }
     return result;
 }
-export async function calculateFilesSize(params) {
-    const { outputPath, tilesetName } = params;
+/**
+ * Calculates overall datatset size
+ * @param params - params object
+ * @param params.slpk - if dataset is in slpk format
+ * @param params.outputPath - path to the folder containing the dataset
+ * @param params.tilesetName - tileset name
+ * @returns dataset size in bytes
+ */
+export async function calculateDatasetSize(params) {
+    const { slpk, outputPath, tilesetName } = params;
     const fullOutputPath = getAbsoluteFilePath(outputPath);
     try {
-        const slpkPath = join(fullOutputPath, `${tilesetName}.slpk`);
-        const stat = await fs.stat(slpkPath);
-        return stat.size;
+        if (slpk) {
+            const slpkPath = join(fullOutputPath, `${tilesetName}.slpk`);
+            const stat = await fs.stat(slpkPath);
+            return stat.size;
+        }
+        const directoryPath = join(fullOutputPath, tilesetName);
+        const totalSize = await getDirectorySize(directoryPath);
+        return totalSize;
     }
     catch (error) {
         console.log('Calculate file sizes error: ', error); // eslint-disable-line
         return null;
     }
 }
+/**
+ * Calculates directory size
+ * @param dirPath - path to the directory
+ * @returns directory size in bytes
+ */
+async function getDirectorySize(dirPath) {
+    let totalFileSize = 0;
+    const files = await fs.readdir(dirPath);
+    for (const file of files) {
+        const fileStat = await fs.stat(join(dirPath, file));
+        if (fileStat.isDirectory()) {
+            totalFileSize += await getDirectorySize(join(dirPath, file));
+        }
+        else {
+            totalFileSize += fileStat.size;
+        }
+    }
+    return totalFileSize;
+}

package/dist/pgm-loader.js

@@ -1,7 +1,7 @@
 import { Geoid, parsePGM } from '@math.gl/geoid';
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
-const VERSION = typeof "4.3.0-alpha.4" !== 'undefined' ? "4.3.0-alpha.4" : 'latest';
+const VERSION = typeof "4.3.0-alpha.5" !== 'undefined' ? "4.3.0-alpha.5" : 'latest';
 export { Geoid };
 /**
  * Loader for PGM - Netpbm grayscale image format

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.3.0-alpha.5",
+  "version": "4.3.0-alpha.6",
   "description": "Converter",
   "license": "MIT",
   "type": "module",
@@ -51,20 +51,20 @@
     "copy-certificates": "cp -R src/i3s-server/certs dist/i3s-server"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.3.0-alpha.5",
-    "@loaders.gl/compression": "4.3.0-alpha.5",
-    "@loaders.gl/crypto": "4.3.0-alpha.5",
-    "@loaders.gl/draco": "4.3.0-alpha.5",
-    "@loaders.gl/gltf": "4.3.0-alpha.5",
-    "@loaders.gl/i3s": "4.3.0-alpha.5",
-    "@loaders.gl/images": "4.3.0-alpha.5",
-    "@loaders.gl/loader-utils": "4.3.0-alpha.5",
-    "@loaders.gl/math": "4.3.0-alpha.5",
-    "@loaders.gl/polyfills": "4.3.0-alpha.5",
-    "@loaders.gl/textures": "4.3.0-alpha.5",
-    "@loaders.gl/tiles": "4.3.0-alpha.5",
-    "@loaders.gl/worker-utils": "4.3.0-alpha.5",
-    "@loaders.gl/zip": "4.3.0-alpha.5",
+    "@loaders.gl/3d-tiles": "4.3.0-alpha.6",
+    "@loaders.gl/compression": "4.3.0-alpha.6",
+    "@loaders.gl/crypto": "4.3.0-alpha.6",
+    "@loaders.gl/draco": "4.3.0-alpha.6",
+    "@loaders.gl/gltf": "4.3.0-alpha.6",
+    "@loaders.gl/i3s": "4.3.0-alpha.6",
+    "@loaders.gl/images": "4.3.0-alpha.6",
+    "@loaders.gl/loader-utils": "4.3.0-alpha.6",
+    "@loaders.gl/math": "4.3.0-alpha.6",
+    "@loaders.gl/polyfills": "4.3.0-alpha.6",
+    "@loaders.gl/textures": "4.3.0-alpha.6",
+    "@loaders.gl/tiles": "4.3.0-alpha.6",
+    "@loaders.gl/worker-utils": "4.3.0-alpha.6",
+    "@loaders.gl/zip": "4.3.0-alpha.6",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geoid": "^4.0.0",
@@ -93,5 +93,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "b57553345b3cbf621c95ad9b22aa672217451f61"
+  "gitHead": "315f2e232fc4e6a477c41de800a54d3e3d957e8c"
 }

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

@@ -17,7 +17,7 @@ import {PGMLoader} from '../pgm-loader';
 import {i3sObbTo3dTilesObb} from './helpers/i3s-obb-to-3d-tiles-obb';
 import {convertScreenThresholdToGeometricError} from '../lib/utils/lod-conversion-utils';
 import {writeFile, removeDir} from '../lib/utils/file-utils';
-import {calculateFilesSize, timeConverter} from '../lib/utils/statistic-utills';
+import {calculateDatasetSize, timeConverter} from '../lib/utils/statistic-utils';
 import {TILESET as tilesetTemplate} from './json-templates/tileset';
 import {createObbFromMbs} from '../i3s-converter/helpers/coordinate-converter';
 import {WorkerFarm} from '@loaders.gl/worker-utils';
@@ -475,7 +475,7 @@ export default class Tiles3DConverter {
     outputPath: string;
     tilesetName: string;
   }): Promise<void> {
-    const filesSize = await calculateFilesSize(params);
+    const filesSize = await calculateDatasetSize(params);
     const diff = process.hrtime(this.conversionStartTime);
     const conversionTime = timeConverter(diff);
 

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

@@ -115,13 +115,14 @@ export async function getNodeCount(fileSystem: ZipFileSystem | null): Promise<nu
   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/src/converter-cli.ts

@@ -31,11 +31,10 @@ type TileConversionOptions = {
   /** Try to merge similar materials to be able to merge meshes into one node (I3S to 3DTiles conversion only) */
   mergeMaterials: boolean;
   /** location of the Earth Gravity Model (*.pgm) file to convert heights from ellipsoidal to gravity-related format,
+   * "None" for not using Earth Gravity Model (*.pgm)
    * default: "./deps/egm2008-5.pgm". A model file can be loaded from GeographicLib
    * https://geographiclib.sourceforge.io/html/geoid.html */
   egm: string;
-  /** 3DTiles->I3S only. Whether the converter uses Earth Gravity Model (*.pgm) */
-  noEgm: boolean;
   /** 3DTile->I3S only. Token for Cesium ION tileset authentication. */
   token?: string;
   /** 3DTiles->I3S only. Enable draco compression for geometry. Default: true */
@@ -179,9 +178,8 @@ function printHelp(): void {
   );
   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"'
+    '--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('--no-egm [Disable Geod transformation via the EGM file]');
   console.log('--token [Token for Cesium ION tilesets authentication]');
   console.log('--no-draco [Disable draco compression for geometry]');
   console.log(
@@ -311,8 +309,7 @@ function parseOptions(args: string[]): TileConversionOptions {
     generateBoundingVolumes: false,
     validate: false,
     addHash: false,
-    quiet: false,
-    noEgm: false
+    quiet: false
   };
 
   // eslint-disable-next-line complexity
@@ -346,9 +343,6 @@ function parseOptions(args: string[]): TileConversionOptions {
         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;

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

@@ -1,5 +1,5 @@
 import process from 'process';
-import {timeConverter} from '../../lib/utils/statistic-utills';
+import {timeConverter} from '../../lib/utils/statistic-utils';
 
 /** Defines a threshold that is used to check if the process velocity can be consifered trust. */
 const THRESHOLD_DEFAULT = 0.2;

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

@@ -32,7 +32,7 @@ import md5 from 'md5';
 import NodePages from './helpers/node-pages';
 import {writeFile, removeDir, writeFileForSlpk, removeFile} from '../lib/utils/file-utils';
 import {compressFileWithGzip} from '../lib/utils/compress-util';
-import {calculateFilesSize, timeConverter} from '../lib/utils/statistic-utills';
+import {calculateDatasetSize, timeConverter} from '../lib/utils/statistic-utils';
 import convertB3dmToI3sGeometry, {getPropertyTable} from './helpers/geometry-converter';
 import {
   createBoundingVolumes,
@@ -107,7 +107,6 @@ type ConverterProps = {
   inquirer?: {prompt: PromptModule};
   metadataClass?: string;
   analyze?: boolean;
-  noEgm?: boolean;
 };
 
 /**
@@ -224,8 +223,7 @@ export default class I3SConverter {
       mergeMaterials = true,
       inquirer,
       metadataClass,
-      analyze = false,
-      noEgm = false
+      analyze = false
     } = options;
     this.options = {
       outputPath,
@@ -250,8 +248,8 @@ export default class I3SConverter {
     this.writeQueue = new WriteQueue(this.conversionDump);
     this.writeQueue.startListening();
 
-    if (!noEgm) {
-      console.log('--no-egm option selected, skip loading egm file'); // eslint-disable-line
+    if (egmFilePath.toLowerCase() === 'none') {
+      console.log('--egm chousen to be "none", skip loading egm file'); // eslint-disable-line
     } else {
       console.log('Loading egm file...'); // eslint-disable-line
       this.geoidHeightModel = await load(egmFilePath, PGMLoader);
@@ -1528,7 +1526,7 @@ export default class I3SConverter {
     const addRefinementPercentage = tilesWithAddRefineCount
       ? (tilesWithAddRefineCount / tilesCount) * 100
       : 0;
-    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 no-undef, no-console

package/src/lib/utils/{statistic-utills.ts → statistic-utils.ts}

@@ -49,16 +49,55 @@ function timeConverterFromSecondsAndMilliseconds(timeInSeconds: number, millisec
   return result;
 }
 
-export async function calculateFilesSize(params: {outputPath: string; tilesetName: string}) {
-  const {outputPath, tilesetName} = params;
+/**
+ * Calculates overall datatset size
+ * @param params - params object
+ * @param params.slpk - if dataset is in slpk format
+ * @param params.outputPath - path to the folder containing the dataset
+ * @param params.tilesetName - tileset name
+ * @returns dataset size in bytes
+ */
+export async function calculateDatasetSize(params: {
+  slpk?: boolean;
+  outputPath: string;
+  tilesetName: string;
+}): Promise<number | null> {
+  const {slpk, outputPath, tilesetName} = params;
   const fullOutputPath = getAbsoluteFilePath(outputPath);
 
   try {
-    const slpkPath = join(fullOutputPath, `${tilesetName}.slpk`);
-    const stat = await fs.stat(slpkPath);
-    return stat.size;
+    if (slpk) {
+      const slpkPath = join(fullOutputPath, `${tilesetName}.slpk`);
+      const stat = await fs.stat(slpkPath);
+      return stat.size;
+    }
+
+    const directoryPath = join(fullOutputPath, tilesetName);
+    const totalSize = await getDirectorySize(directoryPath);
+    return totalSize;
   } catch (error) {
     console.log('Calculate file sizes error: ', error); // eslint-disable-line
     return null;
   }
 }
+
+/**
+ * Calculates directory size
+ * @param dirPath - path to the directory
+ * @returns directory size in bytes
+ */
+async function getDirectorySize(dirPath: string): Promise<number> {
+  let totalFileSize = 0;
+
+  const files = await fs.readdir(dirPath);
+
+  for (const file of files) {
+    const fileStat = await fs.stat(join(dirPath, file));
+    if (fileStat.isDirectory()) {
+      totalFileSize += await getDirectorySize(join(dirPath, file));
+    } else {
+      totalFileSize += fileStat.size;
+    }
+  }
+  return totalFileSize;
+}

package/dist/lib/utils/statistic-utills.d.ts

@@ -1,11 +0,0 @@
-/**
- * Converts time value to string.
- * @param time - high-resolution real time in a [seconds, nanoseconds] tuple Array, or a value on milliseconds.
- * @returns string representation of the time
- */
-export declare function timeConverter(time: number | [number, number]): string;
-export declare function calculateFilesSize(params: {
-    outputPath: string;
-    tilesetName: string;
-}): Promise<number | null>;
-//# sourceMappingURL=statistic-utills.d.ts.map

package/dist/lib/utils/statistic-utills.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"statistic-utills.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/statistic-utills.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAarE;AA6BD,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAC,0BAYzF"}