@loaders.gl/tile-converter 3.3.0-alpha.1 → 3.3.0-alpha.2

package/dist/i3s-converter/helpers/batch-ids-extensions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-ids-extensions.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,uCAAuC,CAAC;AACrF,OAAO,KAAK,EAAC,KAAK,EAAE,aAAa,EAAC,MAAM,sDAAsD,CAAC;AAM/F;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAC;CAC1C,EACD,SAAS,EAAE,aAAa,EACxB,MAAM,EAAE,KAAK,EAAE,GACd,MAAM,EAAE,CAwBV"}
+{"version":3,"file":"batch-ids-extensions.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/batch-ids-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,yBAAyB,EAAC,MAAM,uCAAuC,CAAC;AACrF,OAAO,KAAK,EAAC,KAAK,EAAE,aAAa,EAAC,MAAM,sDAAsD,CAAC;AAS/F;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAC;CAC1C,EACD,SAAS,EAAE,aAAa,EACxB,MAAM,EAAE,KAAK,EAAE,GACd,MAAM,EAAE,CAwBV"}

package/dist/i3s-converter/helpers/batch-ids-extensions.js

@@ -50,9 +50,20 @@ function handleExtFeatureMetadataExtension(attributes, extFeatureMetadata, image
     // Take only first extension object to get batchIds attribute name.
     const featureIdTexture = extFeatureMetadata?.featureIdTextures && extFeatureMetadata?.featureIdTextures[0];
     if (featureIdTexture) {
-        const textureCoordinates = attributes.TEXCOORD_0.value;
+        const textureAttributeIndex = featureIdTexture?.featureIds?.texture?.texCoord || 0;
+        const textCoordAttribute = `TEXCOORD_${textureAttributeIndex}`;
+        const textureCoordinates = attributes[textCoordAttribute].value;
         return generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, images);
     }
+    // Take only first extension texture to get batchIds from the root EXT_feature_metadata object.
+    const featureTexture = extFeatureMetadata?.featureTextures && extFeatureMetadata?.featureTextures[0];
+    /**
+     * TODO need to get batchIds from root extension
+     */
+    if (featureTexture) {
+        console.warn("EXT_feature_metadata doesn't yet support featureTextures in primitive");
+        return [];
+    }
     return [];
 }
 /**

package/dist/i3s-converter/helpers/feature-attributes.d.ts

@@ -0,0 +1,24 @@
+import type { FeatureTableJson } from '@loaders.gl/3d-tiles';
+/**
+ * Takes attributes from property table based on featureIds.
+ * If there is no property value for particular featureId (index) the property will be null.
+ * Example:
+ * Initial data:
+ *   OBJECTID: [0, 1, 5]
+ *   component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']
+ * Result:
+ *   OBJECTID: [0, 1, 5]
+ *   component: ['Windows', 'Frames', 'null']
+ * @param featureIds
+ * @param propertyTable
+ */
+export declare function flattenPropertyTableByFeatureIds(featureIds: number[], propertyTable: FeatureTableJson): FeatureTableJson;
+/**
+ * Check that all attributes in propertyTable have the same length as FeatureIds.
+ * If there are differencies between lengths we should flatten property table based on exiesting featureIds.
+ * @param featureIds
+ * @param propertyTable
+ * @returns
+ */
+export declare function checkPropertiesLength(featureIds: number[], propertyTable: FeatureTableJson): boolean;
+//# sourceMappingURL=feature-attributes.d.ts.map

package/dist/i3s-converter/helpers/feature-attributes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"feature-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/feature-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;;;;;;GAYG;AACH,wBAAgB,gCAAgC,CAC9C,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,gBAAgB,CAQlB;AAkBD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,MAAM,EAAE,EACpB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAUT"}

