@loaders.gl/tile-converter 4.4.5 → 5.0.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.4.5",
+  "version": "5.0.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.4.5",
-    "@loaders.gl/compression": "4.4.5",
-    "@loaders.gl/crypto": "4.4.5",
-    "@loaders.gl/draco": "4.4.5",
-    "@loaders.gl/gltf": "4.4.5",
-    "@loaders.gl/i3s": "4.4.5",
-    "@loaders.gl/images": "4.4.5",
-    "@loaders.gl/loader-utils": "4.4.5",
-    "@loaders.gl/math": "4.4.5",
-    "@loaders.gl/polyfills": "4.4.5",
-    "@loaders.gl/textures": "4.4.5",
-    "@loaders.gl/tiles": "4.4.5",
-    "@loaders.gl/worker-utils": "4.4.5",
-    "@loaders.gl/zip": "4.4.5",
+    "@loaders.gl/3d-tiles": "5.0.0-alpha.2",
+    "@loaders.gl/compression": "5.0.0-alpha.2",
+    "@loaders.gl/crypto": "5.0.0-alpha.2",
+    "@loaders.gl/draco": "5.0.0-alpha.2",
+    "@loaders.gl/gltf": "5.0.0-alpha.2",
+    "@loaders.gl/i3s": "5.0.0-alpha.2",
+    "@loaders.gl/images": "5.0.0-alpha.2",
+    "@loaders.gl/loader-utils": "5.0.0-alpha.2",
+    "@loaders.gl/math": "5.0.0-alpha.2",
+    "@loaders.gl/polyfills": "5.0.0-alpha.2",
+    "@loaders.gl/textures": "5.0.0-alpha.2",
+    "@loaders.gl/tiles": "5.0.0-alpha.2",
+    "@loaders.gl/worker-utils": "5.0.0-alpha.2",
+    "@loaders.gl/zip": "5.0.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.4.0"
+    "@loaders.gl/core": "~5.0.0-alpha.0"
   },
-  "gitHead": "9ba2e684d7de9a95eaebd57853efde2c760be25e"
+  "gitHead": "27bcc0db684abb66a83003263c9d1cafd9e5b2dd"
 }

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

