@loaders.gl/tile-converter 4.3.0-alpha.3 → 4.3.0-alpha.4

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.2" !== 'undefined' ? "4.3.0-alpha.2" : 'latest';
+const VERSION = typeof "4.3.0-alpha.3" !== 'undefined' ? "4.3.0-alpha.3" : '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.3",
+  "version": "4.3.0-alpha.4",
   "description": "Converter",
   "license": "MIT",
   "type": "module",
@@ -53,20 +53,20 @@
     "copy-certificates": "cp -R src/i3s-server/certs dist/i3s-server"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.3.0-alpha.3",
-    "@loaders.gl/compression": "4.3.0-alpha.3",
-    "@loaders.gl/crypto": "4.3.0-alpha.3",
-    "@loaders.gl/draco": "4.3.0-alpha.3",
-    "@loaders.gl/gltf": "4.3.0-alpha.3",
-    "@loaders.gl/i3s": "4.3.0-alpha.3",
-    "@loaders.gl/images": "4.3.0-alpha.3",
-    "@loaders.gl/loader-utils": "4.3.0-alpha.3",
-    "@loaders.gl/math": "4.3.0-alpha.3",
-    "@loaders.gl/polyfills": "4.3.0-alpha.3",
-    "@loaders.gl/textures": "4.3.0-alpha.3",
-    "@loaders.gl/tiles": "4.3.0-alpha.3",
-    "@loaders.gl/worker-utils": "4.3.0-alpha.3",
-    "@loaders.gl/zip": "4.3.0-alpha.3",
+    "@loaders.gl/3d-tiles": "4.3.0-alpha.4",
+    "@loaders.gl/compression": "4.3.0-alpha.4",
+    "@loaders.gl/crypto": "4.3.0-alpha.4",
+    "@loaders.gl/draco": "4.3.0-alpha.4",
+    "@loaders.gl/gltf": "4.3.0-alpha.4",
+    "@loaders.gl/i3s": "4.3.0-alpha.4",
+    "@loaders.gl/images": "4.3.0-alpha.4",
+    "@loaders.gl/loader-utils": "4.3.0-alpha.4",
+    "@loaders.gl/math": "4.3.0-alpha.4",
+    "@loaders.gl/polyfills": "4.3.0-alpha.4",
+    "@loaders.gl/textures": "4.3.0-alpha.4",
+    "@loaders.gl/tiles": "4.3.0-alpha.4",
+    "@loaders.gl/worker-utils": "4.3.0-alpha.4",
+    "@loaders.gl/zip": "4.3.0-alpha.4",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geoid": "^4.0.0",
@@ -94,5 +94,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "3213679d79e6ff2814d48fd3337acfa446c74099"
+  "gitHead": "4900ac4c4de20366c050b80cef04dc5b52d167af"
 }

package/src/converter-cli.ts

