@loaders.gl/tile-converter 4.0.0-alpha.6 → 4.0.0-alpha.8

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

@@ -1,4 +1,6 @@
-import { GLTFAccessorPostprocessed, GLTFImagePostprocessed, GLTFMeshPrimitivePostprocessed } from '@loaders.gl/gltf';
+import { GLTFAccessorPostprocessed, GLTFMeshPrimitivePostprocessed } from '@loaders.gl/gltf';
+import type { NumericArray } from '@loaders.gl/loader-utils';
+import { TextureImageProperties } from '../../i3s-attributes-worker';
 /**
  * Getting batchIds from 3DTilesNext extensions.
  * @param attributes - gltf accessors
@@ -7,5 +9,5 @@ import { GLTFAccessorPostprocessed, GLTFImagePostprocessed, GLTFMeshPrimitivePos
  */
 export declare function handleBatchIdsExtensions(attributes: {
     [key: string]: GLTFAccessorPostprocessed;
-}, primitive: GLTFMeshPrimitivePostprocessed, images: GLTFImagePostprocessed[]): number[];
+}, primitive: GLTFMeshPrimitivePostprocessed, images: (TextureImageProperties | null)[]): NumericArray;
 //# sourceMappingURL=batch-ids-extensions.d.ts.map

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,EACL,yBAAyB,EACzB,sBAAsB,EACtB,8BAA8B,EAC/B,MAAM,kBAAkB,CAAC;AAS1B;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAC;CAC1C,EACD,SAAS,EAAE,8BAA8B,EACzC,MAAM,EAAE,sBAAsB,EAAE,GAC/B,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,EAAC,yBAAyB,EAAE,8BAA8B,EAAC,MAAM,kBAAkB,CAAC;AAC3F,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,0BAA0B,CAAC;AAM3D,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AAKnE;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,UAAU,EAAE;IACV,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAC;CAC1C,EACD,SAAS,EAAE,8BAA8B,EACzC,MAAM,EAAE,CAAC,sBAAsB,GAAG,IAAI,CAAC,EAAE,GACxC,YAAY,CAwBd"}

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

@@ -57,12 +57,9 @@ function handleExtFeatureMetadataExtension(attributes, extFeatureMetadata, image
     }
     // 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 [];
+        const batchIdsAttribute = attributes[featureTexture];
+        return batchIdsAttribute.value;
     }
     return [];
 }
@@ -115,7 +112,7 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
     const image = images[textureIndex];
     const batchIds = [];
     const channels = CHANNELS_MAP[featureChannel];
