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

package/dist/index.cjs

@@ -3134,6 +3134,7 @@ function isAllVerticesInsideBoundingVolume(boundingVolume, positions) {
 
 // src/i3s-converter/i3s-converter.ts
 var import_textures = require("@loaders.gl/textures");
+var import_loader_utils4 = require("@loaders.gl/loader-utils");
 var import_images = require("@loaders.gl/images");
 var import_worker_utils2 = require("@loaders.gl/worker-utils");
 
@@ -3903,6 +3904,7 @@ var Progress = class {
 };
 
 // src/i3s-converter/i3s-converter.ts
+var import_zip = require("@loaders.gl/zip");
 var _a;
 var ION_DEFAULT_TOKEN = (_a = import_process3.default.env) == null ? void 0 : _a.IonToken;
 var HARDCODED_NODES_PER_PAGE = 64;
@@ -4296,6 +4298,8 @@ var I3SConverter = class {
         ".",
         this.options.sevenZipExe
       );
+      const hashTable = await (0, import_zip.composeHashFile)(new import_loader_utils4.FileHandleFile(slpkFileName));
+      await (0, import_zip.addOneFile)(slpkFileName, hashTable, "@specialIndexFileHASH128@");
       try {
         await removeDir(tilesetPath);
       } catch (e) {

package/dist/pgm-loader.js

@@ -1,5 +1,5 @@
 import { Geoid, parsePGM } from '@math.gl/geoid';
-const VERSION = typeof "4.1.0-alpha.4" !== 'undefined' ? "4.1.0-alpha.4" : 'latest';
+const VERSION = typeof "4.1.0-alpha.6" !== 'undefined' ? "4.1.0-alpha.6" : 'latest';
 export { Geoid };
 export const PGMLoader = {
   name: 'PGM - Netpbm grayscale image format',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.1.0-alpha.4",
+  "version": "4.1.0-alpha.6",
   "description": "Converter",
   "license": "MIT",
   "type": "module",
@@ -52,18 +52,18 @@
     "build-i3s-server-bundle": "esbuild src/i3s-server/bin/www.ts --outfile=dist/i3s-server/bin/i3s-server.min.cjs --platform=node --target=esnext,node14 --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.1.0-alpha.4",
-    "@loaders.gl/crypto": "4.1.0-alpha.4",
-    "@loaders.gl/draco": "4.1.0-alpha.4",
-    "@loaders.gl/gltf": "4.1.0-alpha.4",
-    "@loaders.gl/i3s": "4.1.0-alpha.4",
-    "@loaders.gl/images": "4.1.0-alpha.4",
-    "@loaders.gl/loader-utils": "4.1.0-alpha.4",
-    "@loaders.gl/polyfills": "4.1.0-alpha.4",
-    "@loaders.gl/textures": "4.1.0-alpha.4",
-    "@loaders.gl/tiles": "4.1.0-alpha.4",
-    "@loaders.gl/worker-utils": "4.1.0-alpha.4",
-    "@loaders.gl/zip": "4.1.0-alpha.4",
+    "@loaders.gl/3d-tiles": "4.1.0-alpha.6",
+    "@loaders.gl/crypto": "4.1.0-alpha.6",
+    "@loaders.gl/draco": "4.1.0-alpha.6",
+    "@loaders.gl/gltf": "4.1.0-alpha.6",
+    "@loaders.gl/i3s": "4.1.0-alpha.6",
+    "@loaders.gl/images": "4.1.0-alpha.6",
+    "@loaders.gl/loader-utils": "4.1.0-alpha.6",
+    "@loaders.gl/polyfills": "4.1.0-alpha.6",
+    "@loaders.gl/textures": "4.1.0-alpha.6",
+    "@loaders.gl/tiles": "4.1.0-alpha.6",
+    "@loaders.gl/worker-utils": "4.1.0-alpha.6",
+    "@loaders.gl/zip": "4.1.0-alpha.6",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geoid": "^4.0.0",
@@ -87,7 +87,7 @@
     "join-images": "^1.1.3",
     "sharp": "^0.31.3"
   },
-  "gitHead": "b18ba1d63be704fd021e4470e8ab84175621e62d",
+  "gitHead": "fd58d91e05ebfd89ab8998a87157bf07c43997a5",
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/node": "^20.4.2"

package/src/converter-cli.ts

@@ -11,6 +11,9 @@ import {
   getURLValue,
   validateOptionsWithEqual
 } from './lib/utils/cli-utils';
+import {addOneFile, composeHashFile} from '@loaders.gl/zip';
+import {FileHandleFile} from '@loaders.gl/loader-utils';
+import {copyFile} from 'node:fs/promises';
 
 type TileConversionOptions = {
   /** "I3S" - for I3S to 3DTiles conversion, "3DTILES" for 3DTiles to I3S conversion */
@@ -50,6 +53,8 @@ type TileConversionOptions = {
   maxDepth?: number;
   /** 3DTiles->I3S only. Whether the converter generates *.slpk (Scene Layer Package) I3S output file */
   slpk: boolean;
+  /** adds hash file to the slpk if there's no one */
+  addHash: boolean;
   /** Feature metadata class from EXT_FEATURE_METADATA or EXT_STRUCTURAL_METADATA extensions  */
   metadataClass?: string;
   /** With this options the tileset content will be analyzed without conversion */
@@ -92,6 +97,48 @@ async function main() {
     return;
   }
 
+  if (options.addHash) {
+    const validatedOptions = validateOptions(options, true);
+    let finalPath = validatedOptions.tileset;
+    if (validatedOptions.output === 'data') {
+      const nameWithoutExt = validatedOptions.tileset.substring(
+        0,
+        validatedOptions.tileset.length - 5
+      );
+
+      const result = await inquirer.prompt<{isNewFileRequired: boolean}>([
+        {
+          name: 'isNewFileRequired',
+          type: 'list',
+          message: 'What would you like to do?',
+          choices: [
+            {
+              name: 'Add hash file to the current SLPK file',
+              value: false
+            },
+            {
+              name: `Create a new file ${nameWithoutExt}-hash.slpk with hash file inside`,
+              value: true
+            }
+          ]
+        }
+      ]);
+
+      if (result.isNewFileRequired) {
+        finalPath = `${nameWithoutExt}-hash.slpk`;
+      }
+    } else {
+      finalPath = validatedOptions.output;
+    }
+    if (finalPath !== validatedOptions.tileset) {
+      await copyFile(validatedOptions.tileset, finalPath);
+    }
+    const hashTable = await composeHashFile(new FileHandleFile(finalPath));
+    await addOneFile(finalPath, hashTable, '@specialIndexFileHASH128@');
+
+    return;
+  }
+
   const validatedOptions: ValidatedTileConversionOptions = validateOptions(options);
 
   await convert(validatedOptions);
@@ -199,7 +246,10 @@ async function convert(options: ValidatedTileConversionOptions) {
  * @param options - input options of the CLI command
  * @returns validated options
  */
-function validateOptions(options: TileConversionOptions): ValidatedTileConversionOptions {
+function validateOptions(
+  options: TileConversionOptions,
+  addHash?: boolean
+): ValidatedTileConversionOptions {
   const mandatoryOptionsWithExceptions: {
     [key: string]: {
       getMessage: () => void;
@@ -208,7 +258,7 @@ function validateOptions(options: TileConversionOptions): ValidatedTileConversio
   } = {
     name: {
       getMessage: () => console.log('Missed: --name [Tileset name]'),
-      condition: (value: any) => Boolean(value) || Boolean(options.analyze)
+      condition: (value: any) => 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]')},
@@ -218,7 +268,7 @@ function validateOptions(options: TileConversionOptions): ValidatedTileConversio
       getMessage: () =>
         console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]'),
       condition: (value) =>
-        Boolean(value) && Object.values(TILESET_TYPE).includes(value.toUpperCase())
+        addHash || (Boolean(value) && Object.values(TILESET_TYPE).includes(value.toUpperCase()))
     }
   };
   const exceptions: (() => void)[] = [];
@@ -256,7 +306,8 @@ function parseOptions(args: string[]): TileConversionOptions {
     generateTextures: false,
     generateBoundingVolumes: false,
     validate: false,
-    slpk: false
+    slpk: false,
+    addHash: false
   };
 
   // eslint-disable-next-line complexity
@@ -287,6 +338,9 @@ function parseOptions(args: string[]): TileConversionOptions {
         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;

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

@@ -51,7 +51,7 @@ import {GEOMETRY_DEFINITION as geometryDefinitionTemlate} from './json-templates
 import {SHARED_RESOURCES as sharedResourcesTemplate} from './json-templates/shared-resources';
 import {validateNodeBoundingVolumes} from './helpers/node-debug';
 import {KTX2BasisWriterWorker} from '@loaders.gl/textures';
-import {LoaderWithParser} from '@loaders.gl/loader-utils';
+import {FileHandleFile, LoaderWithParser} from '@loaders.gl/loader-utils';
 import {I3SMaterialDefinition, TextureSetDefinitionFormats} from '@loaders.gl/i3s';
 import {ImageWriter} from '@loaders.gl/images';
 import {GLTFImagePostprocessed} from '@loaders.gl/gltf';
@@ -81,6 +81,7 @@ import {createBoundingVolume} from '@loaders.gl/tiles';
 import {TraversalConversionProps, traverseDatasetWith} from './helpers/tileset-traversal';
 import {analyzeTileContent, mergePreprocessData} from './helpers/preprocess-3d-tiles';
 import {Progress} from './helpers/progress';
+import {addOneFile, composeHashFile} from '@loaders.gl/zip';
 
 const ION_DEFAULT_TOKEN = process.env?.IonToken;
 const HARDCODED_NODES_PER_PAGE = 64;
@@ -564,6 +565,9 @@ export default class I3SConverter {
         this.options.sevenZipExe
       );
 
+      const hashTable = await composeHashFile(new FileHandleFile(slpkFileName));
+      await addOneFile(slpkFileName, hashTable, '@specialIndexFileHASH128@');
+
       // TODO: `addFileToZip` corrupts archive so it can't be validated with windows i3s_converter.exe
       // const fileHash128Path = `${tilesetPath}/@specialIndexFileHASH128@`;
       // try {