@@ -36,6 +36,8 @@ type TileConversionOptions = {
    * 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 */
@@ -187,6 +189,7 @@ function printHelp(): void {
   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('--token [Token for Cesium ION tilesets authentication]');
   console.log('--no-draco [Disable draco compression for geometry]');
   console.log(
@@ -321,7 +324,8 @@ function parseOptions(args: string[]): TileConversionOptions {
     validate: false,
     slpk: false,
     addHash: false,
-    quiet: false
+    quiet: false,
+    noEgm: false
   };
 
   // eslint-disable-next-line complexity
@@ -361,6 +365,9 @@ 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/coordinate-converter.ts

@@ -18,7 +18,7 @@ import {Geoid} from '@math.gl/geoid';
  */
 export function createBoundingVolumes(
   sourceBoundingVolume: OrientedBoundingBox | BoundingSphere,
-  geoidHeightModel: Geoid
+  geoidHeightModel: Geoid | null
 ): BoundingVolumes {
   let radius;
   let halfSize;
@@ -28,9 +28,13 @@ export function createBoundingVolumes(
     sourceBoundingVolume.center,
     new Vector3()
   );
-  cartographicCenter[2] =
-    cartographicCenter[2] -
-    geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);
+
+  if (geoidHeightModel) {
+    cartographicCenter[2] =
+      cartographicCenter[2] -
+      geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);
+  }
+
   if (sourceBoundingVolume instanceof OrientedBoundingBox) {
     halfSize = sourceBoundingVolume.halfSize;
     radius = new Vector3(halfSize[0], halfSize[1], halfSize[2]).len();
@@ -60,7 +64,7 @@ export function createBoundingVolumes(
  */
 export function createBoundingVolumesFromGeometry(
   cartesianPositions: Float32Array,
-  geoidHeightModel: Geoid
+  geoidHeightModel: Geoid | null
 ): {mbs: Mbs; obb: Obb} {
   const positionVectors = convertPositionsToVectors(cartesianPositions);
 
@@ -70,8 +74,10 @@ export function createBoundingVolumesFromGeometry(
   const mbsCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new Vector3());
   const obbCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new Vector3());
 
-  mbsCenter[2] = mbsCenter[2] - geoidHeightModel.getHeight(mbsCenter[1], mbsCenter[0]);
-  obbCenter[2] = obbCenter[2] - geoidHeightModel.getHeight(obbCenter[1], obbCenter[0]);
+  if (geoidHeightModel) {
+    mbsCenter[2] = mbsCenter[2] - geoidHeightModel.getHeight(mbsCenter[1], mbsCenter[0]);
+    obbCenter[2] = obbCenter[2] - geoidHeightModel.getHeight(obbCenter[1], obbCenter[0]);
+  }
 
   return {
     mbs: [mbsCenter[0], mbsCenter[1], mbsCenter[2], geometryMbs.radius],

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

@@ -121,7 +121,7 @@ export default async function convertB3dmToI3sGeometry({
   draco: boolean;
   generateBoundingVolumes: boolean;
   shouldMergeMaterials: boolean;
-  geoidHeightModel: Geoid;
+  geoidHeightModel: Geoid | null;
   libraries: Record<string, string>;
   metadataClass?: string;
 }): Promise<I3SConvertedResources[] | null> {
@@ -197,7 +197,7 @@ export default async function convertB3dmToI3sGeometry({
  */
 function _generateBoundingVolumesFromGeometry(
   convertedAttributesMap: Map<string, ConvertedAttributes>,
-  geoidHeightModel: Geoid
+  geoidHeightModel: Geoid | null
 ) {
   for (const attributes of convertedAttributesMap.values()) {
     const boundingVolumes = createBoundingVolumesFromGeometry(
@@ -211,8 +211,10 @@ function _generateBoundingVolumesFromGeometry(
     for (let index = 0; index < attributes.positions.length; index += VALUES_PER_VERTEX) {
       const vertex = attributes.positions.subarray(index, index + VALUES_PER_VERTEX);
       Ellipsoid.WGS84.cartesianToCartographic(Array.from(vertex), scratchVector);
-      scratchVector[2] =
-        scratchVector[2] - geoidHeightModel.getHeight(scratchVector[1], scratchVector[0]);
+      if (geoidHeightModel) {
+        scratchVector[2] =
+          scratchVector[2] - geoidHeightModel.getHeight(scratchVector[1], scratchVector[0]);
+      }
       scratchVector = scratchVector.subtract(cartographicOrigin);
       attributes.positions.set(scratchVector, index);
     }

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

@@ -203,6 +203,7 @@ export default class I3SConverter {
     inquirer?: Promise<unknown>;
     metadataClass?: string;
     analyze?: boolean;
+    noEgm?: boolean;
   }): Promise<string> {
     if (isBrowser) {
       console.log(BROWSER_ERROR_MESSAGE); // eslint-disable-line no-console
@@ -226,7 +227,8 @@ export default class I3SConverter {
       mergeMaterials = true,
       inquirer,
       metadataClass,
-      analyze = false
+      analyze = false,
+      noEgm = false
     } = options;
     this.options = {
       outputPath,
@@ -253,9 +255,13 @@ export default class I3SConverter {
     this.writeQueue = new WriteQueue(this.conversionDump);
     this.writeQueue.startListening();
 
-    console.log('Loading egm file...'); // eslint-disable-line
-    this.geoidHeightModel = await load(egmFilePath, PGMLoader);
-    console.log('Loading egm file completed!'); // eslint-disable-line
+    if (!noEgm) {
+      console.log('--no-egm option selected, skip loading egm file'); // eslint-disable-line
+    } else {
+      console.log('Loading egm file...'); // eslint-disable-line
+      this.geoidHeightModel = await load(egmFilePath, PGMLoader);
+      console.log('Loading egm file completed!'); // eslint-disable-line
+    }
 
     if (slpk) {
       this.nodePages.useWriteFunction(writeFileForSlpk);
@@ -486,7 +492,7 @@ export default class I3SConverter {
       this.sourceTileset?.root?.boundingVolume?.region
     );
 
-    const boundingVolumes = createBoundingVolumes(sourceBoundingVolume, this.geoidHeightModel!);
+    const boundingVolumes = createBoundingVolumes(sourceBoundingVolume, this.geoidHeightModel);
 
     await this.nodePages.push({
       index: 0,
@@ -793,7 +799,7 @@ export default class I3SConverter {
         transformationMatrix,
         null
       );
-      const boundingVolumes = createBoundingVolumes(sourceBoundingVolume, this.geoidHeightModel!);
+      const boundingVolumes = createBoundingVolumes(sourceBoundingVolume, this.geoidHeightModel);
       const nodes: NodeIndexDocument[] = [];
       for (const convertedNode of this.conversionDump.tilesConverted[sourceTile.id].nodes) {
         const {node} = await this._generateNodeIndexDocument(
@@ -846,7 +852,7 @@ export default class I3SConverter {
       transformationMatrix,
       null
     );
-    const boundingVolumes = createBoundingVolumes(sourceBoundingVolume, this.geoidHeightModel!);
+    const boundingVolumes = createBoundingVolumes(sourceBoundingVolume, this.geoidHeightModel);
 
     const propertyTable = getPropertyTable(tileContent, this.options.metadataClass);
     this.createAttributeStorageInfo(tileContent, propertyTable);
@@ -974,7 +980,7 @@ export default class I3SConverter {
       draco: this.options.draco,
       generateBoundingVolumes: this.generateBoundingVolumes,
       shouldMergeMaterials: this.options.mergeMaterials,
-      geoidHeightModel: this.geoidHeightModel!,
+      geoidHeightModel: this.geoidHeightModel,
       libraries: this.loadOptions.modules as Record<string, string>,
       metadataClass: this.options.metadataClass
     });

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

@@ -25,7 +25,12 @@ router.get('*', (req, res, next) => {
   async function routerCallback(req, res, next) {
     const file = await getFileByUrl(req.path.replace(/\/+$/, ''));
     if (file) {
-      res.send(Buffer.from(file));
+      try {
+        const json = JSON.parse(textDecoder.decode(file));
+        res.send(json);
+      } catch (e) {
+        res.send(Buffer.from(file));
+      }
     } else {
       res.status(404);
       res.send('File not found');