@loaders.gl/tile-converter 4.2.0-alpha.5 → 4.2.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tile-converter",
-  "version": "4.2.0-alpha.5",
+  "version": "4.2.0-beta.1",
   "description": "Converter",
   "license": "MIT",
   "type": "module",
@@ -28,9 +28,9 @@
   },
   "sideEffects": false,
   "bin": {
-    "tile-converter": "./bin/converter.js",
+    "i3s-server": "./bin/i3s-server.js",
     "slpk-extractor": "./bin/slpk-extractor.js",
-    "i3s-server": "./bin/i3s-server.js"
+    "tile-converter": "./bin/converter.js"
   },
   "files": [
     "src",
@@ -39,11 +39,11 @@
     "README.md"
   ],
   "browser": {
+    "archiver": false,
     "fs": false,
+    "join-images": false,
     "path": false,
-    "process": false,
-    "archiver": false,
-    "join-images": false
+    "process": false
   },
   "scripts": {
     "pre-build": "npm run build-converter-bundle && npm run build-slpk-extractor-bundle && npm run build-i3s-server-bundle",
@@ -52,18 +52,20 @@
     "build-i3s-server-bundle": "esbuild src/i3s-server/bin/www.ts --outfile=dist/i3s-server/bin/i3s-server.min.cjs --platform=node --target=esnext,node14 --minify --bundle --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.2.0-alpha.5",
-    "@loaders.gl/crypto": "4.2.0-alpha.5",
-    "@loaders.gl/draco": "4.2.0-alpha.5",
-    "@loaders.gl/gltf": "4.2.0-alpha.5",
-    "@loaders.gl/i3s": "4.2.0-alpha.5",
-    "@loaders.gl/images": "4.2.0-alpha.5",
-    "@loaders.gl/loader-utils": "4.2.0-alpha.5",
-    "@loaders.gl/polyfills": "4.2.0-alpha.5",
-    "@loaders.gl/textures": "4.2.0-alpha.5",
-    "@loaders.gl/tiles": "4.2.0-alpha.5",
-    "@loaders.gl/worker-utils": "4.2.0-alpha.5",
-    "@loaders.gl/zip": "4.2.0-alpha.5",
+    "@loaders.gl/3d-tiles": "4.2.0-beta.1",
+    "@loaders.gl/compression": "4.2.0-beta.1",
+    "@loaders.gl/crypto": "4.2.0-beta.1",
+    "@loaders.gl/draco": "4.2.0-beta.1",
+    "@loaders.gl/gltf": "4.2.0-beta.1",
+    "@loaders.gl/i3s": "4.2.0-beta.1",
+    "@loaders.gl/images": "4.2.0-beta.1",
+    "@loaders.gl/loader-utils": "4.2.0-beta.1",
+    "@loaders.gl/math": "4.2.0-beta.1",
+    "@loaders.gl/polyfills": "4.2.0-beta.1",
+    "@loaders.gl/textures": "4.2.0-beta.1",
+    "@loaders.gl/tiles": "4.2.0-beta.1",
+    "@loaders.gl/worker-utils": "4.2.0-beta.1",
+    "@loaders.gl/zip": "4.2.0-beta.1",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geoid": "^4.0.0",
@@ -73,7 +75,7 @@
     "cors": "^2.8.5",
     "crypt": "^0.0.2",
     "debug": "~4.3.4",
-    "express": "~4.18.2",
+    "express": "~4.19.2",
     "inquirer": "^8.0.0",
     "json-map-transform": "^1.2.6",
     "jszip": "^3.5.0",
@@ -86,11 +88,10 @@
     "sharp": "^0.31.3"
   },
   "devDependencies": {
-    "@types/express": "^4.17.17",
-    "@types/node": "^20.4.2"
+    "@types/express": "^4.17.17"
   },
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "32d95a81971f104e4dfeb88ab57065f05321a76a"
+  "gitHead": "c386a9196516fe3ff24847b40e6c77be039cf905"
 }

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

