@loaders.gl/tile-converter 3.2.0-alpha.2 → 3.2.0

package/dist/i3s-converter/helpers/geometry-converter.js

@@ -234,15 +234,15 @@ function getCompositeTransformationMatrix(node, matrix) {
     if (nodeMatrix) {
         transformationMatrix = matrix.multiplyRight(nodeMatrix);
     }
+    if (translation) {
+        transformationMatrix = transformationMatrix.translate(translation);
+    }
     if (rotation) {
         transformationMatrix = transformationMatrix.rotateXYZ(rotation);
     }
     if (scale) {
         transformationMatrix = transformationMatrix.scale(scale);
     }
-    if (translation) {
-        transformationMatrix = transformationMatrix.translate(translation);
-    }
     return transformationMatrix;
 }
 /**

package/dist/i3s-converter/i3s-converter.d.ts

@@ -64,8 +64,6 @@ export default class I3SConverter {
         validate?: boolean;
         generateTextures?: boolean;
         generateBoundingVolumes?: boolean;
-        /** @deprecated */
-        inputType?: string;
     }): Promise<any>;
     /**
      * Convert and save the layer and embedded tiles

package/dist/i3s-converter/i3s-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-converter.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/i3s-converter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"i3s-converter.d.ts","sourceRoot":"","sources":["../../src/i3s-converter/i3s-converter.ts"],"names":[],"mappings":"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"}

package/dist/i3s-converter/i3s-converter.js

@@ -30,7 +30,8 @@ const worker_utils_1 = require("@loaders.gl/worker-utils");
 const draco_1 = require("@loaders.gl/draco");
 const write_queue_1 = __importDefault(require("../lib/utils/write-queue"));
 const i3s_attributes_worker_1 = require("../i3s-attributes-worker");
-const ION_DEFAULT_TOKEN = process_1.default.env.IonToken || // eslint-disable-line
+const constants_1 = require("../constants");
+const ION_DEFAULT_TOKEN = process_1.default.env?.IonToken || // eslint-disable-line
     'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJlYWMxMzcyYy0zZjJkLTQwODctODNlNi01MDRkZmMzMjIxOWIiLCJpZCI6OTYyMCwic2NvcGVzIjpbImFzbCIsImFzciIsImdjIl0sImlhdCI6MTU2Mjg2NjI3M30.1FNiClUyk00YH_nWfSGpiQAjR5V2OvREDq1PJ5QMjWQ'; // eslint-disable-line
 const HARDCODED_NODES_PER_PAGE = 64;
 const _3D_TILES = '3DTILES';
@@ -87,6 +88,10 @@ class I3SConverter {
      * @param options.validate -enable validation
      */
     async convert(options) {
+        if (core_1.isBrowser) {
+            console.log(constants_1.BROWSER_ERROR_MESSAGE);
+            return constants_1.BROWSER_ERROR_MESSAGE;
+        }
         this.conversionStartTime = process_1.default.hrtime();
         const { tilesetName, slpk, egmFilePath, inputUrl, validate, outputPath, draco, sevenZipExe, maxDepth, token, generateTextures, generateBoundingVolumes } = options;
         this.options = { maxDepth, slpk, sevenZipExe, egmFilePath, draco, token, inputUrl };
@@ -103,21 +108,28 @@ class I3SConverter {
             this.nodePages.useWriteFunction(file_utils_1.writeFileForSlpk);
         }
         await this.loadWorkers();
-        const preloadOptions = await this._fetchPreloadOptions();
-        const tilesetOptions = { loadOptions: { basis: { format: 'rgba32' } } };
-        if (preloadOptions.headers) {
-            tilesetOptions.loadOptions.fetch = { headers: preloadOptions.headers };
+        try {
+            const preloadOptions = await this._fetchPreloadOptions();
+            const tilesetOptions = { loadOptions: { basis: { format: 'rgba32' } } };
+            if (preloadOptions.headers) {
+                tilesetOptions.loadOptions.fetch = { headers: preloadOptions.headers };
+            }
+            Object.assign(tilesetOptions, preloadOptions);
+            const sourceTilesetJson = await (0, core_1.load)(inputUrl, this.Loader, tilesetOptions.loadOptions);
+            // console.log(tilesetJson); // eslint-disable-line
+            this.sourceTileset = new tiles_1.Tileset3D(sourceTilesetJson, tilesetOptions);
+            await this._createAndSaveTileset(outputPath, tilesetName);
+            await this._finishConversion({ slpk: Boolean(slpk), outputPath, tilesetName });
+            return sourceTilesetJson;
+        }
+        catch (error) {
+            throw error;
+        }
+        finally {
+            // Clean up worker pools
+            const workerFarm = worker_utils_1.WorkerFarm.getWorkerFarm({});
+            workerFarm.destroy();
         }
-        Object.assign(tilesetOptions, preloadOptions);
-        const sourceTilesetJson = await (0, core_1.load)(inputUrl, this.Loader, tilesetOptions.loadOptions);
-        // console.log(tilesetJson); // eslint-disable-line
-        this.sourceTileset = new tiles_1.Tileset3D(sourceTilesetJson, tilesetOptions);
-        await this._createAndSaveTileset(outputPath, tilesetName);
-        await this._finishConversion({ slpk: Boolean(slpk), outputPath, tilesetName });
-        // Clean up worker pools
-        const workerFarm = worker_utils_1.WorkerFarm.getWorkerFarm({});
-        workerFarm.destroy();
-        return sourceTilesetJson;
     }
     /**
      * Convert and save the layer and embedded tiles
@@ -179,7 +191,8 @@ class I3SConverter {
             nodePages: {
                 nodesPerPage: HARDCODED_NODES_PER_PAGE
             },
-            compressGeometry: this.options.draco
+            compressGeometry: this.options.draco,
+            fullExtent
         };
         this.layers0 = (0, json_map_transform_1.default)(layers0data, (0, layers_1.LAYERS)());
     }
@@ -694,7 +707,12 @@ class I3SConverter {
                     await this.writeTextureFile(textureData, '0', format, childPath, slpkChildPath);
                     if (this.generateTextures) {
                         formats.push({ name: '1', format: 'ktx2' });
-                        const ktx2TextureData = new Uint8Array(await (0, core_1.encode)(texture.image, textures_1.KTX2BasisWriter));
+                        const ktx2TextureData = (0, core_1.encode)(texture.image, textures_1.KTX2BasisWriterWorker, {
+                            ...textures_1.KTX2BasisWriterWorker.options,
+                            source: this.workerSource.ktx2,
+                            reuseWorkers: true,
+                            _nodeWorkers: true
+                        });
                         await this.writeTextureFile(ktx2TextureData, '1', 'ktx2', childPath, slpkChildPath);
                     }
                     break;
@@ -704,7 +722,7 @@ class I3SConverter {
                     await this.writeTextureFile(textureData, '1', format, childPath, slpkChildPath);
                     if (this.generateTextures) {
                         formats.push({ name: '0', format: 'jpg' });
-                        const decodedFromKTX2TextureData = new Uint8Array(await (0, core_1.encode)(texture.image.data[0], images_1.ImageWriter));
+                        const decodedFromKTX2TextureData = (0, core_1.encode)(texture.image.data[0], images_1.ImageWriter);
                         await this.writeTextureFile(decodedFromKTX2TextureData, '0', 'jpg', childPath, slpkChildPath);
                     }
                 }
@@ -1046,6 +1064,12 @@ class I3SConverter {
             const source = await sourceResponse.text();
             this.workerSource.draco = source;
         }
+        if (this.generateTextures) {
+            const url = (0, worker_utils_1.getWorkerURL)(textures_1.KTX2BasisWriterWorker, { ...(0, core_1.getLoaderOptions)() });
+            const sourceResponse = await (0, core_1.fetchFile)(url);
+            const source = await sourceResponse.text();
+            this.workerSource.ktx2 = source;
+        }
         const i3sAttributesWorkerUrl = (0, worker_utils_1.getWorkerURL)(i3s_attributes_worker_1.I3SAttributesWorker, { ...(0, core_1.getLoaderOptions)() });
         const sourceResponse = await (0, core_1.fetchFile)(i3sAttributesWorkerUrl);
         const source = await sourceResponse.text();

package/dist/i3s-converter/json-templates/layers.d.ts

@@ -30,6 +30,10 @@ export declare const LAYERS: () => {
         path: string;
         transform: (val: any) => any;
     };
+    fullExtent: {
+        path: string;
+        transform: (val: any) => any;
+    };
     heightModelInfo: {
         path: string;
         transform: (val: any) => any;

package/dist/i3s-converter/json-templates/layers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/json-templates/layers.ts"],"names":[],"mappings":"AAqHA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmFjB,CAAC"}
+{"version":3,"file":"layers.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/json-templates/layers.ts"],"names":[],"mappings":"AA0IA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuFjB,CAAC"}

package/dist/i3s-converter/json-templates/layers.js

@@ -113,6 +113,26 @@ const NODE_PAGES = () => ({
         default: 'maxScreenThresholdSQ'
     }
 });
+const FULL_EXTENT = () => ({
+    xmin: {
+        path: 'xmin'
+    },
+    ymin: {
+        path: 'ymin'
+    },
+    xmax: {
+        path: 'xmax'
+    },
+    ymax: {
+        path: 'ymax'
+    },
+    zmin: {
+        path: 'zmin'
+    },
+    zmax: {
+        path: 'zmax'
+    }
+});
 const LAYERS = () => ({
     version: {
         path: 'version',
@@ -145,6 +165,10 @@ const LAYERS = () => ({
         path: 'store',
         transform: (val) => (0, json_map_transform_1.default)(val, store_1.STORE)
     },
+    fullExtent: {
+        path: 'fullExtent',
+        transform: (val) => (0, json_map_transform_1.default)(val, FULL_EXTENT())
+    },
     heightModelInfo: {
         path: 'heightModelInfo',
         transform: (val) => (0, json_map_transform_1.default)(val, HEIGHT_MODEL_INFO())

package/dist/index.d.ts

@@ -1,6 +1,3 @@
 export { default as I3SConverter } from './i3s-converter/i3s-converter';
-export { default as NodePages } from './i3s-converter/helpers/node-pages';
 export { default as Tiles3DConverter } from './3d-tiles-converter/3d-tiles-converter';
-export { DepsInstaller } from './deps-installer/deps-installer';
-export { prepareDataForAttributesConversion } from './i3s-converter/helpers/gltf-attributes';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,oCAAoC,CAAC;AAExE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,yCAAyC,CAAC;AAEpF,OAAO,EAAC,aAAa,EAAC,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAC,kCAAkC,EAAC,MAAM,yCAAyC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,yCAAyC,CAAC"}

package/dist/index.js

@@ -3,14 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareDataForAttributesConversion = exports.DepsInstaller = exports.Tiles3DConverter = exports.NodePages = exports.I3SConverter = void 0;
+exports.Tiles3DConverter = exports.I3SConverter = void 0;
 var i3s_converter_1 = require("./i3s-converter/i3s-converter");
 Object.defineProperty(exports, "I3SConverter", { enumerable: true, get: function () { return __importDefault(i3s_converter_1).default; } });
-var node_pages_1 = require("./i3s-converter/helpers/node-pages");
-Object.defineProperty(exports, "NodePages", { enumerable: true, get: function () { return __importDefault(node_pages_1).default; } });
 var _3d_tiles_converter_1 = require("./3d-tiles-converter/3d-tiles-converter");
 Object.defineProperty(exports, "Tiles3DConverter", { enumerable: true, get: function () { return __importDefault(_3d_tiles_converter_1).default; } });
-var deps_installer_1 = require("./deps-installer/deps-installer");
-Object.defineProperty(exports, "DepsInstaller", { enumerable: true, get: function () { return deps_installer_1.DepsInstaller; } });
-var gltf_attributes_1 = require("./i3s-converter/helpers/gltf-attributes");
-Object.defineProperty(exports, "prepareDataForAttributesConversion", { enumerable: true, get: function () { return gltf_attributes_1.prepareDataForAttributesConversion; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "3.2.0-alpha.2",
+  "version": "3.2.0",
   "description": "Converter",
   "license": "MIT",
   "publishConfig": {
@@ -30,30 +30,32 @@
     "README.md"
   ],
   "browser": {
-    "fs": false
+    "fs": false,
+    "path": false,
+    "process": false,
+    "archiver": false
   },
   "scripts": {
     "pre-build": "npm run build-bundle && npm run build-converter-bundle && npm run build-i3s-attributes-worker && npm run build-3d-tiles-attributes-worker",
     "build-bundle": "esbuild ./src/index.ts --bundle --outfile=dist/dist.min.js --platform=node",
     "build-converter-bundle": "webpack --display errors-only --config ./converter-webpack/bundle.js",
-    "build-bin": "BABEL_ENV=es5 babel scripts --config-file ../../babel.config.js --out-dir dist/scripts",
     "build-i3s-attributes-worker": "esbuild src/workers/i3s-attributes-worker.ts --outfile=dist/i3s-attributes-worker.js --platform=node --target=esnext,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\"",
     "build-3d-tiles-attributes-worker": "esbuild src/workers/3d-tiles-attributes-worker.ts --outfile=dist/3d-tiles-attributes-worker.js --platform=node --target=esnext,node12 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "3.2.0-alpha.2",
-    "@loaders.gl/crypto": "3.2.0-alpha.2",
-    "@loaders.gl/draco": "3.2.0-alpha.2",
-    "@loaders.gl/gltf": "3.2.0-alpha.2",
-    "@loaders.gl/i3s": "3.2.0-alpha.2",
-    "@loaders.gl/images": "3.2.0-alpha.2",
-    "@loaders.gl/loader-utils": "3.2.0-alpha.2",
-    "@loaders.gl/polyfills": "3.2.0-alpha.2",
-    "@loaders.gl/schema": "3.2.0-alpha.2",
-    "@loaders.gl/textures": "3.2.0-alpha.2",
-    "@loaders.gl/tiles": "3.2.0-alpha.2",
-    "@loaders.gl/worker-utils": "3.2.0-alpha.2",
-    "@loaders.gl/zip": "3.2.0-alpha.2",
+    "@loaders.gl/3d-tiles": "3.2.0",
+    "@loaders.gl/crypto": "3.2.0",
+    "@loaders.gl/draco": "3.2.0",
+    "@loaders.gl/gltf": "3.2.0",
+    "@loaders.gl/i3s": "3.2.0",
+    "@loaders.gl/images": "3.2.0",
+    "@loaders.gl/loader-utils": "3.2.0",
+    "@loaders.gl/polyfills": "3.2.0",
+    "@loaders.gl/schema": "3.2.0",
+    "@loaders.gl/textures": "3.2.0",
+    "@loaders.gl/tiles": "3.2.0",
+    "@loaders.gl/worker-utils": "3.2.0",
+    "@loaders.gl/zip": "3.2.0",
     "@luma.gl/engine": "^8.5.4",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
@@ -71,7 +73,7 @@
     "uuid": "^8.1.0"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "3.2.0-alpha.1"
+    "@loaders.gl/core": "3.2.0-alpha.3"
   },
-  "gitHead": "52a602739cbfce60fc314f474efc984d199dff78"
+  "gitHead": "6660dc9291526752c40063b73a3f9dd97cc0ccc5"
 }

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

@@ -4,7 +4,7 @@ import type {Node3D} from '@loaders.gl/3d-tiles';
 import {join} from 'path';
 import process from 'process';
 import transform from 'json-map-transform';
-import {fetchFile, getLoaderOptions, load} from '@loaders.gl/core';
+import {fetchFile, getLoaderOptions, load, isBrowser} from '@loaders.gl/core';
 import {I3SLoader, I3SAttributeLoader, COORDINATE_SYSTEM} from '@loaders.gl/i3s';
 import {Tileset3D, Tile3D} from '@loaders.gl/tiles';
 import {Geoid} from '@math.gl/geoid';
@@ -23,6 +23,7 @@ import {
   /*transform3DTilesAttributesOnWorker*/
 } from '../3d-tiles-attributes-worker';
 import {getWorkerURL, WorkerFarm} from '@loaders.gl/worker-utils';
