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

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

@@ -23,12 +23,14 @@ export default class Tiles3DConverter {
     loaderOptions: I3SLoaderOptions;
     conversionDump: ConversionDump;
     progress: Progress;
+    fileExt: string;
     constructor();
     /**
      * Convert i3s format data to 3dTiles
      * @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
@@ -37,6 +39,7 @@ export default class Tiles3DConverter {
         inputUrl: string;
         outputPath: string;
         tilesetName: string;
+        outputVersion?: string;
         maxDepth?: number;
         egmFilePath: string;
         inquirer?: {

package/dist/3d-tiles-converter/3d-tiles-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAGpB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAcrC,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAC/C,OAAO,EAAC,cAAc,EAAwB,wCAAqC;AACnF,OAAO,EAAC,QAAQ,EAAC,6CAA0C;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAItC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACvC,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC;IACrD,YAAY,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;IAC3C,cAAc,EAAE,aAAa,GAAG,IAAI,CAAQ;IAC5C,aAAa,EAAE,gBAAgB,CAU7B;IACF,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;;IAenB;;;;;;;;OAQG;IAEU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE;YAAC,MAAM,EAAE,YAAY,CAAA;SAAC,CAAC;QAClC,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAoG/B;;;OAGG;YACW,oBAAoB;IA8BlC;;;;;;OAMG;YAEW,gBAAgB;IAyE9B;;;;;OAKG;YACW,YAAY;IAa1B;;;;;OAKG;YACW,cAAc;IA4B5B;;;;OAIG;IACH,OAAO,CAAC,6BAA6B;IAsBrC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;OAKG;YACW,oBAAoB;IAsBlC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;OAGG;YACW,iBAAiB;CAgBhC"}
+{"version":3,"file":"3d-tiles-converter.d.ts","sourceRoot":"","sources":["../../src/3d-tiles-converter/3d-tiles-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAGpB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAiBrC,OAAO,EAAC,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAC,aAAa,EAAC,4BAAyB;AAC/C,OAAO,EAAC,cAAc,EAAwB,wCAAqC;AACnF,OAAO,EAAC,QAAQ,EAAC,6CAA0C;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAItC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,gBAAgB,EAAE,KAAK,GAAG,IAAI,CAAC;IAC/B,aAAa,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACvC,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,GAAG,IAAI,CAAC;IACrD,YAAY,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAM;IAC3C,cAAc,EAAE,aAAa,GAAG,IAAI,CAAQ;IAC5C,aAAa,EAAE,gBAAgB,CAU7B;IACF,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;;IAgBhB;;;;;;;;;OASG;IAEU,OAAO,CAAC,OAAO,EAAE;QAC5B,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE;YAAC,MAAM,EAAE,YAAY,CAAA;SAAC,CAAC;QAClC,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA8G/B;;;OAGG;YACW,oBAAoB;IA8BlC;;;;;;OAMG;YAEW,gBAAgB;IAiF9B;;;;;OAKG;YACW,YAAY;IAa1B;;;;;OAKG;YACW,cAAc;IA4B5B;;;;OAIG;IACH,OAAO,CAAC,6BAA6B;IAsBrC;;;;OAIG;IACH,OAAO,CAAC,qBAAqB;IAiB7B;;;;;OAKG;YACW,oBAAoB;IAsBlC;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAU5B;;;OAGG;YACW,iBAAiB;CAgBhC"}

package/dist/3d-tiles-converter/3d-tiles-converter.js

@@ -12,7 +12,7 @@ import { TILESET as tilesetTemplate } from "./json-templates/tileset.js";
 import { createObbFromMbs } from "../i3s-converter/helpers/coordinate-converter.js";
 import { WorkerFarm } from '@loaders.gl/worker-utils';
 import { BROWSER_ERROR_MESSAGE } from "../constants.js";
-import B3dmConverter from "./helpers/b3dm-converter.js";
+import { Tiles3DContentConverter } from "./helpers/3d-tiles-content-converter.js";
 import { getNodeCount, loadFromArchive, loadI3SContent, openSLPK } from "./helpers/load-i3s.js";
 import { ConversionDump } from "../lib/utils/conversion-dump.js";
 import { Progress } from "../i3s-converter/helpers/progress.js";
@@ -43,6 +43,7 @@ export default class Tiles3DConverter {
     };
     conversionDump;
     progress;
+    fileExt;
     constructor() {
         this.options = {};
         this.tilesetPath = '';
@@ -54,12 +55,14 @@ export default class Tiles3DConverter {
         this.workerSource = {};
         this.conversionDump = new ConversionDump();
         this.progress = new Progress();
+        this.fileExt = '';
     }
     /**
      * Convert i3s format data to 3dTiles
      * @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
@@ -70,9 +73,10 @@ 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);
         console.log('Loading egm file completed!'); // eslint-disable-line
@@ -130,7 +134,7 @@ export default class Tiles3DConverter {
             refine: 'REPLACE'
         };
         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();
         this.progress.stopMonitoring();
@@ -188,7 +192,7 @@ export default class Tiles3DConverter {
         const sourceChild = await this._loadChildNode(parentSourceNode, childNodeInfo);
         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);
                 parentNode.children.push(child);
@@ -211,11 +215,11 @@ export default class Tiles3DConverter {
                 box: boundingVolume.box || [],
                 textureFormat: sourceChild.textureFormat
             };
-            const b3dmConverter = new B3dmConverter();
-            const b3dm = await b3dmConverter.convert(i3sAttributesData, featureAttributes);
-            await this.conversionDump.addNode(`${sourceChild.id}.b3dm`, sourceChild.id);
-            await writeFile(this.tilesetPath, new Uint8Array(b3dm), `${sourceChild.id}.b3dm`);
-            await this.conversionDump.updateConvertedNodesDumpFile(`${sourceChild.id}.b3dm`, sourceChild.id, true);
+            const converter = new Tiles3DContentConverter({ outputVersion: this.options.outputVersion });
+            const contentData = await converter.convert(i3sAttributesData, featureAttributes, this.attributeStorageInfo);
+            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}.${this.fileExt}`, sourceChild.id, true);
             parentNode.children.push(child);
             nextParentNode = child;
         }
@@ -289,7 +293,7 @@ export default class Tiles3DConverter {
             geometricError: convertScreenThresholdToGeometricError(sourceChild),
             children: [],
             content: {
-                uri: `${sourceChild.id}.b3dm`,
+                uri: `${sourceChild.id}.${this.fileExt}`,
                 boundingVolume
             }
         };

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

@@ -1,4 +1,4 @@
-import type { I3STileContent } from '@loaders.gl/i3s';
+import type { I3STileContent, AttributeStorageInfo, I3STileAttributes } from '@loaders.gl/i3s';
 import { Matrix4 } from '@math.gl/core';
 export type I3SAttributesData = {
     tileContent: I3STileContent;
@@ -6,23 +6,30 @@ export type I3SAttributesData = {
     textureFormat: string;
 };
 /**
- * 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 declare class Tiles3DContentConverter {
     rtcCenter: Float32Array;
     i3sTile: any;
+    tileType: string;
+    constructor(options?: {
+        outputVersion: string;
+    });
     /**
      * The starter of content conversion
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded content
      */
-    convert(i3sAttributesData: I3SAttributesData, featureAttributes?: any): Promise<ArrayBuffer>;
+    convert(i3sAttributesData: I3SAttributesData, featureAttributes?: I3STileAttributes | null, attributeStorageInfo?: AttributeStorageInfo[] | null | undefined): Promise<ArrayBuffer>;
     /**
      * Build and encode gltf
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded glb content
      */
-    buildGLTF(i3sAttributesData: I3SAttributesData, featureAttributes: any): Promise<ArrayBuffer>;
+    buildGLTF(i3sAttributesData: I3SAttributesData, featureAttributes: I3STileAttributes | null, attributeStorageInfo?: AttributeStorageInfo[] | null | undefined): Promise<ArrayBuffer>;
+    private _createMetadataExtensions;
+    private _createPropertyAttibutes;
+    private _convertAttributeStorageInfoToPropertyAttribute;
     /**
      * Update gltfBuilder with texture from I3S tile
      * @param {object} i3sTile - Tile3D object
@@ -78,4 +85,4 @@ export default class B3dmConverter {
     _getFeaturesLength(attributes: any): any;
     _checkNormals(normals: any): any;
 }
-//# sourceMappingURL=b3dm-converter.d.ts.map
+//# sourceMappingURL=3d-tiles-content-converter.d.ts.map

package/dist/3d-tiles-converter/helpers/3d-tiles-content-converter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"3d-tiles-content-converter.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/3d-tiles-content-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,cAAc,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAU7F,OAAO,EAAC,OAAO,EAAU,MAAM,eAAe,CAAC;AAY/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,cAAc,CAAC;IAC5B,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,qBAAa,uBAAuB;IAElC,SAAS,EAAE,YAAY,CAAC;IACxB,OAAO,EAAE,GAAG,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;gBAEL,OAAO,GAAE;QAAC,aAAa,EAAE,MAAM,CAAA;KAA0B;IAKrE;;;;OAIG;IACG,OAAO,CACX,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,GAAE,iBAAiB,GAAG,IAAW,EAClD,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,GAAG,IAAI,GAAG,SAAS,GAC/D,OAAO,CAAC,WAAW,CAAC;IAkBvB;;;;OAIG;IAEG,SAAS,CACb,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,EAC3C,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,GAAG,IAAI,GAAG,SAAS,GAC/D,OAAO,CAAC,WAAW,CAAC;IA8EvB,OAAO,CAAC,yBAAyB;IA0BjC,OAAO,CAAC,wBAAwB;IAsBhC,OAAO,CAAC,+CAA+C;IA8DvD;;;;;OAKG;IACG,oBAAoB,CAAC,WAAW,KAAA,EAAE,aAAa,KAAA,EAAE,WAAW,KAAA;IAmBlE;;;;;;;OAOG;IACH,mBAAmB,CAAC,cAAc,KAAA,EAAE,eAAe,KAAA,EAAE,kBAAkB,KAAA,EAAE,WAAW,KAAA;IAepF;;;;;;;OAOG;IACH,wBAAwB,CAAC,eAAe,KAAA;IAMxC;;;;OAIG;IACH,eAAe,CAAC,UAAU,KAAA,EAAE,iBAAiB,KAAA;IAoB7C;;;;;OAKG;IACH,yBAAyB,CAAC,MAAM,KAAA;IAchC;;;;;OAKG;IACH,iCAAiC,CAAC,QAAQ,KAAA,EAAE,YAAY,KAAA;IAgCxD;;;;;OAKG;IACH,eAAe,CAAC,kBAAkB,KAAA,EAAE,YAAY,KAAA;IA+ChD,kBAAkB,CAAC,UAAU,KAAA;IAY7B,aAAa,CAAC,OAAO,KAAA;CAItB"}

package/dist/3d-tiles-converter/helpers/{b3dm-converter.js → 3d-tiles-content-converter.js}

@@ -1,7 +1,8 @@
 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 } 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.js";
 import { generateSyntheticIndices } from "../../lib/utils/geometry-utils.js";
@@ -11,34 +12,42 @@ const KHR_MATERIALS_UNLIT = 'KHR_materials_unlit';
 const METALLIC_FACTOR_DEFAULT = 1.0;
 const ROUGHNESS_FACTOR_DEFAULT = 1.0;
 /**
- * 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;
     i3sTile;
+    tileType;
+    constructor(options = { outputVersion: '1.1' }) {
+        this.tileType =
+            options.outputVersion === '1.0' ? TILE3D_TYPE.BATCHED_3D_MODEL : TILE3D_TYPE.GLTF;
+    }
     /**
      * The starter of content conversion
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded content
      */
-    async convert(i3sAttributesData, featureAttributes = null) {
-        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;
+    async convert(i3sAttributesData, featureAttributes = null, attributeStorageInfo) {
+        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;
     }
     /**
      * Build and encode gltf
      * @param i3sTile - Tile3D instance for I3S node
      * @returns - encoded glb content
      */
-    // eslint-disable-next-line max-statements
-    async buildGLTF(i3sAttributesData, featureAttributes) {
+    // eslint-disable-next-line complexity, max-statements
+    async buildGLTF(i3sAttributesData, featureAttributes, attributeStorageInfo) {
         const { tileContent, textureFormat, box } = i3sAttributesData;
         const { material, attributes, indices: originalIndices, modelMatrix } = tileContent;
         const gltfBuilder = new GLTFScenegraph();
@@ -76,13 +85,97 @@ 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();
-        const gltfBuffer = encodeSync(gltfBuilder.gltf, GLTFWriter);
-        return gltfBuffer;
+        return encodeSync(gltfBuilder.gltf, GLTFWriter, { gltfBuilder });
+    }
+    _createMetadataExtensions(gltfBuilder, meshIndex, featureAttributes, attributeStorageInfo, tileContent) {
+        const propertyAttributes = this._createPropertyAttibutes(featureAttributes, attributeStorageInfo);
+        const tableIndex = createExtStructuralMetadata(gltfBuilder, propertyAttributes);
+        const mesh = gltfBuilder.getMesh(meshIndex);
+        for (const primitive of mesh.primitives) {
+            if (tileContent.attributes._BATCHID?.value) {
+                createExtMeshFeatures(gltfBuilder, primitive, tileContent.attributes._BATCHID.value, tableIndex);
+            }
+        }
+    }
+    _createPropertyAttibutes(featureAttributes, attributeStorageInfo) {
+        if (!featureAttributes || !attributeStorageInfo) {
+            return [];
+        }
+        const propertyAttributeArray = [];
+        for (const attributeName in featureAttributes) {
+            const propertyAttribute = this._convertAttributeStorageInfoToPropertyAttribute(attributeName, attributeStorageInfo, featureAttributes);
+            if (propertyAttribute) {
+                propertyAttributeArray.push(propertyAttribute);
+            }
+        }
+        return propertyAttributeArray;
+    }
+    // eslint-disable-next-line complexity
+    _convertAttributeStorageInfoToPropertyAttribute(attributeName, attributeStorageInfo, featureAttributes) {
+        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;
+        let componentType;
+        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 = {
+            name: attributeName,
+            elementType,
+            componentType,
+            values: []
+        };
+        if (isTypedArray(attributeValues)) {
+            propertyAttribute.values = Array.from(attributeValues);
+        }
+        else if (attributeValues !== null) {
+            propertyAttribute.values = attributeValues;
+        }
+        return propertyAttribute;
     }
     /**
      * Update gltfBuilder with texture from I3S tile

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

@@ -1 +1 @@
-{"version":3,"file":"load-i3s.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/load-i3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAO,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,cAAc,EACd,aAAa,EACb,gBAAgB,EAEhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAC,CAAC;AAE5E;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,kBACV,gBAAgB,GAAG,IAAI,cAC1B,aAAa,sBACL,gBAAgB,kBACpB,aAAa,GAAG,IAAI,KACnC,QAAQ,cAAc,GAAG,IAAI,CAuC/B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAUzE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,aAAa,GAAG,IAAI,gBAUjC;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAcpF"}
+{"version":3,"file":"load-i3s.d.ts","sourceRoot":"","sources":["../../../src/3d-tiles-converter/helpers/load-i3s.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAO,MAAM,kBAAkB,CAAC;AACxD,OAAO,EACL,cAAc,EACd,aAAa,EACb,gBAAgB,EAEhB,gBAAgB,EAEjB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AAEvE,MAAM,MAAM,YAAY,GAAG;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,gBAAgB,EAAE,MAAM,CAAA;CAAC,CAAC;AAE5E;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,kBACV,gBAAgB,GAAG,IAAI,cAC1B,aAAa,sBACL,gBAAgB,kBACpB,aAAa,GAAG,IAAI,KACnC,OAAO,CAAC,cAAc,GAAG,IAAI,CAuC/B,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAUzE;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,aAAa,GAAG,IAAI,gBAUjC;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAcpF"}

package/dist/converter-cli.js

@@ -88,6 +88,7 @@ function printHelp() {
     console.log('--split-nodes [Prevent to merge similar materials that could lead to incorrect visualization (I3S to 3DTiles conversion only)]');
     console.log('--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"');
     console.log('--token [Token for Cesium ION tilesets authentication]');
     console.log('--no-draco [Disable draco compression for geometry]');
@@ -114,6 +115,7 @@ async function convert(options) {
             await tiles3DConverter.convert({
                 inputUrl: options.tileset,
                 outputPath: options.output,
+                outputVersion: options.outputVersion,
                 tilesetName: options.name,
                 maxDepth: options.maxDepth,
                 egmFilePath: options.egm,
@@ -163,6 +165,15 @@ function validateOptions(options, addHash) {
         inputType: {
             getMessage: () => 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 = [];
@@ -188,6 +199,7 @@ function validateOptions(options, addHash) {
 function parseOptions(args) {
     const opts = {
         output: 'data',
+        outputVersion: '1.1',
         instantNodeWriting: false,
         mergeMaterials: true,
         egm: join(process.cwd(), 'deps', 'egm2008-5.pgm'),
@@ -215,6 +227,9 @@ function parseOptions(args) {
                 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;