@@ -81,6 +81,7 @@ export default class Tiles3DConverter {
    * @param options.egmFilePath location of *.pgm file to convert heights from ellipsoidal to gravity-related format
    * @param options.maxDepth The max tree depth of conversion
    */
+  // eslint-disable-next-line complexity, max-statements
   public async convert(options: {
     inputUrl: string;
     outputPath: string;
@@ -89,9 +90,9 @@ export default class Tiles3DConverter {
     egmFilePath: string;
     inquirer?: Promise<unknown>;
     analyze?: boolean;
-  }): Promise<any> {
+  }): Promise<string | undefined> {
     if (isBrowser) {
-      console.log(BROWSER_ERROR_MESSAGE);
+      console.log(BROWSER_ERROR_MESSAGE); // eslint-disable-line no-console
       return BROWSER_ERROR_MESSAGE;
     }
     const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath, inquirer, analyze} = options;
@@ -108,7 +109,7 @@ export default class Tiles3DConverter {
     if (analyze || this.slpkFilesystem) {
       preprocessResult = await this.preprocessConversion();
       if (!preprocessResult || analyze) {
-        return;
+        return undefined;
       }
     }
 
@@ -126,7 +127,7 @@ export default class Tiles3DConverter {
     );
 
     if (!this.sourceTileset) {
-      return;
+      return undefined;
     }
 
     const rootNode = this.sourceTileset?.root;
@@ -186,6 +187,7 @@ export default class Tiles3DConverter {
     // Clean up worker pools
     const workerFarm = WorkerFarm.getWorkerFarm({});
     workerFarm.destroy();
+    return undefined;
   }
 
   /**
@@ -193,24 +195,32 @@ export default class Tiles3DConverter {
    * @returns true - the conversion is possible, false - the tileset's content is not supported
    */
   private async preprocessConversion(): Promise<boolean> {
-    console.log(`Analyze source layer`);
+    // eslint-disable-next-line no-console
+    console.log('Analyze source layer');
     const nodesCount = await getNodeCount(this.slpkFilesystem);
     this.progress.stepsTotal = nodesCount;
 
-    console.log(`------------------------------------------------`);
-    console.log(`Preprocess results:`);
+    // eslint-disable-next-line no-console
+    console.log('------------------------------------------------');
+    // eslint-disable-next-line no-console
+    console.log('Preprocess results:');
     if (this.slpkFilesystem) {
+      // eslint-disable-next-line no-console
       console.log(`Node count: ${nodesCount}`);
       if (nodesCount === 0) {
+        // eslint-disable-next-line no-console
         console.log('Node count is 0. The conversion will be interrupted.');
-        console.log(`------------------------------------------------`);
+        // eslint-disable-next-line no-console
+        console.log('------------------------------------------------');
         return false;
       }
     } else {
-      console.log(`Node count cannot be calculated for the remote dataset`);
+      // eslint-disable-next-line no-console
+      console.log('Node count cannot be calculated for the remote dataset');
     }
 
-    console.log(`------------------------------------------------`);
+    // eslint-disable-next-line no-console
+    console.log('------------------------------------------------');
     return true;
   }
 
@@ -221,6 +231,7 @@ export default class Tiles3DConverter {
    * @param level a current level of a tree depth
    * @param childNodeInfo child node to convert
    */
+  // eslint-disable-next-line complexity, max-statements
   private async convertChildNode(
     parentSourceNode: I3STileHeader,
     parentNode: Tiles3DTileJSON,

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

@@ -54,6 +54,7 @@ export default class B3dmConverter {
    * @param i3sTile - Tile3D instance for I3S node
    * @returns - encoded glb content
    */
+  // eslint-disable-next-line max-statements
   async buildGLTF(
     i3sAttributesData: I3SAttributesData,
     featureAttributes: any

package/src/3d-tiles-converter/helpers/load-i3s.ts

@@ -73,8 +73,7 @@ export const loadI3SContent = async (
  */
 export async function openSLPK(url: string): Promise<ZipFileSystem | null> {
   const slpkUrlParts = url.split('.slpk');
-  const {slpkFileName} = getSlpkUrlParts(url) || {};
-  if (slpkFileName) {
+  if (slpkUrlParts.length === 2) {
     const slpkFileName = `${slpkUrlParts[0]}.slpk`;
     const fileProvider = new FileHandleFile(slpkFileName);
     const archive = await parseSLPKArchive(fileProvider, undefined, slpkFileName);
@@ -97,10 +96,8 @@ export async function loadFromArchive(
   loadOptions: I3SLoaderOptions,
   fileSystem: ZipFileSystem | null
 ) {
-  const slpkUrlParts = getSlpkUrlParts(url);
-  if (fileSystem !== null && slpkUrlParts !== null) {
-    const {internalFileName} = slpkUrlParts;
-    const content = await load(internalFileName, loader, {
+  if (fileSystem !== null) {
+    const content = await load(url, loader, {
       ...loadOptions,
       fetch: fileSystem.fetch.bind(fileSystem)
     });
@@ -109,27 +106,6 @@ export async function loadFromArchive(
   return await load(url, loader, loadOptions);
 }
 
-/**
- * Extract slpk file path and internal from the url
- * For example, for `./path/to/file.slpk/nodes/0` it returns
- * {"slpkFileName": "./path/to/file.slpk", "internalFileName": "/nodes/0" }
- * @param url full internal file path
- * @returns object with internal slpk file parts
- */
-function getSlpkUrlParts(url: string): SLPKUrlParts | null {
-  const slpkUrlParts = url.split('.slpk');
-  let result: SLPKUrlParts | null;
-  // Not '.slpk'. The file will be loaded with global fetch function
-  if (slpkUrlParts.length === 1) {
-    result = null;
-  } else if (slpkUrlParts.length === 2) {
-    result = {slpkFileName: `${slpkUrlParts[0]}.slpk`, internalFileName: slpkUrlParts[1].slice(1)};
-  } else {
-    throw new Error('Unexpected URL format');
-  }
-  return result;
-}
-
 /**
  * Get nodes count inside SLPK
  * @param fileSystem - file system of SLPK

package/src/converter-cli.ts

@@ -13,6 +13,7 @@ import {
 } from './lib/utils/cli-utils';
 import {addOneFile, composeHashFile, makeZipCDHeaderIterator} from '@loaders.gl/zip';
 import {FileHandleFile} from '@loaders.gl/loader-utils';
+// @ts-ignore
 import {copyFile} from 'node:fs/promises';
 
 type TileConversionOptions = {
@@ -82,6 +83,7 @@ const TILESET_TYPE = {
  * CLI entry
  * @returns
  */
+// eslint-disable-next-line max-statements
 async function main() {
   const [, , ...args] = process.argv;
 
@@ -152,7 +154,7 @@ async function main() {
 
 main().catch((error) => {
   console.log(error);
-  process.exit(1); // eslint-disable-line
+  process.exit(1); // eslint-disable-line no-process-exit
 });
 
 /**
@@ -295,7 +297,7 @@ function validateOptions(
   }
   if (exceptions.length) {
     exceptions.forEach((exeption) => exeption());
-    process.exit(1);
+    process.exit(1); // eslint-disable-line no-process-exit
   }
   return <ValidatedTileConversionOptions>options;
 }

package/src/deps-installer/deps-installer.ts

@@ -1,3 +1,7 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright vis.gl contributors
+
 import {load, fetchFile} from '@loaders.gl/core';
 import {ZipLoader} from '@loaders.gl/zip';
 import {writeFile} from '../lib/utils/file-utils';
@@ -25,6 +29,7 @@ export class DepsInstaller {
    *    This path is '' by default and is not used by tile-converter.
    *    It is used in tests to prevent rewriting actual workers during tests running
    */
+  // eslint-disable-next-line max-statements
   async install(path: string = ''): Promise<void> {
     console.log('Installing "EGM2008-5" model...'); // eslint-disable-line no-console
     const fileMap = await load(PGM_LINK, ZipLoader, {});
@@ -78,6 +83,7 @@ export class DepsInstaller {
     await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.ENCODER, 'libs');
     await this.installFromNpm('textures', BASIS_EXTERNAL_LIBRARIES.ENCODER_WASM, 'libs');
 
+    // eslint-disable-next-line no-console
     console.log('Installing "join-images" npm package');
     const childProcess = new ChildProcessProxy();
     const nodeDir = dirname(process.execPath);
@@ -98,6 +104,11 @@ export class DepsInstaller {
     const fileResponse = await fetchFile(
       `https://unpkg.com/@loaders.gl/${module}@${VERSION}/dist/${extraPath}/${name}`
     );
+
+    if (fileResponse.status < 200 || fileResponse.status >= 300) {
+      throw new Error(`Failed to load resource ${name}`);
+    }
+
     const fileData = await fileResponse.arrayBuffer();
     if (!fileData) {
       return;

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

@@ -94,7 +94,7 @@ export class AttributeMetadataInfo {
       Use attributeStorageInfo as a source of attribute names to create the popupInfo.
       */
       const attributeNames: string[] = [];
-      for (let info of this._attributeStorageInfo) {
+      for (const info of this._attributeStorageInfo) {
         attributeNames.push(info.name);
       }
       this._popupInfo = this.createPopupInfo(attributeNames);

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

@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 import {GLTFAccessorPostprocessed, GLTFMeshPrimitivePostprocessed} from '@loaders.gl/gltf';
 import type {NumericArray} from '@loaders.gl/loader-utils';
 import type {
@@ -94,7 +95,7 @@ function handleExtMeshFeaturesExtension(
   },
   extMeshFeatures: GLTF_EXT_mesh_features
 ): NumericArray {
-  for (let ids of extMeshFeatures.featureIds) {
+  for (const ids of extMeshFeatures.featureIds) {
     if (typeof ids.propertyTable !== 'undefined') {
       // propertyTable is an index that can be 0
       // return the first featureID set that corresponts to property table.
@@ -240,6 +241,7 @@ function generateBatchIdsFromTexture(
       batchIds.push(batchId);
     }
   } else {
+    // eslint-disable-next-line no-console
     console.warn(`Can't get batch Ids from ${image?.mimeType || ''} compressed texture`);
   }
 

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

@@ -67,8 +67,8 @@ export function createBoundingVolumesFromGeometry(
   const geometryObb = makeOrientedBoundingBoxFromPoints(positionVectors);
   const geometryMbs = makeBoundingSphereFromPoints(positionVectors);
 
-  let mbsCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new Vector3());
-  let obbCenter = Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new Vector3());
+  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]);

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

@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 import type {FeatureTableJson} from '@loaders.gl/3d-tiles';
 import type {Attribute} from '@loaders.gl/i3s';
 import type {
@@ -137,7 +138,7 @@ export const getAttributeTypesMapFromSchema = (
     gltfJson.extensions?.[EXT_FEATURE_METADATA] as GLTF_EXT_feature_metadata_GLTF
   )?.schema?.classes?.[metadataClass];
   if (extFeatureMetadataSchemaClass) {
-    for (let propertyName in extFeatureMetadataSchemaClass.properties) {
+    for (const propertyName in extFeatureMetadataSchemaClass.properties) {
       const property = extFeatureMetadataSchemaClass.properties[propertyName];
       const attributeProperty = getAttributeTypeFromExtFeatureMetadata(property);
       attributeTypesMap[propertyName] = attributeProperty;
@@ -149,7 +150,7 @@ export const getAttributeTypesMapFromSchema = (
     gltfJson.extensions?.[EXT_STRUCTURAL_METADATA] as GLTF_EXT_structural_metadata_GLTF
   )?.schema?.classes?.[metadataClass];
   if (extStructuralMetadataSchemaClass) {
-    for (let propertyName in extStructuralMetadataSchemaClass.properties) {
+    for (const propertyName in extStructuralMetadataSchemaClass.properties) {
       const property = extStructuralMetadataSchemaClass.properties[propertyName];
       const attributeProperty = getAttributeTypeFromExtStructuralMetadata(property);
       attributeTypesMap[propertyName] = attributeProperty;
@@ -166,6 +167,7 @@ export const getAttributeTypesMapFromSchema = (
  * @param property - schema of the class property for Ext_feature_metadata
  * @returns attribute's type
  */
+// eslint-disable-next-line complexity
 const getAttributeTypeFromExtFeatureMetadata = (
   property: GLTF_EXT_feature_metadata_ClassProperty
 ): Attribute => {
@@ -207,6 +209,7 @@ const getAttributeTypeFromExtFeatureMetadata = (
  * @param property - schema of the class property for Ext_structural_metadata
  * @returns attribute's type
  */
+// eslint-disable-next-line complexity
 const getAttributeTypeFromExtStructuralMetadata = (
   property: GLTF_EXT_structural_metadata_ClassProperty
 ): Attribute => {

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

@@ -113,6 +113,7 @@ function getFrequentValue(values: number[]): number {
  * @param  attributes
  * @returns sorted list of attribute objects.
  */
+// eslint-disable-next-line max-statements
 function makeAttributeObjects(attributes: GeometryAttributes): GroupedByFeatureIdAttributes[] {
   const {
     featureIds,
@@ -125,11 +126,11 @@ function makeAttributeObjects(attributes: GeometryAttributes): GroupedByFeatureI
   } = attributes;
   const groupedData: GroupedByFeatureIdAttributes[] = [];
 
-  let positionsList = new Float32Array(positions);
-  let normalsList = new Float32Array(normals);
-  let colorsList = new Uint8Array(colors);
-  let texCoordsList = new Float32Array(texCoords);
-  let uvRegionsList = new Uint16Array(uvRegions);
+  const positionsList = new Float32Array(positions);
+  const normalsList = new Float32Array(normals);
+  const colorsList = new Uint8Array(colors);
+  const texCoordsList = new Float32Array(texCoords);
+  const uvRegionsList = new Uint16Array(uvRegions);
   let positionsOffset = 0;
   let normalsOffset = 0;
   let colorsOffset = 0;