-    if (!image.compressed) {
+    if (image && image?.width && image?.height && image?.components) {
         for (let index = 0; index < textureCoordinates.length; index += 2) {
             const u = textureCoordinates[index];
             const v = textureCoordinates[index + 1];
@@ -127,7 +124,7 @@ function generateBatchIdsFromTexture(featureIdTexture, textureCoordinates, image
         }
     }
     else {
-        console.warn(`Can't get batch Ids from ${image.mimeType} compressed texture`);
+        console.warn(`Can't get batch Ids from ${image?.mimeType || ''} compressed texture`);
     }
     return batchIds;
 }

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

@@ -1,15 +1,14 @@
 import type { BoundingVolumes, FullExtent, Mbs, Obb } from '@loaders.gl/i3s';
 import { Vector3 } from '@math.gl/core';
 import { OrientedBoundingBox, BoundingSphere } from '@math.gl/culling';
-import { Tile3D } from '@loaders.gl/tiles';
 import { Geoid } from '@math.gl/geoid';
 /**
  * Create bounding volumes object from tile and geoid height model.
- * @param tile
- * @param geoidHeightModel
+ * @param sourceBoundingVolume - initialized bounding volume of the source tile
+ * @param geoidHeightModel - instance of Geoid class that converts elevation from geoidal to ellipsoidal and back
  * @returns - Bounding volumes object
  */
-export declare function createBoundingVolumes(tile: Tile3D, geoidHeightModel: Geoid): BoundingVolumes;
+export declare function createBoundingVolumes(sourceBoundingVolume: OrientedBoundingBox | BoundingSphere, geoidHeightModel: Geoid): BoundingVolumes;
 /**
  * Generates bounding volumes from geometry positions
  * @param cartesianPositions

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

@@ -1 +1 @@
-{"version":3,"file":"coordinate-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/coordinate-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAsB,OAAO,EAAC,MAAM,eAAe,CAAC;AAE3D,OAAO,EACL,mBAAmB,EAGnB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAErC;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,GAAG,eAAe,CAiC5F;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,kBAAkB,EAAE,YAAY,EAChC,gBAAgB,EAAE,KAAK,GACtB;IAAC,GAAG,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,CAoBtB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,EAAE,CAW5E;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,cAAc,EAAE,mBAAmB,GAAG,cAAc,GACnD,UAAU,CA4BZ;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAK9C"}
+{"version":3,"file":"coordinate-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/coordinate-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAsB,OAAO,EAAC,MAAM,eAAe,CAAC;AAE3D,OAAO,EACL,mBAAmB,EAGnB,cAAc,EACf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAErC;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,oBAAoB,EAAE,mBAAmB,GAAG,cAAc,EAC1D,gBAAgB,EAAE,KAAK,GACtB,eAAe,CAgCjB;AAED;;;;GAIG;AACH,wBAAgB,iCAAiC,CAC/C,kBAAkB,EAAE,YAAY,EAChC,gBAAgB,EAAE,KAAK,GACtB;IAAC,GAAG,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,CAoBtB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO,EAAE,CAW5E;AAED;;;;;GAKG;AACH,wBAAgB,oCAAoC,CAClD,cAAc,EAAE,mBAAmB,GAAG,cAAc,GACnD,UAAU,CA4BZ;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAK9C"}

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

@@ -6,26 +6,25 @@ const geospatial_1 = require("@math.gl/geospatial");
 const culling_1 = require("@math.gl/culling");
 /**
  * Create bounding volumes object from tile and geoid height model.
- * @param tile
- * @param geoidHeightModel
+ * @param sourceBoundingVolume - initialized bounding volume of the source tile
+ * @param geoidHeightModel - instance of Geoid class that converts elevation from geoidal to ellipsoidal and back
  * @returns - Bounding volumes object
  */
-function createBoundingVolumes(tile, geoidHeightModel) {
+function createBoundingVolumes(sourceBoundingVolume, geoidHeightModel) {
     let radius;
     let halfSize;
     let quaternion;
-    const boundingVolume = tile.boundingVolume;
-    const cartographicCenter = geospatial_1.Ellipsoid.WGS84.cartesianToCartographic(boundingVolume.center, new core_1.Vector3());
+    const cartographicCenter = geospatial_1.Ellipsoid.WGS84.cartesianToCartographic(sourceBoundingVolume.center, new core_1.Vector3());
     cartographicCenter[2] =
         cartographicCenter[2] -
             geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);
-    if (boundingVolume instanceof culling_1.OrientedBoundingBox) {
-        halfSize = boundingVolume.halfSize;
+    if (sourceBoundingVolume instanceof culling_1.OrientedBoundingBox) {
+        halfSize = sourceBoundingVolume.halfSize;
         radius = new core_1.Vector3(halfSize[0], halfSize[1], halfSize[2]).len();
-        quaternion = boundingVolume.quaternion;
+        quaternion = sourceBoundingVolume.quaternion;
     }
     else {
-        radius = tile.boundingVolume.radius;
+        radius = sourceBoundingVolume.radius;
         halfSize = [radius, radius, radius];
         quaternion = new core_1.Quaternion()
             .fromMatrix3(new core_1.Matrix3([halfSize[0], 0, 0, 0, halfSize[1], 0, 0, 0, halfSize[2]]))

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

@@ -1,13 +1,18 @@
-import type { B3DMContent, FeatureTableJson } from '@loaders.gl/3d-tiles';
+import type { FeatureTableJson, Tiles3DTileContent } from '@loaders.gl/3d-tiles';
+import { Matrix4 } from '@math.gl/core';
 import { ConvertedAttributes, I3SConvertedResources, I3SMaterialWithTexture } from '../types';
 import { AttributeStorageInfo } from '@loaders.gl/i3s';
 import { Geoid } from '@math.gl/geoid';
 /** Usage of worker here brings more overhead than advantage */
 import { B3DMAttributesData } from '../../i3s-attributes-worker';
+import { BoundingSphere, OrientedBoundingBox } from '@math.gl/culling';
 /**
  * Convert binary data from b3dm file to i3s resources
  *
  * @param tileContent - 3d tile content
+ * @param tileTransform - transformation matrix of the tile, calculated recursively multiplying
+ *                        transform of all parent tiles and transform of the current tile
+ * @param tileBoundingVolume - initialized bounding volume of the source tile
  * @param addNodeToNodePage - function to add new node to node pages
  * @param propertyTable - batch table (corresponding to feature attributes data)
  * @param featuresHashArray - hash array of features that is needed to not to mix up same features in parent and child nodes
@@ -19,7 +24,7 @@ import { B3DMAttributesData } from '../../i3s-attributes-worker';
  * @param workerSource - source code of used workers
  * @returns Array of node resources to create one or more i3s nodes
  */
-export default function convertB3dmToI3sGeometry(tileContent: B3DMContent, addNodeToNodePage: () => Promise<number>, propertyTable: FeatureTableJson | null, featuresHashArray: string[], attributeStorageInfo: AttributeStorageInfo[] | undefined, draco: boolean, generateBoundingVolumes: boolean, shouldMergeMaterials: boolean, geoidHeightModel: Geoid, workerSource: {
+export default function convertB3dmToI3sGeometry(tileContent: Tiles3DTileContent, tileTransform: Matrix4, tileBoundingVolume: OrientedBoundingBox | BoundingSphere, addNodeToNodePage: () => Promise<number>, propertyTable: FeatureTableJson | null, featuresHashArray: string[], attributeStorageInfo: AttributeStorageInfo[] | undefined, draco: boolean, generateBoundingVolumes: boolean, shouldMergeMaterials: boolean, geoidHeightModel: Geoid, workerSource: {
     [key: string]: string;
 }): Promise<I3SConvertedResources[] | null>;
 /**
@@ -34,8 +39,8 @@ export declare function convertAttributes(attributesData: B3DMAttributesData, ma
 /**
  * Find property table in tile
  * For example it can be batchTable for b3dm files or property table in gLTF extension.
- * @param sourceTile
+ * @param tileContent - 3DTiles tile content
  * @return batch table from b3dm / feature properties from EXT_FEATURE_METADATA
  */
-export declare function getPropertyTable(tileContent: B3DMContent): FeatureTableJson | null;
+export declare function getPropertyTable(tileContent: Tiles3DTileContent | null): 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":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAsBxE,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AACrC,+DAA+D;AAC/D,OAAO,EAAC,kBAAkB,EAAsC,MAAM,6BAA6B,CAAC;AAsCpG;;;;;;;;;;;;;;GAcG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,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,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,GACpC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CA0DzC;AA6ID;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAgD3C;AAkoCD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,gBAAgB,GAAG,IAAI,CAoBlF"}
+{"version":3,"file":"geometry-converter.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/geometry-converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAE,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAY/E,OAAO,EAAU,OAAO,EAAU,MAAM,eAAe,CAAC;AAUxD,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EAGvB,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,oBAAoB,EAIrB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AACrC,+DAA+D;AAC/D,OAAO,EACL,kBAAkB,EAEnB,MAAM,6BAA6B,CAAC;AAarC,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AA0BrE;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAA8B,wBAAwB,CACpD,WAAW,EAAE,kBAAkB,EAC/B,aAAa,EAAE,OAAO,EACtB,kBAAkB,EAAE,mBAAmB,GAAG,cAAc,EACxD,iBAAiB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,EACxC,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,oBAAoB,EAAE,OAAO,EAC7B,gBAAgB,EAAE,KAAK,EACvB,YAAY,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,GACpC,OAAO,CAAC,qBAAqB,EAAE,GAAG,IAAI,CAAC,CA8DzC;AA6ID;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACrC,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EAAE,sBAAsB,EAAE,EAChD,qBAAqB,EAAE,OAAO,GAC7B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAgD3C;AA4pCD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI,GAAG,gBAAgB,GAAG,IAAI,CAwBhG"}

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

@@ -40,6 +40,7 @@ const gltf_attributes_1 = require("./gltf-attributes");
 const batch_ids_extensions_1 = require("./batch-ids-extensions");
 const feature_attributes_1 = require("./feature-attributes");
 const math_1 = require("@loaders.gl/math");
+const geometry_utils_1 = require("../../lib/utils/geometry-utils");
 // 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;
@@ -63,6 +64,9 @@ let scratchVector = new core_1.Vector3();
  * Convert binary data from b3dm file to i3s resources
  *
  * @param tileContent - 3d tile content
+ * @param tileTransform - transformation matrix of the tile, calculated recursively multiplying
+ *                        transform of all parent tiles and transform of the current tile
+ * @param tileBoundingVolume - initialized bounding volume of the source tile
  * @param addNodeToNodePage - function to add new node to node pages
  * @param propertyTable - batch table (corresponding to feature attributes data)
  * @param featuresHashArray - hash array of features that is needed to not to mix up same features in parent and child nodes
@@ -74,10 +78,10 @@ let scratchVector = new core_1.Vector3();
  * @param workerSource - source code of used workers
  * @returns Array of node resources to create one or more i3s nodes
  */
-async function convertB3dmToI3sGeometry(tileContent, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, workerSource) {
+async function convertB3dmToI3sGeometry(tileContent, tileTransform, tileBoundingVolume, addNodeToNodePage, propertyTable, featuresHashArray, attributeStorageInfo, draco, generateBoundingVolumes, shouldMergeMaterials, geoidHeightModel, workerSource) {
     const useCartesianPositions = generateBoundingVolumes;
     const materialAndTextureList = await convertMaterials(tileContent.gltf?.materials, shouldMergeMaterials);
-    const dataForAttributesConversion = (0, gltf_attributes_1.prepareDataForAttributesConversion)(tileContent);
+    const dataForAttributesConversion = (0, gltf_attributes_1.prepareDataForAttributesConversion)(tileContent, tileTransform, tileBoundingVolume);
     const convertedAttributesMap = await convertAttributes(dataForAttributesConversion, materialAndTextureList, useCartesianPositions);
     /** Usage of worker here brings more overhead than advantage */
     // const convertedAttributesMap: Map<string, ConvertedAttributes> =
@@ -147,7 +151,7 @@ function _generateBoundingVolumesFromGeometry(convertedAttributesMap, geoidHeigh
  * @param params.convertedAttributes - Converted geometry attributes
  * @param params.material - I3S PBR-like material definition
  * @param params.texture - texture content
- * @param params.tileContent - B3DM decoded content
+ * @param params.tileContent - 3DTiles decoded content
  * @param params.nodeId - new node ID
  * @param params.featuresHashArray - hash array of features that is needed to not to mix up same features in parent and child nodes
  * @param params.propertyTable - batch table (corresponding to feature attributes data)
@@ -324,18 +328,23 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
         let outputAttributes = null;
         let materialUvRegion;
         if (primitive.material) {
-            outputAttributes = attributesMap.get(primitive.material.uniqueId);
-            materialUvRegion = outputAttributes?.mergedMaterials.find(({ originalMaterialId }) => originalMaterialId === primitive.material?.uniqueId)?.uvRegion;
+            outputAttributes = attributesMap.get(primitive.material.id);
+            materialUvRegion = outputAttributes?.mergedMaterials.find(({ originalMaterialId }) => originalMaterialId === primitive.material?.id)?.uvRegion;
         }
         else if (attributesMap.has('default')) {
             outputAttributes = attributesMap.get('default');
         }
         (0, core_2.assert)(outputAttributes !== null, 'Primitive - material mapping failed');
+        // Per the spec https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#_mesh_primitive_mode
+        // GL.TRIANGLES is default. So in case `mode` is `undefined`, it is 'TRIANGLES'
+        (0, core_2.assert)(primitive.mode === undefined ||
+            primitive.mode === math_1.GL.TRIANGLES ||
+            primitive.mode === math_1.GL.TRIANGLE_STRIP, `Primitive - unsupported mode ${primitive.mode}`);
         const attributes = primitive.attributes;
         if (!outputAttributes) {
             continue;
         }
-        const indices = getIndices(primitive);
+        const indices = normalizeIndices(primitive);
         outputAttributes.positions = (0, loader_utils_1.concatenateTypedArrays)(outputAttributes.positions, transformVertexArray({
             vertices: attributes.POSITION.value,
             cartographicOrigin,
@@ -365,11 +374,15 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
 }
 /**
  * Converts TRIANGLE-STRIPS to independent TRIANGLES
- * @param {MeshPrimitive} primitive - the primitive to get the indices from
+ * @param primitive - the primitive to get the indices from
  * @returns indices of vertices of the independent triangles
  */
-function getIndices(primitive) {
+function normalizeIndices(primitive) {
     let indices = primitive.indices?.value;
+    if (!indices) {
+        const positions = primitive.attributes.POSITION.value;
+        return (0, geometry_utils_1.generateSyntheticIndices)(positions.length / VALUES_PER_VERTEX);
+    }
     if (indices && primitive.mode === math_1.GL.TRIANGLE_STRIP) {
         /*
         TRIANGLE_STRIP geometry contains n+2 vertices for n triangles;
@@ -409,7 +422,7 @@ function getIndices(primitive) {
  * @param args.indices - gltf primitive indices
  * @param args.attributeSpecificTransformation - function to do attribute - specific transformations
  * @param args.useCartesianPositions - use coordinates as it is.
- * @returns {Float32Array}
+ * @returns
  */
 function transformVertexArray(args) {
     const { vertices, indices, attributeSpecificTransformation } = args;
@@ -700,9 +713,8 @@ function convertMaterial(sourceMaterial) {
             textureSetDefinitionId: 0
         };
     }
-    const uniqueId = (0, uuid_1.v4)();
-    sourceMaterial.uniqueId = uniqueId;
-    let mergedMaterials = [{ originalMaterialId: uniqueId }];
+    sourceMaterial.id = Number.isFinite(sourceMaterial.id) ? sourceMaterial.id : (0, uuid_1.v4)();
+    let mergedMaterials = [{ originalMaterialId: sourceMaterial.id }];
     if (!texture) {
         // Should use default baseColorFactor if it is not present in source material
         // https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#reference-pbrmetallicroughness
@@ -845,7 +857,7 @@ function extractSharedResourcesTextureInfo(texture, nodeId) {
                 // https://github.com/Esri/i3s-spec/blob/master/docs/1.7/image.cmn.md
                 id: generateImageId(texture, nodeId),
                 size: texture.source?.image.width,
-                length: [texture.source?.image.data.length]
+                length: texture.source?.image.data.length ? [texture.source?.image.data.length] : undefined
             }
         ]
     };
@@ -858,7 +870,10 @@ function extractSharedResourcesTextureInfo(texture, nodeId) {
  * @returns calculate image ID according to the spec
  */
 function generateImageId(texture, nodeId) {
-    const { width, height } = texture.source?.image;
+    const { width, height } = texture.source?.image || {};
+    if (!width || !height) {
+        return '';
+    }
     const levelCountOfTexture = 1;
     const indexOfLevel = 0;
     const indexOfTextureInStore = nodeId + 1;
@@ -887,10 +902,10 @@ function makeFeatureIdsUnique(featureIds, featureIndices, featuresHashArray, bat
 }
 /**
  * Generate replace map to make featureIds unique.
- * @param {Array} featureIds
- * @param {Object} batchTable
- * @param {Array} featuresHashArray
- * @returns {Object}
+ * @param featureIds
+ * @param batchTable
+ * @param featuresHashArray
+ * @returns
  */
 function getFeaturesReplaceMap(featureIds, batchTable, featuresHashArray) {
     const featureMap = {};
@@ -903,9 +918,9 @@ function getFeaturesReplaceMap(featureIds, batchTable, featuresHashArray) {
 }
 /**
  * Generates string for unique batch id creation.
- * @param {Object} batchTable
- * @param {Number} index
- * @returns {String}
+ * @param batchTable
+ * @param index
+ * @returns
  */
 function generateStringFromBatchTableByIndex(batchTable, index) {
     let str = '';
@@ -916,10 +931,10 @@ function generateStringFromBatchTableByIndex(batchTable, index) {
 }
 /**
  * Return already exited featureId or creates and returns new to support unique feature ids throw nodes.
- * @param {Number} index
- * @param {Object} batchTable
- * @param {Array} featuresHashArray
- * @returns {Number}
+ * @param index
+ * @param batchTable
+ * @param featuresHashArray
+ * @returns
  */
 function getOrCreateUniqueFeatureId(index, batchTable, featuresHashArray) {
     const batchTableStr = generateStringFromBatchTableByIndex(batchTable, index);
@@ -931,9 +946,9 @@ function getOrCreateUniqueFeatureId(index, batchTable, featuresHashArray) {
 }
 /**
  * Do replacement of indices for making them unique through all nodes.
- * @param {Array} indicesArray
- * @param {Object} featureMap
- * @returns {void}
+ * @param indicesArray
+ * @param featureMap
+ * @returns
  */
 function replaceIndicesByUnique(indicesArray, featureMap) {
     for (let index = 0; index < indicesArray.length; index++) {
@@ -942,10 +957,10 @@ function replaceIndicesByUnique(indicesArray, featureMap) {
 }
 /**
  * Convert property table data to attribute buffers.
- * @param {Array} featureIds
- * @param {Object} propertyTable - table with metadata for particular feature.
- * @param {Array} attributeStorageInfo
- * @returns {Array} - Array of file buffers.
+ * @param featureIds
+ * @param propertyTable - table with metadata for particular feature.
+ * @param attributeStorageInfo
+ * @returns - Array of file buffers.
  */
 function convertPropertyTableToAttributeBuffers(featureIds, propertyTable, attributeStorageInfo) {
     const attributeBuffers = [];
@@ -990,9 +1005,9 @@ function generateAttributeBuffer(type, value) {
 }
 /**
  * Return attribute type.
- * @param {String} key
- * @param {Array} attributeStorageInfo
- * @returns {String} attribute type.
+ * @param key
+ * @param attributeStorageInfo
+ * @returns attribute type.
  */
 function getAttributeType(key, attributeStorageInfo) {
     const attribute = attributeStorageInfo.find((attr) => attr.name === key);
@@ -1000,8 +1015,8 @@ function getAttributeType(key, attributeStorageInfo) {
 }
 /**
  * Convert short integer to attribute arrayBuffer.
- * @param {Array} featureIds
- * @returns {ArrayBuffer} - Buffer with objectId data.
+ * @param featureIds
+ * @returns - Buffer with objectId data.
  */
 function generateShortIntegerAttributeBuffer(featureIds) {
     const count = new Uint32Array([featureIds.length]);
@@ -1010,8 +1025,8 @@ function generateShortIntegerAttributeBuffer(featureIds) {
 }
 /**
  * Convert double to attribute arrayBuffer.
- * @param {Array} featureIds
- * @returns {ArrayBuffer} - Buffer with objectId data.
+ * @param featureIds
+ * @returns - Buffer with objectId data.
  */
 function generateDoubleAttributeBuffer(featureIds) {
     const count = new Uint32Array([featureIds.length]);
@@ -1021,8 +1036,8 @@ function generateDoubleAttributeBuffer(featureIds) {
 }
 /**
  * Convert batch table attributes to array buffer with batch table data.
- * @param {Array} batchAttributes
- * @returns {ArrayBuffer} - Buffer with batch table data.
+ * @param batchAttributes
+ * @returns - Buffer with batch table data.
  */
 function generateStringAttributeBuffer(batchAttributes) {
     const stringCountArray = new Uint32Array([batchAttributes.length]);
@@ -1042,8 +1057,8 @@ function generateStringAttributeBuffer(batchAttributes) {
 }
 /**
  * Convert featureIds to BigUint64Array.
- * @param {Array} featureIds
- * @returns {BigUint64Array} - Array of feature ids in BigUint64 format.
+ * @param featureIds
+ * @returns - Array of feature ids in BigUint64 format.
  */
 function generateBigUint64Array(featureIds) {
     const typedFeatureIds = new BigUint64Array(featureIds.length);
@@ -1102,9 +1117,9 @@ async function generateCompressedGeometry(vertexCount, convertedAttributes, attr
 }
 /**
  * Generates ordered feature indices based on face range
- * @param {Uint32Array} featureIndex
- * @param {Uint32Array} faceRange
- * @returns {Uint32Array}
+ * @param featureIndex
+ * @param faceRange
+ * @returns
  */
 function generateFeatureIndexAttribute(featureIndex, faceRange) {
     const orderedFeatureIndices = new Uint32Array(featureIndex.length);
@@ -1121,10 +1136,13 @@ function generateFeatureIndexAttribute(featureIndex, faceRange) {
 /**
  * Find property table in tile
  * For example it can be batchTable for b3dm files or property table in gLTF extension.
- * @param sourceTile
+ * @param tileContent - 3DTiles tile content
  * @return batch table from b3dm / feature properties from EXT_FEATURE_METADATA
  */
 function getPropertyTable(tileContent) {
+    if (!tileContent) {
+        return null;
+    }
     const batchTableJson = tileContent?.batchTableJson;
     if (batchTableJson) {
         return batchTableJson;
@@ -1145,7 +1163,7 @@ function getPropertyTable(tileContent) {
 exports.getPropertyTable = getPropertyTable;
 /**
  * Check extensions which can be with property table inside.
- * @param sourceTile
+ * @param tileContent - 3DTiles tile content
  */
 function getPropertyTableExtension(tileContent) {
     const extensionsWithPropertyTables = [EXT_FEATURE_METADATA, EXT_MESH_FEATURES];
@@ -1166,13 +1184,8 @@ function getPropertyTableExtension(tileContent) {
 /**
  * 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.
@@ -1190,6 +1203,23 @@ function getPropertyTableFromExtFeatureMetadata(extension) {
             return propertyTable;
         }
     }
-    console.warn("The I3S converter couldn't handle EXT_feature_metadata extension");
+    if (extension?.featureTextures) {
+        /**
+         * Take only first feature texture to generate attributes storage info object.
+         * TODO: Think about getting data from all feature textures?
+         * It can be tricky just because 3dTiles is able to have multiple featureTextures.
+         * In I3S we should decide which featureTextures will be passed to geometry data.
+         */
+        const firstTextureName = Object.keys(extension.featureTextures)?.[0];
+        if (firstTextureName) {
+            const featureTable = extension?.featureTextures[firstTextureName];
+            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: There is neither featureTables, no featureTextures in the extension.");
     return null;
 }

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

@@ -1,9 +1,28 @@
-import type { B3DMContent } from '@loaders.gl/3d-tiles';
+import type { Tiles3DTileContent } from '@loaders.gl/3d-tiles';
 import type { B3DMAttributesData } from '../../i3s-attributes-worker';
+import { Matrix4, Vector3 } from '@math.gl/core';
+import { BoundingSphere, OrientedBoundingBox } from '@math.gl/culling';
 /**
  * Prepare attributes for conversion to avoid binary data breaking in worker thread.
- * @param tileContent
+ * @param tileContent - 3DTiles tile content
+ * @param tileTransform - transformation matrix of the tile, calculated recursively multiplying
+ *                        transform of all parent tiles and transform of the current tile
+ * @param boundingVolume - initialized bounding volume of the source tile
  * @returns
  */
-export declare function prepareDataForAttributesConversion(tileContent: B3DMContent): B3DMAttributesData;
+export declare function prepareDataForAttributesConversion(tileContent: Tiles3DTileContent, tileTransform: Matrix4, boundingVolume: OrientedBoundingBox | BoundingSphere): B3DMAttributesData;
+/**
+ * Calculate transformation properties to transform vertex attributes (POSITION, NORMAL, etc.)
+ * from METER_OFFSET coorditantes to LNGLAT_OFFSET coordinates
+ * @param tileContent - 3DTiles tile content
+ * @param tileTransform - transformation matrix of the tile, calculated recursively multiplying
+ *                        transform of all parent tiles and transform of the current tile
+ * @param boundingVolume - initialized bounding volume of the source tile
+ * @returns modelMatrix - transformation matrix to transform coordinates to cartographic coordinates
+ *          cartographicOrigin - tile origin coordinates to calculate offsets
+ */
+export declare function calculateTransformProps(tileContent: Tiles3DTileContent, tileTransform: Matrix4, boundingVolume: OrientedBoundingBox | BoundingSphere): {
+    modelMatrix: Matrix4;
+    cartographicOrigin: Vector3;
+};
 //# sourceMappingURL=gltf-attributes.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"gltf-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/gltf-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAsBpE;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,WAAW,EAAE,WAAW,GAAG,kBAAkB,CAyC/F"}
+{"version":3,"file":"gltf-attributes.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/gltf-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAE7D,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAOrE;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,kBAAkB,EAC/B,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,mBAAmB,GAAG,cAAc,GACnD,kBAAkB,CAyCpB;AAkBD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,kBAAkB,EAC/B,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,mBAAmB,GAAG,cAAc,GACnD;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,kBAAkB,EAAE,OAAO,CAAA;CAAC,CAkCrD"}

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

@@ -1,25 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareDataForAttributesConversion = void 0;
-/**
- * Keep only values for B3DM attributes to pass data to worker thread.
- * @param attributes
- */
-function getB3DMAttributesWithoutBufferView(attributes) {
-    const attributesWithoutBufferView = {};
-    for (const attributeName in attributes) {
-        attributesWithoutBufferView[attributeName] = {
-            value: attributes[attributeName].value
-        };
-    }
-    return attributesWithoutBufferView;
-}
+exports.calculateTransformProps = exports.prepareDataForAttributesConversion = void 0;
+const core_1 = require("@math.gl/core");
+const geospatial_1 = require("@math.gl/geospatial");
 /**
  * Prepare attributes for conversion to avoid binary data breaking in worker thread.
- * @param tileContent
+ * @param tileContent - 3DTiles tile content
+ * @param tileTransform - transformation matrix of the tile, calculated recursively multiplying
+ *                        transform of all parent tiles and transform of the current tile
+ * @param boundingVolume - initialized bounding volume of the source tile
  * @returns
  */
-function prepareDataForAttributesConversion(tileContent) {
+function prepareDataForAttributesConversion(tileContent, tileTransform, boundingVolume) {
     let nodes = tileContent.gltf?.scene?.nodes ||
         tileContent.gltf?.scenes?.[0]?.nodes ||
         tileContent.gltf?.nodes ||
@@ -27,10 +19,7 @@ function prepareDataForAttributesConversion(tileContent) {
     const images = tileContent.gltf?.images?.map((imageObject) => {
         // Need data only for uncompressed images because we can't get batchIds from compressed textures.
         if (imageObject?.image?.compressed) {
-            return {
-                data: null,
-                compressed: true
-            };
+            return null;
         }
         else {
             const data = imageObject?.image?.data;
@@ -47,8 +36,7 @@ function prepareDataForAttributesConversion(tileContent) {
         }
     }) || [];
     prepareNodes(nodes);
-    const cartographicOrigin = tileContent.cartographicOrigin;
-    const cartesianModelMatrix = tileContent.cartesianModelMatrix;
+    const { cartographicOrigin, modelMatrix: cartesianModelMatrix } = calculateTransformProps(tileContent, tileTransform, boundingVolume);
     return {
         nodes,
         images,
@@ -57,6 +45,58 @@ function prepareDataForAttributesConversion(tileContent) {
     };
 }
 exports.prepareDataForAttributesConversion = prepareDataForAttributesConversion;
+/**
+ * Keep only values for glTF attributes to pass data to worker thread.
+ * @param attributes - geometry attributes
+ */
+function getB3DMAttributesWithoutBufferView(attributes) {
+    const attributesWithoutBufferView = {};
+    for (const attributeName in attributes) {
+        attributesWithoutBufferView[attributeName] = {
+            value: attributes[attributeName].value
+        };
+    }
+    return attributesWithoutBufferView;
+}
+/**
+ * Calculate transformation properties to transform vertex attributes (POSITION, NORMAL, etc.)
+ * from METER_OFFSET coorditantes to LNGLAT_OFFSET coordinates
+ * @param tileContent - 3DTiles tile content
+ * @param tileTransform - transformation matrix of the tile, calculated recursively multiplying
+ *                        transform of all parent tiles and transform of the current tile
+ * @param boundingVolume - initialized bounding volume of the source tile
+ * @returns modelMatrix - transformation matrix to transform coordinates to cartographic coordinates
+ *          cartographicOrigin - tile origin coordinates to calculate offsets
+ */
+function calculateTransformProps(tileContent, tileTransform, boundingVolume) {
+    const { rtcCenter, gltfUpAxis } = tileContent;
+    const { center } = boundingVolume;
+    let modelMatrix = new core_1.Matrix4(tileTransform);
+    // Translate if appropriate
+    if (rtcCenter) {
+        modelMatrix.translate(rtcCenter);
+    }
+    // glTF models need to be rotated from Y to Z up
+    // https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/specification#y-up-to-z-up
+    switch (gltfUpAxis) {
+        case 'Z':
+            break;
+        case 'Y':
+            const rotationY = new core_1.Matrix4().rotateX(Math.PI / 2);
+            modelMatrix = modelMatrix.multiplyRight(rotationY);
+            break;
+        case 'X':
+            const rotationX = new core_1.Matrix4().rotateY(-Math.PI / 2);
+            modelMatrix = modelMatrix.multiplyRight(rotationX);
+            break;
+        default:
+            break;
+    }
+    const cartesianOrigin = new core_1.Vector3(center);
+    const cartographicOrigin = geospatial_1.Ellipsoid.WGS84.cartesianToCartographic(cartesianOrigin, new core_1.Vector3());
+    return { modelMatrix, cartographicOrigin };
+}
+exports.calculateTransformProps = calculateTransformProps;
 /**
  * Traverse all nodes to replace all sensible data with copy to avoid data corruption in worker.
  * @param nodes