+import {BROWSER_ERROR_MESSAGE} from '../constants';
 
 const I3S = 'I3S';
 
@@ -63,9 +64,13 @@ export default class Tiles3DConverter {
     inputUrl: string;
     outputPath: string;
     tilesetName: string;
-    maxDepth: number;
+    maxDepth?: number;
     egmFilePath: string;
   }): Promise<any> {
+    if (isBrowser) {
+      console.log(BROWSER_ERROR_MESSAGE);
+      return BROWSER_ERROR_MESSAGE;
+    }
     const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath} = options;
     this.conversionStartTime = process.hrtime();
     this.options = {maxDepth};

package/src/constants.ts

@@ -0,0 +1,2 @@
+export const BROWSER_ERROR_MESSAGE =
+  'Tile converter does not work in browser, only in node js environment';

package/src/converter-cli.ts

@@ -0,0 +1,310 @@
+/* eslint-disable no-console */
+import '@loaders.gl/polyfills';
+import {join} from 'path';
+import {I3SConverter, Tiles3DConverter} from '@loaders.gl/tile-converter';
+import {DepsInstaller} from './deps-installer/deps-installer';
+
+type TileConversionOptions = {
+  /** "I3S" - for I3S to 3DTiles conversion, "3DTILES" for 3DTiles to I3S conversion */
+  inputType?: string;
+  /** "tileset.json" file (3DTiles) / "http://..../SceneServer/layers/0" resource (I3S) */
+  tileset?: string;
+  /** Tileset name. This option is used for naming in resulting json resouces and for resulting path/*.slpk file naming */
+  name?: string;
+  /** Output folder. This folder will be created by converter if doesn't exist. It is relative to the converter path.
+   * Default: "data" folder */
+  output: string;
+  /** 3DTiles->I3S only. location of 7z.exe archiver to create slpk on Windows OS, default: "C:\Program Files\7-Zip\7z.exe" */
+  sevenZipExe: string;
+  /** location of the Earth Gravity Model (*.pgm) file to convert heights from ellipsoidal to gravity-related format,
+   * default: "./deps/egm2008-5.pgm". A model file can be loaded from GeographicLib
+   * https://geographiclib.sourceforge.io/html/geoid.html */
+  egm: string;
+  /** 3DTile->I3S only. Token for Cesium ION tileset authentication. */
+  token?: string;
+  /** 3DTiles->I3S only. Enable draco compression for geometry. Default: true */
+  draco: boolean;
+  /** Run the script for installing dependencies. Run this options separate from others. Now "*.pgm" file installation is
+   * implemented */
+  installDependencies: boolean;
+  /** 3DTile->I3S only. Enable KTX2 textures generation if only one of (JPG, PNG) texture is provided or generate JPG texture
+   * if only KTX2 is provided */
+  generateTextures: boolean;
+  /** 3DTile->I3S only. Will generate obb and mbs bounding volumes from geometry */
+  generateBoundingVolumes: boolean;
+  /** Validate the dataset during conversion. Validation messages will be posted in the console output */
+  validate: boolean;
+  /** Maximal depth of the hierarchical tiles tree traversal, default: infinite */
+  maxDepth?: number;
+  /** 3DTiles->I3S only. Whether the converter generates *.slpk (Scene Layer Package) I3S output file */
+  slpk: boolean;
+};
+
+/* During validation we check that particular options are defined so they can't be undefined */
+type ValidatedTileConversionOptions = TileConversionOptions & {
+  /** "I3S" - for I3S to 3DTiles conversion, "3DTILES" for 3DTiles to I3S conversion */
+  inputType: string;
+  /** "tileset.json" file (3DTiles) / "http://..../SceneServer/layers/0" resource (I3S) */
+  tileset: string;
+  /** Tileset name. This option is used for naming in resulting json resouces and for resulting path/*.slpk file naming */
+  name: string;
+};
+
+const TILESET_TYPE = {
+  I3S: 'I3S',
+  _3DTILES: '3DTILES'
+};
+
+/**
+ * CLI entry
+ * @returns
+ */
+async function main() {
+  const [, , ...args] = process.argv;
+
+  if (args.length === 0) {
+    printHelp();
+  }
+
+  const options: TileConversionOptions = parseOptions(args);
+
+  if (options.installDependencies) {
+    const depthInstaller = new DepsInstaller();
+    depthInstaller.install('deps');
+    return;
+  }
+
+  const validatedOptions: ValidatedTileConversionOptions = validateOptions(options);
+
+  await convert(validatedOptions);
+}
+
+main().catch((error) => {
+  console.log(error);
+  process.exit(1); // eslint-disable-line
+});
+
+/**
+ * Output for `npx tile-converter --help`
+ */
+function printHelp(): void {
+  console.log('cli: converter 3dTiles to I3S or I3S to 3dTiles...');
+  console.log(
+    '--install-dependencies [Run the script for installing dependencies. Run this options separate from others. Now "*.pgm" file installation is implemented]'
+  );
+  console.log(
+    '--max-depth [Maximal depth of hierarchical tiles tree traversal, default: infinite]'
+  );
+  console.log('--name [Tileset name]');
+  console.log('--output [Output folder, default: "data" folder]');
+  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('--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]'
+  );
+  console.log(
+    '--generate-bounding-volumes [Will generate obb and mbs bounding volumes from geometry]'
+  );
+  console.log('--validate [Enable validation]');
+  process.exit(0); // eslint-disable-line
+}
+
+/**
+ * Run conversion process
+ * @param options validated tile-converter options
+ */
+async function convert(options: ValidatedTileConversionOptions) {
+  console.log(`------------------------------------------------`); // eslint-disable-line
+  console.log(`Starting conversion of ${options.inputType}`); // eslint-disable-line
+  console.log(`------------------------------------------------`); // eslint-disable-line
+  const inputType = options.inputType.toUpperCase();
+  switch (inputType) {
+    case TILESET_TYPE.I3S:
+      const tiles3DConverter = new Tiles3DConverter();
+      tiles3DConverter.convert({
+        inputUrl: options.tileset,
+        outputPath: options.output,
+        tilesetName: options.name,
+        maxDepth: options.maxDepth,
+        egmFilePath: options.egm
+      });
+      break;
+    case TILESET_TYPE._3DTILES:
+      const converter = new I3SConverter();
+      await converter.convert({
+        inputUrl: options.tileset,
+        outputPath: options.output,
+        tilesetName: options.name,
+        maxDepth: options.maxDepth,
+        slpk: options.slpk,
+        sevenZipExe: options.sevenZipExe,
+        egmFilePath: options.egm,
+        token: options.token,
+        draco: options.draco,
+        generateTextures: options.generateTextures,
+        generateBoundingVolumes: options.generateBoundingVolumes,
+        validate: options.validate
+      });
+      break;
+    default:
+      printHelp();
+  }
+}
+
+// OPTIONS
+/**
+ * Validate input options of the CLI command
+ * @param options - input options of the CLI command
+ * @returns validated options
+ */
+function validateOptions(options: TileConversionOptions): ValidatedTileConversionOptions {
+  const mandatoryOptionsWithExceptions: {
+    [key: string]: () => void;
+  } = {
+    name: () => console.log('Missed: --name [Tileset name]'),
+    output: () => console.log('Missed: --output [Output path name]'),
+    sevenZipExe: () => console.log('Missed: --7zExe [7z archiver executable path]'),
+    egm: () => console.log('Missed: --egm [*.pgm earth gravity model file path]'),
+    tileset: () => console.log('Missed: --tileset [tileset.json file]'),
+    inputType: () =>
+      console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]')
+  };
+  const exceptions: (() => void)[] = [];
+  for (const mandatoryOption in mandatoryOptionsWithExceptions) {
+    const optionValue = options[mandatoryOption];
+    const isWrongInputType =
+      Boolean(optionValue) &&
+      mandatoryOption === 'inputType' &&
+      !Object.values(TILESET_TYPE).includes(optionValue.toUpperCase());
+
+    if (!optionValue || isWrongInputType) {
+      exceptions.push(mandatoryOptionsWithExceptions[mandatoryOption]);
+    }
+  }
+  if (exceptions.length) {
+    exceptions.forEach((exeption) => exeption());
+    process.exit(0); // eslint-disable-line
+  }
+  return <ValidatedTileConversionOptions>options;
+}
+
+/**
+ * Parse option from the cli arguments array
+ * @param args
+ * @returns
+ */
+function parseOptions(args: string[]): TileConversionOptions {
+  const opts: TileConversionOptions = {
+    output: 'data',
+    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
+  };
+
+  // eslint-disable-next-line complexity
+  args.forEach((arg, index) => {
+    if (arg.indexOf('--') === 0) {
+      switch (arg) {
+        case '--input-type':
+          opts.inputType = getStringValue(index, args);
+          break;
+        case '--tileset':
+          opts.tileset = getStringValue(index, args);
+          break;
+        case '--name':
+          opts.name = getStringValue(index, args);
+          break;
+        case '--output':
+          opts.output = getStringValue(index, args);
+          break;
+        case '--max-depth':
+          opts.maxDepth = getIntegerValue(index, args);
+          break;
+        case '--slpk':
+          opts.slpk = true;
+          break;
+        case '--7zExe':
+          opts.sevenZipExe = getStringValue(index, args);
+          break;
+        case '--egm':
+          opts.egm = getStringValue(index, args);
+          break;
+        case '--token':
+          opts.token = getStringValue(index, args);
+          break;
+        case '--no-draco':
+          opts.draco = false;
+          break;
+        case '--validate':
+          opts.validate = true;
+          break;
+        case '--install-dependencies':
+          opts.installDependencies = true;
+          break;
+        case '--generate-textures':
+          opts.generateTextures = true;
+          break;
+        case '--generate-bounding-volumes':
+          opts.generateBoundingVolumes = true;
+          break;
+        case '--help':
+          printHelp();
+          break;
+        default:
+          console.warn(`Unknown option ${arg}`);
+          process.exit(0); // eslint-disable-line
+      }
+    }
+  });
+  return opts;
+}
+
+/**
+ * Get string option value from cli arguments
+ * @param index - option's name index in the argument's array.
+ *                The value of the option should be next to name of the option.
+ * @param args - cli arguments array
+ * @returns - string value of the option
+ */
+function getStringValue(index: number, args: string[]): string {
+  if (index + 1 >= args.length) {
+    return '';
+  }
+  const value = args[index + 1];
+  if (value.indexOf('--') === 0) {
+    return '';
+  }
+  return value;
+}
+
+/**
+ * Get integer option value from cli arguments
+ * @param index - option's name index in the argument's array
+ *                The value of the option should be next to name of the option.
+ * @param args - cli arguments array
+ * @returns - number value of the option
+ */
+function getIntegerValue(index: number, args: string[]): number {
+  const stringValue: string = getStringValue(index, args);
+  const result: number = Number.parseInt(stringValue);
+  if (isFinite(result)) {
+    return result;
+  }
+  return NaN;
+}