@loaders.gl/tile-converter 3.2.9 → 3.2.11

package/src/converter-cli.ts

@@ -194,7 +194,7 @@ function validateOptions(options: TileConversionOptions): ValidatedTileConversio
   }
   if (exceptions.length) {
     exceptions.forEach((exeption) => exeption());
-    process.exit(0); // eslint-disable-line
+    process.exit(1);
   }
   return <ValidatedTileConversionOptions>options;
 }
@@ -225,7 +225,7 @@ function parseOptions(args: string[]): TileConversionOptions {
           opts.inputType = getStringValue(index, args);
           break;
         case '--tileset':
-          opts.tileset = getStringValue(index, args);
+          opts.tileset = getURLValue(index, args);
           break;
         case '--name':
           opts.name = getStringValue(index, args);
@@ -293,6 +293,20 @@ function getStringValue(index: number, args: string[]): string {
   return value;
 }
 
+/**
+ * Modyfy URL path to be compatible with fetch
+ * @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 getURLValue(index: number, args: string[]): string {
+  const value = getStringValue(index, args);
+  console.log(`Input tileset value: ${value}`);
+  console.log(`Modified tileset value: ${value.replace(/\\/g, '/')}`);
+  return value.replace(/\\/g, '/');
+}
+
 /**
  * Get integer option value from cli arguments
  * @param index - option's name index in the argument's array

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

@@ -126,13 +126,15 @@ export function convertBoundingVolumeToI3SFullExtent(
     new Vector3()
   );
 
+  // Converter sometimes returns min values that are bigger then max,
+  // so we should check and take bigger value from max and smaller for nim
   return {
-    xmin: vertexMin[0],
-    xmax: vertexMax[0],
-    ymin: vertexMin[1],
-    ymax: vertexMax[1],
-    zmin: vertexMin[2],
-    zmax: vertexMax[2]
+    xmin: Math.min(vertexMin[0], vertexMax[0]),
+    xmax: Math.max(vertexMin[0], vertexMax[0]),
+    ymin: Math.min(vertexMin[1], vertexMax[1]),
+    ymax: Math.max(vertexMin[1], vertexMax[1]),
+    zmin: Math.min(vertexMin[2], vertexMax[2]),
+    zmax: Math.max(vertexMin[2], vertexMax[2])
   };
 }
 

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

@@ -199,7 +199,11 @@ export default class I3SConverter {
       // console.log(tilesetJson); // eslint-disable-line
       this.sourceTileset = new Tileset3D(sourceTilesetJson, tilesetOptions);
 
-      await this._createAndSaveTileset(outputPath, tilesetName);
+      await this._createAndSaveTileset(
+        outputPath,
+        tilesetName,
+        sourceTilesetJson?.root?.boundingVolume?.region
+      );
       await this._finishConversion({slpk: Boolean(slpk), outputPath, tilesetName});
       return sourceTilesetJson;
     } catch (error) {
@@ -216,7 +220,11 @@ export default class I3SConverter {
    * @param outputPath - path to save output data
    * @param tilesetName - new tileset path
    */
-  private async _createAndSaveTileset(outputPath: string, tilesetName: string): Promise<void> {
+  private async _createAndSaveTileset(
+    outputPath: string,
+    tilesetName: string,
+    boundingVolumeRegion?: number[]
+  ): Promise<void> {
     const tilesetPath = join(`${outputPath}`, `${tilesetName}`);
     // Removing the tilesetPath needed to exclude erroneous files after conversion
     try {
@@ -227,7 +235,7 @@ export default class I3SConverter {
 
     this.layers0Path = join(tilesetPath, 'SceneServer', 'layers', '0');
 
-    this._formLayers0(tilesetName);
+    this._formLayers0(tilesetName, boundingVolumeRegion);
 
     this.materialDefinitions = [];
     this.materialMap = new Map();
@@ -267,10 +275,14 @@ export default class I3SConverter {
    * Form object of 3DSceneLayer https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DSceneLayer.cmn.md
    * @param  tilesetName - Name of layer
    */
-  private _formLayers0(tilesetName: string): void {
+  private _formLayers0(tilesetName: string, boundingVolumeRegion?: number[]): void {
     const fullExtent = convertBoundingVolumeToI3SFullExtent(
       this.sourceTileset?.boundingVolume || this.sourceTileset?.root?.boundingVolume
     );
+    if (boundingVolumeRegion) {
+      fullExtent.zmin = boundingVolumeRegion[4];
+      fullExtent.zmax = boundingVolumeRegion[5];
+    }
     const extent = [fullExtent.xmin, fullExtent.ymin, fullExtent.xmax, fullExtent.ymax];
     const layers0data = {
       version: `{${uuidv4().toUpperCase()}}`,