@@ -177,7 +177,7 @@ export default class Tiles3DConverter {
     if (!this.conversionDump.restored) {
       try {
         await removeDir(this.tilesetPath);
-      } catch (e) {
+      } catch (_e) {
         // do nothing
       }
     }

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

@@ -209,7 +209,7 @@ export class Tiles3DContentConverter {
     featureAttributes: I3STileAttributes
   ): PropertyAttribute | null {
     const attributeValues = featureAttributes[attributeName];
-    const info = attributeStorageInfo.find((e) => e.name === attributeName);
+    const info = attributeStorageInfo.find(e => e.name === attributeName);
     if (!info) {
       return null;
     }
@@ -477,6 +477,6 @@ export class Tiles3DContentConverter {
    */
   _checkNormals(normals) {
     // If all normals === 0, the resulting tileset is all in black colors on Cesium
-    return normals.find((value) => value);
+    return normals.find(value => value);
   }
 }

package/src/3d-tiles-converter/json-templates/tileset.ts

@@ -22,21 +22,21 @@ const TILE = () => ({
   },
   children: {
     path: 'children',
-    transform: (val) => val.map((tile) => transform(tile, TILE()))
+    transform: val => val.map(tile => transform(tile, TILE()))
   }
 });
 
 export const TILESET = () => ({
   asset: {
     path: 'asset',
-    transform: (val) => transform(val, ASSET())
+    transform: val => transform(val, ASSET())
   },
   geometricError: {
     path: 'root',
-    transform: (val) => val.geometricError
+    transform: val => val.geometricError
   },
   root: {
     path: 'root',
-    transform: (val) => transform(val, TILE())
+    transform: val => transform(val, TILE())
   }
 });

package/src/converter-cli.ts

@@ -152,7 +152,7 @@ async function main() {
   await convert(validatedOptions);
 }
 
-main().catch((error) => {
+main().catch(error => {
   console.log(error);
   process.exit(1); // eslint-disable-line no-process-exit
 });
@@ -280,13 +280,13 @@ function validateOptions(
     inputType: {
       getMessage: () =>
         console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]'),
-      condition: (value) =>
+      condition: value =>
         addHash || (Boolean(value) && Object.values(TILESET_TYPE).includes(value.toUpperCase()))
     },
     outputVersion: {
       getMessage: () =>
         console.log('Incorrect: --output-version [1.0 or 1.1] is for --input-type "I3S" only'),
-      condition: (value) =>
+      condition: value =>
         addHash ||
         (Boolean(value) &&
           Object.values(['1.0', '1.1']).includes(value) &&
@@ -307,7 +307,7 @@ function validateOptions(
     }
   }
   if (exceptions.length) {
-    exceptions.forEach((exeption) => exeption());
+    exceptions.forEach(exeption => exeption());
     process.exit(1); // eslint-disable-line no-process-exit
   }
   return <ValidatedTileConversionOptions>options;

package/src/i3s-converter/helpers/attribute-metadata-info.ts

@@ -74,7 +74,7 @@ export class AttributeMetadataInfo {
       /*
       We will append a new attribute only in case it has not been added to the attribute storage info yet.
       */
-      const elementFound = this._attributeStorageInfo.find((element) => element.name === key);
+      const elementFound = this._attributeStorageInfo.find(element => element.name === key);
       if (!elementFound) {
         const attributeType = attributeTypes[key];
 

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

@@ -211,7 +211,7 @@ function unifyObjectsByFeatureId(
     attributes: GroupedByFeatureIdAttributes[];
   }[] = [];
   for (const data of sortedData) {
-    const existingObject = groupedMetadata.find((obj) => obj.featureId === data.featureId);
+    const existingObject = groupedMetadata.find(obj => obj.featureId === data.featureId);
     if (existingObject) {
       existingObject.attributes.push(data);
     } else {

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

@@ -304,7 +304,7 @@ async function _makeNodeResources({
       faceRange.buffer
     )
   );
-  // prettier-ignore
+  // biome-ignore format: preserve intentional fixture layout
   const compressedGeometry = draco
     ? generateCompressedGeometry(
       vertexCount,
@@ -1059,7 +1059,7 @@ async function mergeMaterials(
 function convertMaterial(sourceMaterial: GLTFMaterialPostprocessed): I3SMaterialWithTexture {
   const material: I3SMaterialDefinition = {
     doubleSided: sourceMaterial.doubleSided,
-    emissiveFactor: sourceMaterial.emissiveFactor?.map((c) => Math.round(c * 255)) as [
+    emissiveFactor: sourceMaterial.emissiveFactor?.map(c => Math.round(c * 255)) as [
       number,
       number,
       number
@@ -1096,7 +1096,7 @@ function convertMaterial(sourceMaterial: GLTFMaterialPostprocessed): I3SMaterial
     // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#reference-pbrmetallicroughness
     const baseColorFactor = sourceMaterial?.pbrMetallicRoughness?.baseColorFactor;
     material.pbrMetallicRoughness.baseColorFactor =
-      ((baseColorFactor && baseColorFactor.map((c) => Math.round(c * 255))) as [
+      ((baseColorFactor && baseColorFactor.map(c => Math.round(c * 255))) as [
         number,
         number,
         number,
@@ -1472,7 +1472,7 @@ function generateAttributeBuffer(type: string, value: any): ArrayBuffer {
  * @returns attribute type.
  */
 function getAttributeType(key: string, attributeStorageInfo: any[]): string {
-  const attribute = attributeStorageInfo.find((attr) => attr.name === key);
+  const attribute = attributeStorageInfo.find(attr => attr.name === key);
   if (!attribute) {
     // eslint-disable-next-line no-console
     console.error(

package/src/i3s-converter/helpers/gltf-attributes.ts

@@ -25,7 +25,7 @@ export function prepareDataForAttributesConversion(
     [];
 
   const images =
-    tileContent.gltf?.images?.map((imageObject) => {
+    tileContent.gltf?.images?.map(imageObject => {
       // Need data only for uncompressed images because we can't get batchIds from compressed textures.
       if (imageObject?.image?.compressed) {
         return null;
@@ -141,7 +141,7 @@ function prepareNodes(nodes: GLTFNodePostprocessed[]): void {
         ...node,
         mesh: {
           ...node.mesh,
-          primitives: node.mesh?.primitives.map((primitive) => ({
+          primitives: node.mesh?.primitives.map(primitive => ({
             ...primitive,
             indices: {value: primitive?.indices?.value},
             attributes: getB3DMAttributesWithoutBufferView(primitive.attributes),

package/src/i3s-converter/helpers/node-debug.ts

@@ -3,7 +3,7 @@ import {OrientedBoundingBox, BoundingSphere} from '@math.gl/culling';
 import {Vector3} from '@math.gl/core';
 import {Ellipsoid} from '@math.gl/geospatial';
 
-// prettier-ignore
+// biome-ignore format: preserve intentional fixture layout
 const CUBE_POSITIONS = new Float32Array([
   -1,  -1,  1, 1,  -1,  1,  1,  1,  1,  -1,  1,  1,
   -1,  -1,  -1,  -1,  1,  -1,  1,  1,  -1,  1,  -1,  -1,
@@ -103,11 +103,10 @@ function getTileObbVertices(node: Node3DIndexDocument): number[] {
   let vertices = [];
 
   for (let i = 0; i < positions.length; i += 3) {
-    const positionsVector = new Vector3(
-      (positions[i] *= halfSize[0]),
-      (positions[i + 1] *= halfSize[1]),
-      (positions[i + 2] *= halfSize[2])
-    );
+    positions[i] *= halfSize[0];
+    positions[i + 1] *= halfSize[1];
+    positions[i + 2] *= halfSize[2];
+    const positionsVector = new Vector3(positions[i], positions[i + 1], positions[i + 2]);
     const rotatedPositions = positionsVector
       // @ts-expect-error
       .transformByQuaternion(node.obb.quaternion)

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

@@ -382,7 +382,7 @@ export default class I3SConverter {
         ...this.loadOptions,
         '3d-tiles': {...this.loadOptions['3d-tiles'], loadGLTF: false}
       });
-    } catch (error) {
+    } catch (_error) {
       // eslint-disable-next-line no-console
       console.log(
         `[warning]: Failed to load ${sourceTile.contentUrl}. An I3S tile with empty content will be added to the output tileset`
@@ -462,7 +462,7 @@ export default class I3SConverter {
       : tilesetPath;
     try {
       await removeDir(removePath);
-    } catch (e) {
+    } catch (_e) {
       // do nothing
     }
 
@@ -532,7 +532,7 @@ export default class I3SConverter {
     this.layers0!.materialDefinitions = this.materialDefinitions;
     // @ts-ignore
     this.layers0.geometryDefinitions = transform(
-      this.geometryConfigs.map((config) => ({
+      this.geometryConfigs.map(config => ({
         geometryConfig: {...config, draco: this.options.draco}
       })),
       geometryDefinitionTemlate()
@@ -540,9 +540,7 @@ export default class I3SConverter {
 
     if (this.layersHasTexture === false) {
       this.layers0!.store.defaultGeometrySchema.ordering =
-        this.layers0!.store.defaultGeometrySchema.ordering.filter(
-          (attribute) => attribute !== 'uv0'
-        );
+        this.layers0!.store.defaultGeometrySchema.ordering.filter(attribute => attribute !== 'uv0');
     }
 
     await this._writeLayers0();
@@ -614,14 +612,14 @@ export default class I3SConverter {
     const slpkTilesetPath = join(tilesetPath, 'SceneServer', 'layers', '0');
     const slpkFileName = `${tilesetPath}.slpk`;
 
-    await createZip(slpkTilesetPath, slpkFileName, async (fileList) => ({
+    await createZip(slpkTilesetPath, slpkFileName, async fileList => ({
       path: '@specialIndexFileHASH128@',
       file: await composeHashFile(fileList)
     }));
 
     try {
       await removeDir(tilesetPath);
-    } catch (e) {
+    } catch (_e) {
       // do nothing
     }
   }
@@ -728,7 +726,7 @@ export default class I3SConverter {
       this.layersHasTexture ||
       Boolean(
         ('texture' in resources && resources.texture) ||
-        ('texelCountHint' in resources && resources.texelCountHint)
+          ('texelCountHint' in resources && resources.texelCountHint)
       );
 
     if (this.generateBoundingVolumes && resources.boundingVolumes) {
@@ -737,7 +735,7 @@ export default class I3SConverter {
 
     const lodSelection = convertGeometricErrorToScreenThreshold(sourceTile, boundingVolumes);
     const maxScreenThresholdSQ = lodSelection.find(
-      (val) => val.metricType === 'maxScreenThresholdSQ'
+      val => val.metricType === 'maxScreenThresholdSQ'
     ) || {maxError: 0};
 
     if (isDumped) {
@@ -837,7 +835,7 @@ export default class I3SConverter {
     let tileContent: Tiles3DTileContent | null = null;
     try {
       tileContent = await loadTile3DContent(this.sourceTileset, sourceTile, this.loadOptions);
-    } catch (error) {
+    } catch (_error) {
       // eslint-disable-next-line no-console
       console.log(`[warning]: Failed to load ${sourceTile.contentUrl}`);
     }
@@ -1017,7 +1015,7 @@ export default class I3SConverter {
           definition: this.findOrCreateGeometryDefinition(
             Boolean(
               ('texture' in resources && resources.texture) ||
-              ('texelCountHint' in resources && resources.texelCountHint)
+                ('texelCountHint' in resources && resources.texelCountHint)
             ),
             hasUvRegions
           ),

package/src/i3s-converter/json-templates/geometry-definitions.ts

@@ -18,7 +18,7 @@ const PLAIN_GEOMETRY_DEFINITION = () => ({
   },
   uv0: {
     path: 'hasTexture',
-    transform: (val) => (val && {type: 'Float32', component: 2}) || false,
+    transform: val => (val && {type: 'Float32', component: 2}) || false,
     omitValues: [false]
   },
   color: {
@@ -29,7 +29,7 @@ const PLAIN_GEOMETRY_DEFINITION = () => ({
   },
   uvRegion: {
     path: 'hasUvRegions',
-    transform: (val) => (val && {type: 'UInt16', component: 4}) || false,
+    transform: val => (val && {type: 'UInt16', component: 4}) || false,
     omitValues: [false]
   },
   featureId: {
@@ -54,7 +54,7 @@ const COMPRESSED_GEOMETRY_DEFINITION = () => ({
   },
   'compressedAttributes.attributes': {
     path: 'geometryConfig',
-    transform: (val) => {
+    transform: val => {
       const result = ['position', 'normal'];
       if (val.hasTexture) {
         result.push('uv0');
@@ -72,7 +72,7 @@ const COMPRESSED_GEOMETRY_DEFINITION = () => ({
 export const GEOMETRY_DEFINITION = () => ({
   geometryBuffers: {
     path: 'geometryConfig',
-    transform: (val) => {
+    transform: val => {
       const result = [transform(val, PLAIN_GEOMETRY_DEFINITION())];
       if (val.draco) {
         result.push(transform({geometryConfig: val}, COMPRESSED_GEOMETRY_DEFINITION()));

package/src/i3s-converter/json-templates/layers.ts

@@ -69,7 +69,7 @@ const FULL_EXTENT = () => ({
 export const LAYERS = () => ({
   version: {
     path: 'version',
-    transform: (val) => val.toUpperCase()
+    transform: val => val.toUpperCase()
   },
   id: {
     path: 'id',
@@ -88,7 +88,7 @@ export const LAYERS = () => ({
   },
   spatialReference: {
     path: 'spatialReference',
-    transform: (val) => transform(val, SPATIAL_REFERENCE())
+    transform: val => transform(val, SPATIAL_REFERENCE())
   },
   capabilities: {
     path: 'capabilities',
@@ -96,19 +96,19 @@ export const LAYERS = () => ({
   },
   store: {
     path: 'store',
-    transform: (val) => transform(val, STORE)
+    transform: val => transform(val, STORE)
   },
   fullExtent: {
     path: 'fullExtent',
-    transform: (val) => transform(val, FULL_EXTENT())
+    transform: val => transform(val, FULL_EXTENT())
   },
   heightModelInfo: {
     path: 'heightModelInfo',
-    transform: (val) => transform(val, HEIGHT_MODEL_INFO())
+    transform: val => transform(val, HEIGHT_MODEL_INFO())
   },
   nodePages: {
     path: 'nodePages',
-    transform: (val) => transform(val, NODE_PAGES())
+    transform: val => transform(val, NODE_PAGES())
   },
   materialDefinitions: {
     path: 'materialDefinitions',

package/src/i3s-converter/json-templates/node.ts

@@ -60,7 +60,7 @@ export const NODE = () => ({
   },
   parentNode: {
     path: 'parentNode',
-    transform: (val) => transform(val, PARENT_NODE()),
+    transform: val => transform(val, PARENT_NODE()),
     default: null
   },
   sharedResource: {

package/src/i3s-converter/json-templates/scene-server.ts

@@ -22,6 +22,6 @@ export const SCENE_SERVER = () => ({
   },
   layers: {
     path: 'layers0',
-    transform: (layers0) => [layers0]
+    transform: layers0 => [layers0]
   }
 });

package/src/i3s-converter/json-templates/shared-resources.ts

@@ -94,7 +94,7 @@ const TEXTURE_DEFINITION_INFO = () => ({
   images: {
     path: 'images',
     transform: (val, thisObject, originalObject) =>
-      val.map((image) => transform(image, TEXTURE_DEFINITION_IMAGE()))
+      val.map(image => transform(image, TEXTURE_DEFINITION_IMAGE()))
   }
 });
 

package/src/i3s-converter/json-templates/store.ts

@@ -1,7 +1,7 @@
 export const STORE = {
   id: {
     path: 'id',
-    transform: (val) => val.toUpperCase()
+    transform: val => val.toUpperCase()
   },
   profile: {
     path: 'profile',

package/src/i3s-server/controllers/slpk-controller.ts

@@ -11,7 +11,7 @@ let slpkArchive: SLPKArchive;
 export async function loadArchive(fullLayerPath: string): Promise<void> {
   slpkArchive = await parseSLPKArchive(
     new NodeFile(fullLayerPath),
-    (msg) => console.log(msg) // eslint-disable-line no-console
+    msg => console.log(msg) // eslint-disable-line no-console
   );
   // eslint-disable-next-line no-console
   console.log('The server is ready to use');

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

@@ -28,7 +28,7 @@ router.get('*', (req, res, next) => {
       try {
         const json = JSON.parse(textDecoder.decode(file));
         res.send(json);
-      } catch (e) {
+      } catch (_e) {
         res.send(Buffer.from(file));
       }
     } else {

package/src/lib/utils/compress-util.ts

@@ -1,5 +1,6 @@
 import {createGzip} from 'zlib';
 import {createReadStream, createWriteStream} from 'fs';
+import {pipeline} from 'stream';
 
 /**
  * Compress file to gzip file
@@ -14,15 +15,15 @@ export function compressFileWithGzip(pathFile: string): Promise<string> {
   const output = createWriteStream(compressedPathFile);
 
   return new Promise((resolve, reject) => {
-    input.on('end', () => {
+    pipeline(input, gzip, output, error => {
+      if (error) {
+        console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console
+        reject(error);
+        return;
+      }
+
       console.log(`${compressedPathFile} compressed and saved.`); // eslint-disable-line no-undef,no-console
       resolve(compressedPathFile);
     });
-    input.on('error', (error) => {
-      console.log(`${compressedPathFile}: compression error!`); // eslint-disable-line no-undef,no-console
-      reject(error);
-    });
-    // @ts-ignore Seems typescript upgrade triggered this
-    input.pipe(gzip).pipe(output);
   });
 }

package/src/lib/utils/conversion-dump.ts

@@ -141,7 +141,7 @@ export class ConversionDump {
           return;
         }
       } catch (error) {
-        // prettier-ignore
+        // biome-ignore format: preserve intentional fixture layout
         console.log('Can\'t open dump file', error); // eslint-disable-line no-console
       }
     }
@@ -196,7 +196,7 @@ export class ConversionDump {
           )
         );
       } catch (error) {
-        // prettier-ignore
+        // biome-ignore format: preserve intentional fixture layout
         console.log('Can\'t update dump file', error); // eslint-disable-line no-console
       }
     }
@@ -289,7 +289,7 @@ export class ConversionDump {
     value: boolean
   ) {
     const nodeDump = this.tilesConverted[filename]?.nodes.find(
-      (element) => element.nodeId === nodeId
+      element => element.nodeId === nodeId
     );
     if (nodeDump) {
       if (!nodeDump.progress) {
@@ -361,7 +361,7 @@ export class ConversionDump {
     done: boolean
   ): Promise<void> {
     const nodeDump = this.tilesConverted[filename]?.nodes.find(
-      (element) => element.nodeId === nodeId
+      element => element.nodeId === nodeId
     );
     if (nodeDump) {
       nodeDump.done = done;

package/src/lib/utils/file-utils.ts

@@ -81,7 +81,7 @@ export async function openJson(path: string, fileName: string): Promise<{[key: s
     const intervalId = setInterval(() => {
       const pathFile = join(path, fileName);
       load(pathFile, JSONLoader)
-        .then((result) => {
+        .then(result => {
           clearInterval(intervalId);
           resolve(result);
         })
@@ -147,7 +147,7 @@ export async function renameFile(oldPath: string, newPath: string): Promise<void
   try {
     await fs.rename(oldPath, newPath);
   } catch (err) {
-    // prettier-ignore
+    // biome-ignore format: preserve intentional fixture layout
     console.log('Can\'t rename file', err); // eslint-disable-line no-console
   }
 }

package/src/lib/utils/lod-conversion-utils.ts

@@ -65,13 +65,11 @@ export function convertGeometricErrorToScreenThreshold(
  * @returns lod metric in 3d-tiles format
  */
 export function convertScreenThresholdToGeometricError(node: I3STileHeader): number {
-  const metricData = node.lodSelection?.find(
-    (metric) => metric.metricType === 'maxScreenThreshold'
-  );
+  const metricData = node.lodSelection?.find(metric => metric.metricType === 'maxScreenThreshold');
   let maxError = metricData?.maxError;
   if (!maxError) {
     const sqMetricData = node.lodSelection?.find(
-      (metric) => metric.metricType === 'maxScreenThresholdSQ'
+      metric => metric.metricType === 'maxScreenThresholdSQ'
     );
     if (sqMetricData) {
       maxError = Math.sqrt(sqMetricData.maxError / (Math.PI * 0.25));