package/dist/i3s-converter/helpers/feature-attributes.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkPropertiesLength = exports.flattenPropertyTableByFeatureIds = void 0;
+/**
+ * Takes attributes from property table based on featureIds.
+ * If there is no property value for particular featureId (index) the property will be null.
+ * Example:
+ * Initial data:
+ *   OBJECTID: [0, 1, 5]
+ *   component: ['Windows', 'Frames', 'Wall', 'Roof', 'Skylight']
+ * Result:
+ *   OBJECTID: [0, 1, 5]
+ *   component: ['Windows', 'Frames', 'null']
+ * @param featureIds
+ * @param propertyTable
+ */
+function flattenPropertyTableByFeatureIds(featureIds, propertyTable) {
+    const resultPropertyTable = {};
+    for (const propertyName in propertyTable) {
+        const properties = propertyTable[propertyName];
+        resultPropertyTable[propertyName] = getPropertiesByFeatureIds(properties, featureIds);
+    }
+    return resultPropertyTable;
+}
+exports.flattenPropertyTableByFeatureIds = flattenPropertyTableByFeatureIds;
+/**
+ * Getting properties by featureId index
+ * @param properties
+ * @param featureIds
+ */
+function getPropertiesByFeatureIds(properties, featureIds) {
+    const resultProperties = [];
+    for (const featureId of featureIds) {
+        const property = properties[featureId] || null;
+        resultProperties.push(property);
+    }
+    return resultProperties;
+}
+/**
+ * Check that all attributes in propertyTable have the same length as FeatureIds.
+ * If there are differencies between lengths we should flatten property table based on exiesting featureIds.
+ * @param featureIds
+ * @param propertyTable
+ * @returns
+ */
+function checkPropertiesLength(featureIds, propertyTable) {
+    let needFlatten = false;
+    for (const attribute of Object.values(propertyTable)) {
+        if (featureIds.length !== attribute.length) {
+            needFlatten = true;
+        }
+    }
+    return needFlatten;
+}
+exports.checkPropertiesLength = checkPropertiesLength;

package/dist/i3s-converter/helpers/geometry-attributes.js

