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

package/dist/i3s-server/routes/slpk-router.js

@@ -23,7 +23,13 @@ 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);

package/dist/index.cjs

@@ -960,7 +960,9 @@ function createBoundingVolumes(sourceBoundingVolume, geoidHeightModel) {
   let halfSize;
   let quaternion;
   const cartographicCenter = import_geospatial.Ellipsoid.WGS84.cartesianToCartographic(sourceBoundingVolume.center, new import_core2.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 import_culling.OrientedBoundingBox) {
     halfSize = sourceBoundingVolume.halfSize;
     radius = new import_core2.Vector3(halfSize[0], halfSize[1], halfSize[2]).len();
@@ -985,8 +987,10 @@ function createBoundingVolumesFromGeometry(cartesianPositions, geoidHeightModel)
   const geometryMbs = (0, import_culling.makeBoundingSphereFromPoints)(positionVectors);
   const mbsCenter = import_geospatial.Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new import_core2.Vector3());
   const obbCenter = import_geospatial.Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new import_core2.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],
     obb: {
@@ -1447,7 +1451,9 @@ function _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeigh
     for (let index = 0; index < attributes.positions.length; index += VALUES_PER_VERTEX2) {
       const vertex = attributes.positions.subarray(index, index + VALUES_PER_VERTEX2);
       import_geospatial3.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);
     }
@@ -2342,7 +2348,7 @@ function convertScreenThresholdToGeometricError(node) {
 
 // dist/pgm-loader.js
 var import_geoid = require("@math.gl/geoid");
-var VERSION = true ? "4.3.0-alpha.2" : "latest";
+var VERSION = true ? "4.3.0-alpha.3" : "latest";
 var PGMLoader = {
   dataType: null,
   batchType: null,
@@ -4378,7 +4384,7 @@ var I3SConverter = class {
       return BROWSER_ERROR_MESSAGE;
     }
     this.conversionStartTime = import_process4.default.hrtime();
-    const { tilesetName, slpk, egmFilePath, inputUrl, validate, outputPath, draco = true, sevenZipExe, maxDepth, token, generateTextures, generateBoundingVolumes, instantNodeWriting = false, mergeMaterials: mergeMaterials2 = true, inquirer, metadataClass, analyze = false } = options;
+    const { tilesetName, slpk, egmFilePath, inputUrl, validate, outputPath, draco = true, sevenZipExe, maxDepth, token, generateTextures, generateBoundingVolumes, instantNodeWriting = false, mergeMaterials: mergeMaterials2 = true, inquirer, metadataClass, analyze = false, noEgm = false } = options;
     this.options = {
       outputPath,
       tilesetName,
@@ -4402,9 +4408,13 @@ var I3SConverter = class {
     this.generateBoundingVolumes = Boolean(generateBoundingVolumes);
     this.writeQueue = new WriteQueue(this.conversionDump);
     this.writeQueue.startListening();
-    console.log("Loading egm file...");
-    this.geoidHeightModel = await (0, import_core9.load)(egmFilePath, PGMLoader);
-    console.log("Loading egm file completed!");
+    if (!noEgm) {
+      console.log("--no-egm option selected, skip loading egm file");
+    } else {
+      console.log("Loading egm file...");
+      this.geoidHeightModel = await (0, import_core9.load)(egmFilePath, PGMLoader);
+      console.log("Loading egm file completed!");
+    }
     if (slpk) {
       this.nodePages.useWriteFunction(writeFileForSlpk);
     }