@loaders.gl/tile-converter 4.3.0-alpha.7 → 4.3.0-beta.1

package/dist/lib/utils/conversion-dump.d.ts

@@ -14,6 +14,7 @@ export type ConversionDumpOptions = {
     generateBoundingVolumes: boolean;
     metadataClass: string;
     analyze: boolean;
+    outputVersion: string;
 };
 type NodeDoneStatus = {
     nodeId: number | string;

package/dist/lib/utils/conversion-dump.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversion-dump.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/conversion-dump.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversion-dump.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/conversion-dump.ts"],"names":[],"mappings":"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"}

package/dist/lib/utils/conversion-dump.js

@@ -26,7 +26,7 @@ export class ConversionDump {
      * @param currentOptions - converter options
      */
     async createDump(currentOptions) {
-        const { tilesetName, slpk, egmFilePath, inputUrl, outputPath, draco = true, maxDepth, token, generateTextures, generateBoundingVolumes, mergeMaterials = true, metadataClass, analyze = false } = currentOptions;
+        const { tilesetName, slpk, egmFilePath, inputUrl, outputPath, draco = true, maxDepth, token, generateTextures, generateBoundingVolumes, mergeMaterials = true, metadataClass, analyze = false, outputVersion = '1.1' } = currentOptions;
         this.options = {
             tilesetName,
             slpk,
@@ -40,7 +40,8 @@ export class ConversionDump {
             generateBoundingVolumes,
             mergeMaterials,
             metadataClass,
-            analyze
+            analyze,
+            outputVersion
         };
         const dumpFilename = join(this.options.outputPath, this.options.tilesetName, `${this.options.tilesetName}${DUMP_FILE_SUFFIX}`);
         if (await isFileExists(dumpFilename)) {

package/dist/pgm-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pgm-loader.d.ts","sourceRoot":"","sources":["../src/pgm-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAC,KAAK,EAAW,MAAM,gBAAgB,CAAC;AAM/C,OAAO,EAAC,KAAK,EAAC,CAAC;AAEf,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;CAgB+C,CAAC"}
+{"version":3,"file":"pgm-loader.d.ts","sourceRoot":"","sources":["../src/pgm-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EAAC,KAAK,EAAW,MAAM,gBAAgB,CAAC;AAM/C,OAAO,EAAC,KAAK,EAAC,CAAC;AAEf,MAAM,MAAM,gBAAgB,GAAG,aAAa,GAAG;IAC7C,GAAG,CAAC,EAAE;QACJ,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS;uBACS,KAAK;wBACf,KAAK;;;;;;;;;;;;;CAc2C,CAAC"}

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.6" !== 'undefined' ? "4.3.0-alpha.6" : 'latest';
+const VERSION = typeof "4.3.0-alpha.8" !== 'undefined' ? "4.3.0-alpha.8" : '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.7",
+  "version": "4.3.0-beta.1",
   "description": "Converter",
   "license": "MIT",
   "type": "module",
@@ -51,24 +51,24 @@
     "copy-certificates": "cp -R src/i3s-server/certs dist/i3s-server"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "4.3.0-alpha.7",
-    "@loaders.gl/compression": "4.3.0-alpha.7",
-    "@loaders.gl/crypto": "4.3.0-alpha.7",
-    "@loaders.gl/draco": "4.3.0-alpha.7",
-    "@loaders.gl/gltf": "4.3.0-alpha.7",
-    "@loaders.gl/i3s": "4.3.0-alpha.7",
-    "@loaders.gl/images": "4.3.0-alpha.7",
-    "@loaders.gl/loader-utils": "4.3.0-alpha.7",
-    "@loaders.gl/math": "4.3.0-alpha.7",
-    "@loaders.gl/polyfills": "4.3.0-alpha.7",
-    "@loaders.gl/textures": "4.3.0-alpha.7",
-    "@loaders.gl/tiles": "4.3.0-alpha.7",
-    "@loaders.gl/worker-utils": "4.3.0-alpha.7",
-    "@loaders.gl/zip": "4.3.0-alpha.7",
-    "@math.gl/core": "^4.0.0",
-    "@math.gl/culling": "^4.0.0",
-    "@math.gl/geoid": "^4.0.0",
-    "@math.gl/geospatial": "^4.0.0",
+    "@loaders.gl/3d-tiles": "4.3.0-beta.1",
+    "@loaders.gl/compression": "4.3.0-beta.1",
+    "@loaders.gl/crypto": "4.3.0-beta.1",
+    "@loaders.gl/draco": "4.3.0-beta.1",
+    "@loaders.gl/gltf": "4.3.0-beta.1",
+    "@loaders.gl/i3s": "4.3.0-beta.1",
+    "@loaders.gl/images": "4.3.0-beta.1",
+    "@loaders.gl/loader-utils": "4.3.0-beta.1",
+    "@loaders.gl/math": "4.3.0-beta.1",
+    "@loaders.gl/polyfills": "4.3.0-beta.1",
+    "@loaders.gl/textures": "4.3.0-beta.1",
+    "@loaders.gl/tiles": "4.3.0-beta.1",
+    "@loaders.gl/worker-utils": "4.3.0-beta.1",
+    "@loaders.gl/zip": "4.3.0-beta.1",
+    "@math.gl/core": "^4.1.0",
+    "@math.gl/culling": "^4.1.0",
+    "@math.gl/geoid": "^4.1.0",
+    "@math.gl/geospatial": "^4.1.0",
     "ajv": "^8.12.0",
     "archiver": "^5.0.0",
     "cors": "^2.8.5",
@@ -93,5 +93,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^4.0.0"
   },
-  "gitHead": "73fb27872d89f3804dca37ebd568c6ba9609a98f"
+  "gitHead": "992d24e7d4e3015a91fa1cbfe87ee7dc1b333322"
 }

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

@@ -2,7 +2,8 @@ import type {
   AttributeStorageInfo,
   FeatureAttribute,
   NodeReference,
-  I3STilesetHeader
+  I3STilesetHeader,
+  I3STileAttributes
 } from '@loaders.gl/i3s';
 import type {Tile3DBoundingVolume, Tiles3DTileJSON} from '@loaders.gl/3d-tiles';
 
@@ -22,7 +23,10 @@ import {TILESET as tilesetTemplate} from './json-templates/tileset';
 import {createObbFromMbs} from '../i3s-converter/helpers/coordinate-converter';
 import {WorkerFarm} from '@loaders.gl/worker-utils';
 import {BROWSER_ERROR_MESSAGE} from '../constants';
-import B3dmConverter, {I3SAttributesData} from './helpers/b3dm-converter';
+import {
+  Tiles3DContentConverter,
+  type I3SAttributesData
+} from './helpers/3d-tiles-content-converter';
 import {I3STileHeader} from '@loaders.gl/i3s/src/types';
 import {getNodeCount, loadFromArchive, loadI3SContent, openSLPK} from './helpers/load-i3s';
 import {I3SLoaderOptions} from '@loaders.gl/i3s/src/i3s-loader';
@@ -59,6 +63,7 @@ export default class Tiles3DConverter {
   };
   conversionDump: ConversionDump;
   progress: Progress;
+  fileExt: string;
 
   constructor() {
     this.options = {};
@@ -71,6 +76,7 @@ export default class Tiles3DConverter {
     this.workerSource = {};
     this.conversionDump = new ConversionDump();
     this.progress = new Progress();
+    this.fileExt = '';
   }
 
   /**
@@ -78,6 +84,7 @@ export default class Tiles3DConverter {
    * @param options
    * @param options.inputUrl the url to read the tileset from
    * @param options.outputPath the output filename
+   * @param options.outputVersion the version of 3DTiles
    * @param options.tilesetName the output name of the tileset
    * @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
@@ -87,6 +94,7 @@ export default class Tiles3DConverter {
     inputUrl: string;
     outputPath: string;
     tilesetName: string;
+    outputVersion?: string;
     maxDepth?: number;
     egmFilePath: string;
     inquirer?: {prompt: PromptModule};
@@ -96,9 +104,19 @@ export default class Tiles3DConverter {
       console.log(BROWSER_ERROR_MESSAGE); // eslint-disable-line no-console
       return BROWSER_ERROR_MESSAGE;
     }
-    const {inputUrl, outputPath, tilesetName, maxDepth, egmFilePath, inquirer, analyze} = options;
+    const {
+      inputUrl,
+      outputPath,
+      outputVersion,
+      tilesetName,
+      maxDepth,
+      egmFilePath,
+      inquirer,
+      analyze
+    } = options;
     this.conversionStartTime = process.hrtime();
-    this.options = {maxDepth, inquirer};
+    this.options = {maxDepth, inquirer, outputVersion};
+    this.fileExt = this.options.outputVersion === '1.0' ? 'b3dm' : 'glb';
 
     console.log('Loading egm file...'); // eslint-disable-line
     this.geoidHeightModel = await load(egmFilePath, PGMLoader);
@@ -173,7 +191,7 @@ export default class Tiles3DConverter {
 
     await this._addChildren(rootNode, rootTile, 1);
 
-    const tileset = transform({root: rootTile}, tilesetTemplate());
+    const tileset = transform({asset: {version: outputVersion}, root: rootTile}, tilesetTemplate());
     await writeFile(this.tilesetPath, JSON.stringify(tileset), 'tileset.json');
     await this.conversionDump.deleteDumpFile();
 
@@ -244,7 +262,7 @@ export default class Tiles3DConverter {
     if (sourceChild.contentUrl) {
       if (
         this.conversionDump.restored &&
-        this.conversionDump.isFileConversionComplete(`${sourceChild.id}.b3dm`) &&
+        this.conversionDump.isFileConversionComplete(`${sourceChild.id}.${this.fileExt}`) &&
         (sourceChild.obb || sourceChild.mbs)
       ) {
         const {child} = this._createChildAndBoundingVolume(sourceChild);
@@ -266,7 +284,7 @@ export default class Tiles3DConverter {
 
       this.vertexCounter += content?.vertexCount || 0;
 
-      let featureAttributes: FeatureAttribute | null = null;
+      let featureAttributes: I3STileAttributes | null = null;
       if (this.attributeStorageInfo) {
         featureAttributes = await this._loadChildAttributes(sourceChild, this.attributeStorageInfo);
       }
@@ -279,13 +297,21 @@ export default class Tiles3DConverter {
         textureFormat: sourceChild.textureFormat
       };
 
-      const b3dmConverter = new B3dmConverter();
-      const b3dm = await b3dmConverter.convert(i3sAttributesData, featureAttributes);
+      const converter = new Tiles3DContentConverter({outputVersion: this.options.outputVersion});
+      const contentData = await converter.convert(
+        i3sAttributesData,
+        featureAttributes,
+        this.attributeStorageInfo
+      );
 
-      await this.conversionDump.addNode(`${sourceChild.id}.b3dm`, sourceChild.id);
-      await writeFile(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);
+      await this.conversionDump.addNode(`${sourceChild.id}.${this.fileExt}`, sourceChild.id);
+      await writeFile(
+        this.tilesetPath,
+        new Uint8Array(contentData),
+        `${sourceChild.id}.${this.fileExt}`
+      );
       await this.conversionDump.updateConvertedNodesDumpFile(
-        `${sourceChild.id}.b3dm`,
+        `${sourceChild.id}.${this.fileExt}`,
         sourceChild.id,
         true
       );
@@ -379,7 +405,7 @@ export default class Tiles3DConverter {
       geometricError: convertScreenThresholdToGeometricError(sourceChild),
       children: [],
       content: {
-        uri: `${sourceChild.id}.b3dm`,
+        uri: `${sourceChild.id}.${this.fileExt}`,
         boundingVolume
       }
     };
@@ -417,7 +443,7 @@ export default class Tiles3DConverter {
   private async _loadChildAttributes(
     sourceChild: I3STileHeader,
     attributeStorageInfo: AttributeStorageInfo[]
-  ): Promise<FeatureAttribute> {
+  ): Promise<I3STileAttributes> {
     const promises: any[] = [];
     const {attributeUrls = []} = sourceChild;
 

package/src/3d-tiles-converter/helpers/{b3dm-converter.ts → 3d-tiles-content-converter.ts}

@@ -1,8 +1,15 @@
-import type {I3STileContent} from '@loaders.gl/i3s';
+import type {I3STileContent, AttributeStorageInfo, I3STileAttributes} from '@loaders.gl/i3s';
 import {encodeSync} from '@loaders.gl/core';
-import {GLTFScenegraph, GLTFWriter} from '@loaders.gl/gltf';
-import {Tile3DWriter} from '@loaders.gl/3d-tiles';
+import {
+  GLTFScenegraph,
+  GLTFWriter,
+  createExtStructuralMetadata,
+  createExtMeshFeatures,
+  type PropertyAttribute
+} from '@loaders.gl/gltf';
+import {Tile3DWriter, TILE3D_TYPE} from '@loaders.gl/3d-tiles';
 import {Matrix4, Vector3} from '@math.gl/core';
+import {isTypedArray} from '@math.gl/types';
 import {Ellipsoid} from '@math.gl/geospatial';
 import {convertTextureAtlas} from './texture-atlas';
 import {generateSyntheticIndices} from '../../lib/utils/geometry-utils';
@@ -20,12 +27,18 @@ export type I3SAttributesData = {
 };
 
 /**
- * Converts content of an I3S node to *.b3dm's file content
+ * Converts content of an I3S node to 3D Tiles file content
  */
-export default class B3dmConverter {
+export class Tiles3DContentConverter {
   // @ts-expect-error
   rtcCenter: Float32Array;
   i3sTile: any;
+  tileType: string;
+
+  constructor(options: {outputVersion: string} = {outputVersion: '1.1'}) {
+    this.tileType =
+      options.outputVersion === '1.0' ? TILE3D_TYPE.BATCHED_3D_MODEL : TILE3D_TYPE.GLTF;
+  }
 
   /**
    * The starter of content conversion
@@ -34,19 +47,24 @@ export default class B3dmConverter {
    */
   async convert(
     i3sAttributesData: I3SAttributesData,
-    featureAttributes: any = null
+    featureAttributes: I3STileAttributes | null = null,
+    attributeStorageInfo?: AttributeStorageInfo[] | null | undefined
   ): Promise<ArrayBuffer> {
-    const gltf = await this.buildGLTF(i3sAttributesData, featureAttributes);
-    const b3dm = encodeSync(
-      {
-        gltfEncoded: new Uint8Array(gltf),
-        type: 'b3dm',
-        featuresLength: this._getFeaturesLength(featureAttributes),
-        batchTable: featureAttributes
-      },
-      Tile3DWriter
-    );
-    return b3dm;
+    const gltf = await this.buildGLTF(i3sAttributesData, featureAttributes, attributeStorageInfo);
+
+    if (this.tileType === TILE3D_TYPE.BATCHED_3D_MODEL) {
+      const b3dm = encodeSync(
+        {
+          gltfEncoded: new Uint8Array(gltf),
+          type: 'b3dm',
+          featuresLength: this._getFeaturesLength(featureAttributes),
+          batchTable: featureAttributes
+        },
+        Tile3DWriter
+      );
+      return b3dm;
+    }
+    return gltf;
   }
 
   /**
@@ -54,10 +72,11 @@ export default class B3dmConverter {
    * @param i3sTile - Tile3D instance for I3S node
    * @returns - encoded glb content
    */
-  // eslint-disable-next-line max-statements
+  // eslint-disable-next-line complexity, max-statements
   async buildGLTF(
     i3sAttributesData: I3SAttributesData,
-    featureAttributes: any
+    featureAttributes: I3STileAttributes | null,
+    attributeStorageInfo?: AttributeStorageInfo[] | null | undefined
   ): Promise<ArrayBuffer> {
     const {tileContent, textureFormat, box} = i3sAttributesData;
     const {material, attributes, indices: originalIndices, modelMatrix} = tileContent;
@@ -105,6 +124,7 @@ export default class B3dmConverter {
       cartographicOrigin,
       modelMatrix
     );
+
     this._createBatchIds(tileContent, featureAttributes);
     if (attributes.normals && !this._checkNormals(attributes.normals.value)) {
       delete attributes.normals;
@@ -117,16 +137,132 @@ export default class B3dmConverter {
       material: materialIndex,
       mode: 4
     });
+    if (this.tileType === TILE3D_TYPE.GLTF) {
+      this._createMetadataExtensions(
+        gltfBuilder,
+        meshIndex,
+        featureAttributes,
+        attributeStorageInfo,
+        tileContent
+      );
+    }
     const transformMatrix = this._generateTransformMatrix(cartesianOrigin);
     const nodeIndex = gltfBuilder.addNode({meshIndex, matrix: transformMatrix});
     const sceneIndex = gltfBuilder.addScene({nodeIndices: [nodeIndex]});
     gltfBuilder.setDefaultScene(sceneIndex);
 
     gltfBuilder.createBinaryChunk();
+    return encodeSync(gltfBuilder.gltf, GLTFWriter, {gltfBuilder});
+  }
 
-    const gltfBuffer = encodeSync(gltfBuilder.gltf, GLTFWriter);
+  private _createMetadataExtensions(
+    gltfBuilder: GLTFScenegraph,
+    meshIndex: number,
+    featureAttributes: I3STileAttributes | null,
+    attributeStorageInfo: AttributeStorageInfo[] | null | undefined,
+    tileContent: I3STileContent
+  ) {
+    const propertyAttributes = this._createPropertyAttibutes(
+      featureAttributes,
+      attributeStorageInfo
+    );
+    const tableIndex = createExtStructuralMetadata(gltfBuilder, propertyAttributes);
 
-    return gltfBuffer;
+    const mesh = gltfBuilder.getMesh(meshIndex);
+    for (const primitive of mesh.primitives) {
+      if (tileContent.attributes._BATCHID?.value) {
+        createExtMeshFeatures(
+          gltfBuilder,
+          primitive,
+          tileContent.attributes._BATCHID.value,
+          tableIndex
+        );
+      }
+    }
+  }
+
+  private _createPropertyAttibutes(
+    featureAttributes: I3STileAttributes | null,
+    attributeStorageInfo?: AttributeStorageInfo[] | null | undefined
+  ): PropertyAttribute[] {
+    if (!featureAttributes || !attributeStorageInfo) {
+      return [];
+    }
+    const propertyAttributeArray: PropertyAttribute[] = [];
+    for (const attributeName in featureAttributes) {
+      const propertyAttribute = this._convertAttributeStorageInfoToPropertyAttribute(
+        attributeName,
+        attributeStorageInfo,
+        featureAttributes
+      );
+      if (propertyAttribute) {
+        propertyAttributeArray.push(propertyAttribute);
+      }
+    }
+    return propertyAttributeArray;
+  }
+
+  // eslint-disable-next-line complexity
+  private _convertAttributeStorageInfoToPropertyAttribute(
+    attributeName: string,
+    attributeStorageInfo: AttributeStorageInfo[],
+    featureAttributes: I3STileAttributes
+  ): PropertyAttribute | null {
+    const attributeValues = featureAttributes[attributeName];
+    const info = attributeStorageInfo.find((e) => e.name === attributeName);
+    if (!info) {
+      return null;
+    }
+    const attributeMetadata = info.attributeValues;
+    if (!attributeMetadata?.valueType) {
+      return null;
+    }
+    let elementType: string;
+    let componentType: string | undefined;
+    switch (attributeMetadata.valueType.toLowerCase()) {
+      case 'oid32':
+        elementType = 'SCALAR';
+        componentType = 'UINT32';
+        break;
+      case 'int32':
+        elementType = 'SCALAR';
+        componentType = 'INT32';
+        break;
+      case 'uint32':
+        elementType = 'SCALAR';
+        componentType = 'UINT32';
+        break;
+      case 'int16':
+        elementType = 'SCALAR';
+        componentType = 'INT16';
+        break;
+      case 'uint16':
+        elementType = 'SCALAR';
+        componentType = 'UINT16';
+        break;
+      case 'float64':
+        elementType = 'SCALAR';
+        componentType = 'FLOAT64';
+        break;
+      case 'string':
+        elementType = 'STRING';
+        break;
+      default:
+        elementType = '';
+        break;
+    }
+    const propertyAttribute: PropertyAttribute = {
+      name: attributeName,
+      elementType,
+      componentType,
+      values: []
+    };
+    if (isTypedArray(attributeValues)) {
+      propertyAttribute.values = Array.from(attributeValues);
+    } else if (attributeValues !== null) {
+      propertyAttribute.values = attributeValues;
+    }
+    return propertyAttribute;
   }
 
   /**

package/src/converter-cli.ts

@@ -26,6 +26,9 @@ type TileConversionOptions = {
   /** Output folder. This folder will be created by converter if doesn't exist. It is relative to the converter path.
    * Default: "data" folder */
   output: string;
+  /** 3DTile version.
+   * Default: version "1.1" */
+  outputVersion?: string;
   /** Keep created 3DNodeIndexDocument files on disk instead of memory. This option reduce memory usage but decelerates conversion speed */
   instantNodeWriting: boolean;
   /** Try to merge similar materials to be able to merge meshes into one node (I3S to 3DTiles conversion only) */
@@ -177,6 +180,9 @@ function printHelp(): void {
     '--tileset [tileset.json file (3DTiles) / http://..../SceneServer/layers/0 resource (I3S)]'
   );
   console.log('--input-type [tileset input type: I3S or 3DTILES]');
+  console.log(
+    '--output-version [3dtile version: 1.0 or 1.1, default: 1.1]. This option supports only 1.0/1.1 values for 3DTiles output. I3S output version setting is not supported yet.'
+  );
   console.log(
     '--egm [location of Earth Gravity Model *.pgm file to convert heights from ellipsoidal to gravity-related format or "None" to not use it. A model file can be loaded from GeographicLib https://geographiclib.sourceforge.io/html/geoid.html], default: "./deps/egm2008-5.zip"'
   );
@@ -212,6 +218,7 @@ async function convert(options: ValidatedTileConversionOptions) {
       await tiles3DConverter.convert({
         inputUrl: options.tileset,
         outputPath: options.output,
+        outputVersion: options.outputVersion,
         tilesetName: options.name,
         maxDepth: options.maxDepth,
         egmFilePath: options.egm,
@@ -272,6 +279,17 @@ function validateOptions(
         console.log('Missed/Incorrect: --input-type [tileset input type: I3S or 3DTILES]'),
       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) =>
+        addHash ||
+        (Boolean(value) &&
+          Object.values(['1.0', '1.1']).includes(value) &&
+          Boolean(options.inputType === 'I3S')) ||
+        Boolean(options.inputType !== 'I3S') ||
+        Boolean(options.analyze)
     }
   };
   const exceptions: (() => void)[] = [];
@@ -300,6 +318,7 @@ function validateOptions(
 function parseOptions(args: string[]): TileConversionOptions {
   const opts: TileConversionOptions = {
     output: 'data',
+    outputVersion: '1.1',
     instantNodeWriting: false,
     mergeMaterials: true,
     egm: join(process.cwd(), 'deps', 'egm2008-5.pgm'),
@@ -328,6 +347,9 @@ function parseOptions(args: string[]): TileConversionOptions {
         case '--output':
           opts.output = getStringValue(index, args);
           break;
+        case '--output-version':
+          opts.outputVersion = getStringValue(index, args);
+          break;
         case '--instant-node-writing':
           opts.instantNodeWriting = getBooleanValue(index, args);
           break;

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

@@ -1,19 +1,19 @@
 /* eslint-disable camelcase */
-import {GLTFAccessorPostprocessed, GLTFMeshPrimitivePostprocessed} from '@loaders.gl/gltf';
 import type {NumericArray} from '@loaders.gl/loader-utils';
 import type {
+  GLTFAccessorPostprocessed,
+  GLTFMeshPrimitivePostprocessed,
   GLTF_EXT_feature_metadata_FeatureIdTexture,
   GLTF_EXT_feature_metadata_GLTF,
-  GLTF_EXT_feature_metadata_Primitive
+  GLTF_EXT_feature_metadata_Primitive,
+  GLTF_EXT_mesh_features
 } from '@loaders.gl/gltf';
-
-import type {GLTF_EXT_mesh_features} from '@loaders.gl/gltf';
+import {EXT_MESH_FEATURES, EXT_FEATURE_METADATA} from '@loaders.gl/gltf';
+import {Tiles3DTileContent} from '@loaders.gl/3d-tiles';
 
 import {TypedArray} from '@math.gl/core';
 import {TextureImageProperties} from '../types';
 import {emod} from '@loaders.gl/math';
-import {EXT_MESH_FEATURES, EXT_FEATURE_METADATA} from '@loaders.gl/gltf';
-import {Tiles3DTileContent} from '@loaders.gl/3d-tiles';
 
 /**
  * Get featureTexture by a metadata class.

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

@@ -20,7 +20,12 @@ import {Ellipsoid} from '@math.gl/geospatial';
 
 import {DracoWriterWorker} from '@loaders.gl/draco';
 import {assert, encode} from '@loaders.gl/core';
-import {concatenateArrayBuffers, concatenateTypedArrays} from '@loaders.gl/loader-utils';
+import {
+  concatenateArrayBuffers,
+  concatenateTypedArrays,
+  NumberArray,
+  TypedArray
+} from '@loaders.gl/loader-utils';
 import md5 from 'md5';
 import {v4 as uuidv4} from 'uuid';
 import {generateAttributes} from './geometry-attributes';
@@ -38,7 +43,6 @@ import {
   MaterialDefinitionInfo,
   TextureDefinitionInfo
 } from '@loaders.gl/i3s';
-import {NumberArray, TypedArray} from '@loaders.gl/loader-utils';
 import {Geoid} from '@math.gl/geoid';
 import {prepareDataForAttributesConversion} from './gltf-attributes';
 import {getTextureByMetadataClass, handleBatchIdsExtensions} from './batch-ids-extensions';

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

@@ -6,10 +6,10 @@ import {
   GLTF,
   GLTFLoader,
   GLTF_EXT_feature_metadata_GLTF,
-  GLTF_EXT_structural_metadata_GLTF
+  GLTF_EXT_structural_metadata_GLTF,
+  EXT_FEATURE_METADATA
 } from '@loaders.gl/gltf';
 import {parse} from '@loaders.gl/core';
-import {EXT_FEATURE_METADATA} from '@loaders.gl/gltf';
 
 /**
  * glTF primitive modes

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

@@ -82,6 +82,7 @@ import {composeHashFile, createZip} from '@loaders.gl/zip';
 import {ConversionDump, ConversionDumpOptions, DumpMetadata} from '../lib/utils/conversion-dump';
 import {PromptModule} from 'inquirer';
 
+// eslint-disable-next-line no-process-env
 const ION_DEFAULT_TOKEN = process.env?.IonToken;
 const HARDCODED_NODES_PER_PAGE = 64;
 const _3D_TILES = '3DTILES';

package/src/i3s-server/README.md

@@ -23,6 +23,7 @@ Example for path `./data/BatchTextured/SceneServer/layers/0/...`:
 ```bash
 PORT=8080 HTTPS_PORT=4443 I3sLayerPath="./data" DEBUG=i3s-server:* npx i3s-server
 ```
+
 #### Check the layer availability
 
 The layer should be available on URLs:
@@ -47,6 +48,7 @@ Example for path `../datasets/Rancho_Mesh_mesh_v17_1.slpk`:
 ```bash
 PORT=8080 HTTPS_PORT=4443 I3sLayerPath="../datasets/Rancho_Mesh_mesh_v17_1.slpk" DEBUG=i3s-server:* npx i3s-server
 ```
+
 #### Check the layer availability
 
 The layer should be available on URLs:

package/src/i3s-server/bin/www.ts

@@ -14,12 +14,14 @@ import {formErrorHandler, formListeningHandler, normalizePort} from '../utils/se
 // const __dirname = path.dirname(__filename);
 
 /** Get port from environment and store in Express. */
+// eslint-disable-next-line no-process-env
 const httpPort = normalizePort(process.env.PORT || '80');
 if (httpPort === false) {
   // eslint-disable-next-line no-console
   console.error('Incorrect HTTP port');
   process.exit(1); // eslint-disable-line no-process-exit
 }
+// eslint-disable-next-line no-process-env
 const httpsPort = normalizePort(process.env.HTTPS_PORT || '443');
 if (httpsPort === false) {
   // eslint-disable-next-line no-console