@@ -38,30 +38,49 @@ exports.generateAttributes = generateAttributes;
 function calculateFaceRangesAndFeaturesCount(featureIndices) {
     let rangeIndex = 1;
     let featureIndex = 1;
-    let currentFeatureId = featureIndices[0];
+    let currentFeatureId = getFrequentValue(featureIndices.slice(0, VALUES_PER_VERTEX));
     const faceRangeList = [];
     const featureIds = [];
     const uniqueFeatureIds = [currentFeatureId];
     faceRangeList[0] = 0;
     featureIds[0] = currentFeatureId;
-    for (let index = 1; index < featureIndices.length; index++) {
-        if (currentFeatureId !== featureIndices[index]) {
+    for (let index = VALUES_PER_VERTEX; index < featureIndices.length; index += VALUES_PER_VERTEX) {
+        const newFeatureId = getFrequentValue(featureIndices.slice(index, index + VALUES_PER_VERTEX));
+        if (currentFeatureId !== newFeatureId) {
             faceRangeList[rangeIndex] = index / VALUES_PER_VERTEX - 1;
             faceRangeList[rangeIndex + 1] = index / VALUES_PER_VERTEX;
-            featureIds[featureIndex] = featureIndices[index];
-            if (!uniqueFeatureIds.includes(featureIndices[index])) {
-                uniqueFeatureIds.push(featureIndices[index]);
+            featureIds[featureIndex] = newFeatureId;
+            if (!uniqueFeatureIds.includes(newFeatureId)) {
+                uniqueFeatureIds.push(newFeatureId);
             }
             rangeIndex += 2;
             featureIndex += 1;
         }
-        currentFeatureId = featureIndices[index];
+        currentFeatureId = newFeatureId;
     }
     faceRangeList[rangeIndex] = featureIndices.length / VALUES_PER_VERTEX - 1;
     const faceRange = new Uint32Array(faceRangeList);
     const featureCount = uniqueFeatureIds.length;
     return { faceRange, featureCount, featureIds };
 }
+/**
+ * Find most frequent value to avoid situation where one vertex can be part of multiple features (objects).
+ * @param values
+ */
+function getFrequentValue(values) {
+    const map = {};
+    let mostFrequentValue = values[0];
+    let maxCount = 1;
+    for (const value of values) {
+        // Save item and it's frequency count to the map.
+        map[value] = (map[value] || 0) + 1;
+        // Find max count of frequency.
+        maxCount = maxCount > map[value] ? maxCount : map[value];
+        // Find the most frequent value.
+        mostFrequentValue = maxCount > map[value] ? mostFrequentValue : value;
+    }
+    return mostFrequentValue;
+}
 /**
  * Generate list of attribute object grouped by feature ids.
  * @param  attributes

package/dist/i3s-converter/helpers/geometry-converter.d.ts

@@ -1,5 +1,6 @@
+import type { B3DMContent, FeatureTableJson } from '@loaders.gl/3d-tiles';
+import { Tile3D } from '@loaders.gl/tiles';
 import { ConvertedAttributes, I3SConvertedResources } from '../types';
-import { B3DMContent } from '@loaders.gl/3d-tiles';
 import { AttributeStorageInfo } from '@loaders.gl/i3s';
 import { Geoid } from '@math.gl/geoid';
 import { B3DMAttributesData } from '../../i3s-attributes-worker';
@@ -15,7 +16,7 @@ import { B3DMAttributesData } from '../../i3s-attributes-worker';
  * @param geoidHeightModel - model to convert elevation from elipsoidal to geoid
  * @returns Array of node resources to create one or more i3s nodes
  */
-export default function convertB3dmToI3sGeometry(tileContent: B3DMContent, nodeId: number, featuresHashArray: string[], attributeStorageInfo: AttributeStorageInfo[] | undefined, draco: boolean, generateBoundingVolumes: boolean, geoidHeightModel: Geoid, workerSource: {
+export default function convertB3dmToI3sGeometry(tileContent: B3DMContent, nodeId: number, propertyTable: FeatureTableJson | null, featuresHashArray: string[], attributeStorageInfo: AttributeStorageInfo[] | undefined, draco: boolean, generateBoundingVolumes: boolean, geoidHeightModel: Geoid, workerSource: {
     [key: string]: string;
 }): Promise<I3SConvertedResources[] | null>;
 /**
@@ -26,4 +27,10 @@ export default function convertB3dmToI3sGeometry(tileContent: B3DMContent, nodeI
  * @returns map of converted geometry attributes
  */
 export declare function convertAttributes(attributesData: B3DMAttributesData, useCartesianPositions: boolean): Promise<Map<string, ConvertedAttributes>>;
+/**
+ * Find property table in tile
+ * For example it can be batchTable for b3dm files or property table in gLTF extension.
+ * @param sourceTile
+ */
+export declare function getPropertyTable(sourceTile: Tile3D): FeatureTableJson | null;
 //# sourceMappingURL=geometry-converter.d.ts.map

package/dist/i3s-converter/helpers/geometry-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAMrC,OAAO,EAAC,kBAAkB,EAAqC,MAAM,6BAA6B,CAAC;AAyBnG;;;;;;;;;;;GAWG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,2CAoEtC;AAiID;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CA0C3C"}
+{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAQxE,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAKzC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAMrC,OAAO,EAAC,kBAAkB,EAAqC,MAAM,6BAA6B,CAAC;AA6BnG;;;;;;;;;;;GAWG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,gBAAgB,GAAG,IAAI,EACtC,iBAAiB,EAAE,MAAM,EAAE,EAC3B,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,SAAS,EACxD,KAAK,EAAE,OAAO,EACd,uBAAuB,EAAE,OAAO,EAChC,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,2CAqEtC;AAuID;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CA0C3C;AAu7BD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI,CAoB5E"}

package/dist/i3s-converter/helpers/geometry-converter.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertAttributes = void 0;
+exports.getPropertyTable = exports.convertAttributes = void 0;
 const core_1 = require("@math.gl/core");
 const geospatial_1 = require("@math.gl/geospatial");
 const draco_1 = require("@loaders.gl/draco");
@@ -14,6 +14,7 @@ const geometry_attributes_1 = require("./geometry-attributes");
 const coordinate_converter_1 = require("./coordinate-converter");
 const gltf_attributes_1 = require("./gltf-attributes");
 const batch_ids_extensions_1 = require("./batch-ids-extensions");
+const feature_attributes_1 = require("./feature-attributes");
 // Spec - https://github.com/Esri/i3s-spec/blob/master/docs/1.7/pbrMetallicRoughness.cmn.md
 const DEFAULT_ROUGHNESS_FACTOR = 1;
 const DEFAULT_METALLIC_FACTOR = 1;
@@ -30,6 +31,8 @@ const OBJECT_ID_TYPE = 'Oid32';
  * BATCHID - Legacy attribute name which includes batch info.
  */
 const BATCHED_ID_POSSIBLE_ATTRIBUTE_NAMES = ['CUSTOM_ATTRIBUTE_2', '_BATCHID', 'BATCHID'];
+const EXT_FEATURE_METADATA = 'EXT_feature_metadata';
+const EXT_MESH_FEATURES = 'EXT_mesh_features';
 let scratchVector = new core_1.Vector3();
 /**
  * Convert binary data from b3dm file to i3s resources
@@ -43,7 +46,7 @@ let scratchVector = new core_1.Vector3();
  * @param geoidHeightModel - model to convert elevation from elipsoidal to geoid
  * @returns Array of node resources to create one or more i3s nodes
  */
-async function convertB3dmToI3sGeometry(tileContent, nodeId, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
+async function convertB3dmToI3sGeometry(tileContent, nodeId, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, geoidHeightModel, workerSource) {
     const useCartesianPositions = generateBoundingVolumes;
     const materialAndTextureList = convertMaterials(tileContent.gltf?.materials);
     const dataForAttributesConversion = (0, gltf_attributes_1.prepareDataForAttributesConversion)(tileContent);
@@ -87,6 +90,7 @@ async function convertB3dmToI3sGeometry(tileContent, nodeId, featuresHashArray,
             tileContent,
             nodeId: nodesCounter,
             featuresHashArray,
+            propertyTable,
             attributeStorageInfo,
             draco,
             workerSource
@@ -132,7 +136,7 @@ function _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeigh
  * @param params.draco - is converter should create draco compressed geometry
  * @returns Array of I3S node resources
  */
-async function _makeNodeResources({ convertedAttributes, material, texture, tileContent, nodeId, featuresHashArray, attributeStorageInfo, draco, workerSource }) {
+async function _makeNodeResources({ convertedAttributes, material, texture, tileContent, nodeId, featuresHashArray, propertyTable, attributeStorageInfo, draco, workerSource }) {
     const boundingVolumes = convertedAttributes.boundingVolumes;
     const vertexCount = convertedAttributes.positions.length / VALUES_PER_VERTEX;
     const { faceRange, featureIds, positions, normals, colors, texCoords, featureCount } = (0, geometry_attributes_1.generateAttributes)(convertedAttributes);
@@ -153,7 +157,10 @@ async function _makeNodeResources({ convertedAttributes, material, texture, tile
             faceRange
         }, workerSource.draco)
         : null;
-    const attributes = convertBatchTableToAttributeBuffers(tileContent.batchTableJson, featureIds, attributeStorageInfo);
+    let attributes = [];
+    if (attributeStorageInfo && propertyTable) {
+        attributes = convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo);
+    }
     return {
         geometry: fileBuffer,
         compressedGeometry,
@@ -743,43 +750,53 @@ function replaceIndicesByUnique(indicesArray, featureMap) {
     }
 }
 /**
- * Convert batch table data to attribute buffers.
- * @param {Object} batchTable - table with metadata for particular feature.
+ * Convert property table data to attribute buffers.
+ * @param {Object} propertyTable - table with metadata for particular feature.
  * @param {Array} featureIds
  * @param {Array} attributeStorageInfo
  * @returns {Array} - Array of file buffers.
  */
-function convertBatchTableToAttributeBuffers(batchTable, featureIds, attributeStorageInfo) {
+function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo) {
     const attributeBuffers = [];
-    if (batchTable) {
-        const batchTableWithFeatureIds = {
-            OBJECTID: featureIds,
-            ...batchTable
-        };
-        for (const key in batchTableWithFeatureIds) {
-            const type = getAttributeType(key, attributeStorageInfo);
-            let attributeBuffer = null;
-            switch (type) {
-                case OBJECT_ID_TYPE:
-                case SHORT_INT_TYPE:
-                    attributeBuffer = generateShortIntegerAttributeBuffer(batchTableWithFeatureIds[key]);
-                    break;
-                case DOUBLE_TYPE:
-                    attributeBuffer = generateDoubleAttributeBuffer(batchTableWithFeatureIds[key]);
-                    break;
-                case STRING_TYPE:
-                    attributeBuffer = generateStringAttributeBuffer(batchTableWithFeatureIds[key]);
-                    break;
-                default:
-                    attributeBuffer = generateStringAttributeBuffer(batchTableWithFeatureIds[key]);
-            }
-            if (attributeBuffer) {
-                attributeBuffers.push(attributeBuffer);
-            }
-        }
+    const needFlattenPropertyTable = (0, feature_attributes_1.checkPropertiesLength)(featureIds, propertyTable);
+    const properties = needFlattenPropertyTable
+        ? (0, feature_attributes_1.flattenPropertyTableByFeatureIds)(featureIds, propertyTable)
+        : propertyTable;
+    const propertyTableWithObjectIds = {
+        OBJECTID: featureIds,
+        ...properties
+    };
+    for (const propertyName in propertyTableWithObjectIds) {
+        const type = getAttributeType(propertyName, attributeStorageInfo);
+        const value = propertyTableWithObjectIds[propertyName];
+        const attributeBuffer = generateAttributeBuffer(type, value);
+        attributeBuffers.push(attributeBuffer);
     }
     return attributeBuffers;
 }
+/**
+ * Generates attribute buffer based on attribute type
+ * @param type
+ * @param value
+ */
+function generateAttributeBuffer(type, value) {
+    let attributeBuffer;
+    switch (type) {
+        case OBJECT_ID_TYPE:
+        case SHORT_INT_TYPE:
+            attributeBuffer = generateShortIntegerAttributeBuffer(value);
+            break;
+        case DOUBLE_TYPE:
+            attributeBuffer = generateDoubleAttributeBuffer(value);
+            break;
+        case STRING_TYPE:
+            attributeBuffer = generateStringAttributeBuffer(value);
+            break;
+        default:
+            attributeBuffer = generateStringAttributeBuffer(value);
+    }
+    return attributeBuffer;
+}
 /**
  * Return attribute type.
  * @param {String} key
@@ -904,3 +921,77 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
     }
     return orderedFeatureIndices;
 }
+/**
+ * Find property table in tile
+ * For example it can be batchTable for b3dm files or property table in gLTF extension.
+ * @param sourceTile
+ */
+function getPropertyTable(sourceTile) {
+    const batchTableJson = sourceTile?.content?.batchTableJson;
+    if (batchTableJson) {
+        return batchTableJson;
+    }
+    const { extensionName, extension } = getPropertyTableExtension(sourceTile);
+    switch (extensionName) {
+        case EXT_MESH_FEATURES: {
+            console.warn('The I3S converter does not yet support the EXT_mesh_features extension');
+            return null;
+        }
+        case EXT_FEATURE_METADATA: {
+            return getPropertyTableFromExtFeatureMetadata(extension);
+        }
+        default:
+            return null;
+    }
+}
+exports.getPropertyTable = getPropertyTable;
+/**
+ * Check extensions which can be with property table inside.
+ * @param sourceTile
+ */
+function getPropertyTableExtension(sourceTile) {
+    const extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
+    const extensionsUsed = sourceTile?.content?.gltf?.extensionsUsed;
+    if (!extensionsUsed) {
+        return { extensionName: null, extension: null };
+    }
+    let extensionName = '';
+    for (const extensionItem of sourceTile?.content?.gltf?.extensionsUsed) {
+        if (extensionsWithPropertyTables.includes(extensionItem)) {
+            extensionName = extensionItem;
+            break;
+        }
+    }
+    const extension = sourceTile?.content?.gltf?.extensions?.[extensionName];
+    return { extensionName, extension };
+}
+/**
+ * Handle EXT_feature_metadata to get property table
+ * @param extension
+ * TODO add EXT_feature_metadata feature textures support.
+ */
+function getPropertyTableFromExtFeatureMetadata(extension) {
+    if (extension?.featureTextures) {
+        console.warn('The I3S converter does not yet support the EXT_feature_metadata feature textures');
+        return null;
+    }
+    if (extension?.featureTables) {
+        /**
+         * Take only first feature table to generate attributes storage info object.
+         * TODO: Think about getting data from all feature tables?
+         * It can be tricky just because 3dTiles is able to have multiple featureId attributes and multiple feature tables.
+         * In I3S we should decide which featureIds attribute will be passed to geometry data.
+         */
+        const firstFeatureTableName = Object.keys(extension.featureTables)?.[0];
+        if (firstFeatureTableName) {
+            const featureTable = extension?.featureTables[firstFeatureTableName];
+            const propertyTable = {};
+            for (const propertyName in featureTable.properties) {
+                propertyTable[propertyName] = featureTable.properties[propertyName].data;
+            }
+            return propertyTable;
+        }
+    }
+    console.warn("The I3S converter couldn't handle EXT_feature_metadata extension");
+    return null;
+}

package/dist/i3s-converter/helpers/node-pages.js

@@ -184,14 +184,14 @@ class NodePages {
             for (const [index, nodePage] of this.nodePages.entries()) {
                 const nodePageStr = JSON.stringify(nodePage);
                 const slpkPath = (0, path_1.join)(layers0Path, 'nodepages');
-                writeQueue.enqueue({
+                await writeQueue.enqueue({
                     archiveKey: `nodePages/${index.toString()}.json.gz`,
                     writePromise: this.writeFile(slpkPath, nodePageStr, `${index.toString()}.json`)
                 });
             }
             const metadata = (0, json_map_transform_1.default)({ nodeCount: this.nodesCounter }, (0, metadata_1.METADATA)());
             const compress = false;
-            writeQueue.enqueue({
+            await writeQueue.enqueue({
                 archiveKey: 'metadata.json',
                 writePromise: this.writeFile(layers0Path, JSON.stringify(metadata), 'metadata.json', compress)
             });
@@ -200,7 +200,7 @@ class NodePages {
             for (const [index, nodePage] of this.nodePages.entries()) {
                 const nodePageStr = JSON.stringify(nodePage);
                 const nodePagePath = (0, path_1.join)(layers0Path, 'nodepages', index.toString());
-                writeQueue.enqueue({ writePromise: this.writeFile(nodePagePath, nodePageStr) });
+                await writeQueue.enqueue({ writePromise: this.writeFile(nodePagePath, nodePageStr) });
             }
         }
     }

package/dist/i3s-converter/i3s-converter.d.ts

@@ -136,13 +136,6 @@ export default class I3SConverter {
      * @param level - level of node (distanse to root node in the tree)
      */
     private _createNode;
-    /**
-     * Convert attributesStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
-     * from B3DM batch table
-     * @param sourceTileContent - tile content of 3DTile
-     * @return {void}
-     */
-    private _convertAttributeStorageInfo;
     /**
      * Convert tile to one or more I3S nodes
      * @param sourceTile - source tile (3DTile)
@@ -247,7 +240,7 @@ export default class I3SConverter {
     /**
      * Generate storage attribute for map segmentation.
      * @param attributeIndex - order index of attribute (f_0, f_1 ...).
-     * @param key - attribute key from batch table.\
+     * @param key - attribute key from propertyTable.
      * @param attributeType - attribute type.
      * @return Updated storageAttribute.
      */
@@ -255,7 +248,7 @@ export default class I3SConverter {
     /**
      * Get the attribute type for attributeStorageInfo https://github.com/Esri/i3s-spec/blob/master/docs/1.7/attributeStorageInfo.cmn.md
      * @param key - attribute's key
-     * @param attribute - attribute's type in batchTable
+     * @param attribute - attribute's type in propertyTable
      */
     private getAttributeType;
     /**
@@ -280,18 +273,18 @@ export default class I3SConverter {
      */
     private _createFieldAttribute;
     /**
-     * Do conversion of 3DTiles batch table to I3s node attributes.
-     * @param batchTable - Table with layer meta data.
+     * Do conversion of 3DTiles property table to I3s node attributes.
+     * @param propertyTable - Table with layer meta data.
      */
-    private _convertBatchTableInfoToNodeAttributes;
+    private _convertPropertyTableToNodeAttributes;
     /**
-     * Find and return attribute type based on key form Batch table.
+     * Find and return attribute type based on key form propertyTable.
      * @param attributeType
      */
     private _getFieldAttributeType;
     /**
      * Generate popup info to show metadata on the map.
-     * @param batchTable - Batch table data with OBJECTID.
+     * @param propertyTable - table data with OBJECTID.
      * @return data for correct rendering of popup.
      */
     private _createPopupInfo;

package/dist/i3s-converter/i3s-converter.d.ts.map

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