@loaders.gl/tile-converter 4.3.2 → 4.4.0-alpha.2

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.1" !== 'undefined' ? "4.3.1" : 'latest';
+const VERSION = typeof "4.4.0-alpha.1" !== 'undefined' ? "4.4.0-alpha.1" : '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.2",
+  "version": "4.4.0-alpha.2",
   "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.2",
-    "@loaders.gl/compression": "4.3.2",
-    "@loaders.gl/crypto": "4.3.2",
-    "@loaders.gl/draco": "4.3.2",
-    "@loaders.gl/gltf": "4.3.2",
-    "@loaders.gl/i3s": "4.3.2",
-    "@loaders.gl/images": "4.3.2",
-    "@loaders.gl/loader-utils": "4.3.2",
-    "@loaders.gl/math": "4.3.2",
-    "@loaders.gl/polyfills": "4.3.2",
-    "@loaders.gl/textures": "4.3.2",
-    "@loaders.gl/tiles": "4.3.2",
-    "@loaders.gl/worker-utils": "4.3.2",
-    "@loaders.gl/zip": "4.3.2",
+    "@loaders.gl/3d-tiles": "4.4.0-alpha.2",
+    "@loaders.gl/compression": "4.4.0-alpha.2",
+    "@loaders.gl/crypto": "4.4.0-alpha.2",
+    "@loaders.gl/draco": "4.4.0-alpha.2",
+    "@loaders.gl/gltf": "4.4.0-alpha.2",
+    "@loaders.gl/i3s": "4.4.0-alpha.2",
+    "@loaders.gl/images": "4.4.0-alpha.2",
+    "@loaders.gl/loader-utils": "4.4.0-alpha.2",
+    "@loaders.gl/math": "4.4.0-alpha.2",
+    "@loaders.gl/polyfills": "4.4.0-alpha.2",
+    "@loaders.gl/textures": "4.4.0-alpha.2",
+    "@loaders.gl/tiles": "4.4.0-alpha.2",
+    "@loaders.gl/worker-utils": "4.4.0-alpha.2",
+    "@loaders.gl/zip": "4.4.0-alpha.2",
     "@math.gl/core": "^4.1.0",
     "@math.gl/culling": "^4.1.0",
     "@math.gl/geoid": "^4.1.0",
@@ -91,7 +91,7 @@
     "@types/inquirer": "^9.0.7"
   },
   "peerDependencies": {
-    "@loaders.gl/core": "^4.3.0"
+    "@loaders.gl/core": "4.4.0-alpha.1"
   },
-  "gitHead": "b4203b8703f64a38d6f79a3113bc7bb51d45c93a"
+  "gitHead": "3d9fed050eabdc0812ddf2f4d5fb9914a34ee0c2"
 }

package/src/converter-cli.ts

@@ -26,10 +26,10 @@ type TileConversionOptions = {
   /** 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;
-  /** 3DTile version.
+  /** 3DTiles version.
    * Default: version "1.1" */
   outputVersion?: string;
-  /** Keep created 3DNodeIndexDocument files on disk instead of memory. This option reduce memory usage but decelerates conversion speed */
+  /** Keep created 3DNodeIndexDocument files on disk instead of memory. This option reduces memory usage but decelerates conversion speed */
   instantNodeWriting: boolean;
   /** Try to merge similar materials to be able to merge meshes into one node (I3S to 3DTiles conversion only) */
   mergeMaterials: boolean;
@@ -54,9 +54,9 @@ type TileConversionOptions = {
   validate: boolean;
   /** Maximal depth of the hierarchical tiles tree traversal, default: infinite */
   maxDepth?: number;
-  /** adds hash file to the slpk if there's no one */
+  /** Adds a hash file to an .slpk without hash */
   addHash: boolean;
-  /** Feature metadata class from EXT_FEATURE_METADATA or EXT_STRUCTURAL_METADATA extensions  */
+  /** Set 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 */
   analyze?: boolean;
@@ -171,17 +171,20 @@ function printHelp(): void {
   console.log('--name [Tileset name]');
   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]'
+    '--instant-node-writing [Keep created 3DNodeIndexDocument files on disk instead of memory. This option reduces 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)]'
+    '--split-nodes [Prevent merging similar materials that could lead to incorrect visualization (I3S to 3DTiles conversion only)]'
+  );
+  console.log(
+    '--slpk [(Deprecated since version 4.3.0) Whether the converter generates *.slpk (Scene Layer Package) I3S output files. Note: For versions 4.3.0 and up *.slpk is the default output without this option specified.]'
   );
   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(
-    '--output-version [3dtile version: 1.0 or 1.1, default: 1.1]. This option supports only 1.0/1.1 values for 3DTiles output. I3S output version setting is not supported yet.'
+    '--output-version [3DTiles version: 1.0 or 1.1, default: 1.1]. This option supports only 1.0/1.1 values for 3DTiles output. I3S output version setting is not supported yet.'
   );
   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"'

package/src/i3s-converter/helpers/batch-ids-extensions.ts

@@ -10,10 +10,9 @@ import type {
 } from '@loaders.gl/gltf';
 import {EXT_MESH_FEATURES, EXT_FEATURE_METADATA} from '@loaders.gl/gltf';
 import {Tiles3DTileContent} from '@loaders.gl/3d-tiles';
-
+import {emod} from '@loaders.gl/math';
 import {TypedArray} from '@math.gl/core';
 import {TextureImageProperties} from '../types';
-import {emod} from '@loaders.gl/math';
 
 /**
  * Get featureTexture by a metadata class.

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

@@ -524,7 +524,7 @@ function convertNode({
   const mesh = node.mesh;
 
   if (mesh) {
-    convertMesh({
+    convertMeshToTable({
       mesh,
       images,
       cartographicOrigin,
@@ -563,7 +563,7 @@ function convertNode({
  * @param matrix - transformation matrix - cumulative transformation matrix formed from all parent node matrices
  * @param featureTexture - feature texture key
  */
-function convertMesh({
+function convertMeshToTable({
   mesh,
   images,
   cartographicOrigin,

package/src/i3s-server/routes/slpk-router.ts

@@ -4,7 +4,7 @@ import {createSceneServer} from '../utils/create-scene-server';
 
 const textDecoder = new TextDecoder();
 
-export const sceneServerRouter = express.Router();
+export const sceneServerRouter: any = express.Router();
 sceneServerRouter.get('*', (req, res, next) => {
   async function routerCallback(req, res, next) {
     const file = await getFileByUrl('/');
@@ -20,7 +20,7 @@ sceneServerRouter.get('*', (req, res, next) => {
   routerCallback(req, res, next);
 });
 
-export const router = express.Router();
+export const router: any = express.Router();
 router.get('*', (req, res, next) => {
   async function routerCallback(req, res, next) {
     const file = await getFileByUrl(req.path.replace(/\/+$/, ''));