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

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 [];
 }

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,EACL,kBAAkB,EAEnB,MAAM,6BAA6B,CAAC;AAsCrC;;;;;;;;;;;;;;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;AAwpCD;;;;;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

@@ -64,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
@@ -75,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> =
@@ -148,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)
@@ -332,7 +335,11 @@ function convertMesh(mesh, images, cartographicOrigin, cartesianModelMatrix, att
             outputAttributes = attributesMap.get('default');
         }
         (0, core_2.assert)(outputAttributes !== null, 'Primitive - material mapping failed');
-        (0, core_2.assert)(primitive.mode === math_1.GL.TRIANGLES || primitive.mode === math_1.GL.TRIANGLE_STRIP, `Primitive - unsupported mode ${primitive.mode}`);
+        // 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;
@@ -1129,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;
@@ -1153,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];
@@ -1174,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.
@@ -1198,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,CAsC/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 ||
@@ -44,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,
@@ -54,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

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

@@ -0,0 +1,18 @@
+import type { Tiles3DLoaderOptions, Tiles3DTileContent, Tiles3DTileJSONPostprocessed, Tiles3DTilesetJSONPostprocessed } from '@loaders.gl/3d-tiles';
+/**
+ * Load nested 3DTiles tileset. If the sourceTile is not nested tileset - do nothing
+ * @param sourceTileset - source root tileset JSON
+ * @param sourceTile - source tile JSON that is supposed to has link to nested tileset
+ * @param tilesetLoadOptions - load options for Tiles3DLoader
+ * @returns nothing
+ */
+export declare const loadNestedTileset: (sourceTileset: Tiles3DTilesetJSONPostprocessed | null, sourceTile: Tiles3DTileJSONPostprocessed, tilesetLoadOptions: Tiles3DLoaderOptions) => Promise<void>;
+/**
+ * Load 3DTiles tile content, that includes glTF object
+ * @param sourceTileset - source root tileset JSON
+ * @param sourceTile - source tile JSON that has link to content data
+ * @param tilesetLoadOptions - load options for Tiles3DLoader
+ * @returns - 3DTiles tile content or null
+ */
+export declare const loadTile3DContent: (sourceTileset: Tiles3DTilesetJSONPostprocessed | null, sourceTile: Tiles3DTileJSONPostprocessed, tilesetLoadOptions: Tiles3DLoaderOptions) => Promise<Tiles3DTileContent | null>;
+//# sourceMappingURL=load-3d-tiles.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"load-3d-tiles.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/load-3d-tiles.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,kBAAkB,EAClB,4BAA4B,EAC5B,+BAA+B,EAChC,MAAM,sBAAsB,CAAC;AAG9B;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,kBACb,+BAA+B,GAAG,IAAI,cACzC,4BAA4B,sBACpB,oBAAoB,KACvC,QAAQ,IAAI,CAkBd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,kBACb,+BAA+B,GAAG,IAAI,cACzC,4BAA4B,sBACpB,oBAAoB,KACvC,QAAQ,kBAAkB,GAAG,IAAI,CAiBnC,CAAC"}

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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadTile3DContent = exports.loadNestedTileset = void 0;
+const core_1 = require("@loaders.gl/core");
+/**
+ * Load nested 3DTiles tileset. If the sourceTile is not nested tileset - do nothing
+ * @param sourceTileset - source root tileset JSON
+ * @param sourceTile - source tile JSON that is supposed to has link to nested tileset
+ * @param tilesetLoadOptions - load options for Tiles3DLoader
+ * @returns nothing
+ */
+const loadNestedTileset = async (sourceTileset, sourceTile, tilesetLoadOptions) => {
+    const isTileset = sourceTile.type === 'json';
+    if (!sourceTileset || !sourceTile.contentUrl || !isTileset) {
+        return;
+    }
+    const loadOptions = {
+        ...tilesetLoadOptions,
+        [sourceTileset.loader.id]: {
+            isTileset,
+            assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'
+        }
+    };
+    const tileContent = await (0, core_1.load)(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
+    if (tileContent.root) {
+        sourceTile.children = [tileContent.root];
+    }
+};
+exports.loadNestedTileset = loadNestedTileset;
+/**
+ * Load 3DTiles tile content, that includes glTF object
+ * @param sourceTileset - source root tileset JSON
+ * @param sourceTile - source tile JSON that has link to content data
+ * @param tilesetLoadOptions - load options for Tiles3DLoader
+ * @returns - 3DTiles tile content or null
+ */
+const loadTile3DContent = async (sourceTileset, sourceTile, tilesetLoadOptions) => {
+    const isTileset = sourceTile.type === 'json';
+    if (!sourceTileset || !sourceTile.contentUrl || isTileset) {
+        return null;
+    }
+    const loadOptions = {
+        ...tilesetLoadOptions,
+        [sourceTileset.loader.id]: {
+            ...(tilesetLoadOptions[sourceTileset.loader.id] || {}),
+            isTileset,
+            assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'
+        }
+    };
+    const tileContent = await (0, core_1.load)(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
+    return tileContent;
+};
+exports.loadTile3DContent = loadTile3DContent;

package/dist/i3s-converter/helpers/node-index-document.d.ts

@@ -18,6 +18,12 @@ export declare class NodeIndexDocument {
     children: NodeIndexDocument[];
     /** converter instance */
     private converter;
+    /**
+     * Finalized property. It means that all child nodes are saved and their data
+     * is unloaded
+     */
+    private _finalized;
+    get finalized(): boolean;
     /**
      * Constructor
      * @param id - id of the node in node pages
@@ -41,6 +47,8 @@ export declare class NodeIndexDocument {
     addNeighbors(): Promise<void>;
     /** Save 3DNodeIndexDocument in file on disk */
     save(): Promise<void>;
+    /** Finalize the node */
+    private finalize;
     /**
      * Write 3DNodeIndexDocument https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md
      * @param node - Node3DIndexDocument object

package/dist/i3s-converter/helpers/node-index-document.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-index-document.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/node-index-document.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,UAAU,EAEX,MAAM,iBAAiB,CAAC;AAIzB,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAC,qBAAqB,EAAC,MAAM,UAAU,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,iBAAiB;IAC5B,cAAc;IACP,EAAE,EAAE,MAAM,CAAC;IAClB,uBAAuB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACxB,+BAA+B;IACxB,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IAC/C,eAAe;IACR,QAAQ,EAAE,iBAAiB,EAAE,CAAM;IAC1C,yBAAyB;IACzB,OAAO,CAAC,SAAS,CAAe;IAEhC;;;;OAIG;gBACS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY;IAM/C;;;;OAIG;IACU,OAAO,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAS3E;;;OAGG;IACU,WAAW,CAAC,UAAU,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BxE;;OAEG;IACU,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAgC1C,+CAA+C;IAClC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMlC;;;OAGG;YACW,KAAK;IAyBnB;;;OAGG;YACW,IAAI;IAalB;;OAEG;IACH,OAAO,CAAC,KAAK;IAIb;;;;;OAKG;WACU,cAAc,CACzB,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAM7B;;;;;;;;;OASG;WACU,UAAU,CACrB,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,qBAAqB,EAChC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAY7B;;;;OAIG;IACH,MAAM,CAAC,2BAA2B,CAAC,eAAe,EAAE,eAAe,GAAG,mBAAmB;IAqBzF;;;;;;;;;;OAUG;WACU,uBAAuB,CAClC,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,qBAAqB,GAC/B,OAAO,CAAC,mBAAmB,CAAC;CA4ChC"}
+{"version":3,"file":"node-index-document.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/node-index-document.ts"],"names":[],"mappings":"AACA,OAAO,EACL,eAAe,EACf,YAAY,EACZ,mBAAmB,EACnB,UAAU,EAEX,MAAM,iBAAiB,CAAC;AAIzB,OAAO,YAAY,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAC,qBAAqB,EAAC,MAAM,UAAU,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,iBAAiB;IAC5B,cAAc;IACP,EAAE,EAAE,MAAM,CAAC;IAClB,uBAAuB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACxB,+BAA+B;IACxB,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAAQ;IAC/C,eAAe;IACR,QAAQ,EAAE,iBAAiB,EAAE,CAAM;IAC1C,yBAAyB;IACzB,OAAO,CAAC,SAAS,CAAe;IAEhC;;;OAGG;IACH,OAAO,CAAC,UAAU,CAAkB;IACpC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;OAIG;gBACS,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY;IAM/C;;;;OAIG;IACU,OAAO,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAS3E;;;OAGG;IACU,WAAW,CAAC,UAAU,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BxE;;OAEG;IACU,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C,+CAA+C;IAClC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMlC,wBAAwB;IACxB,OAAO,CAAC,QAAQ;IAOhB;;;OAGG;YACW,KAAK;IAyBnB;;;OAGG;YACW,IAAI;IAalB;;OAEG;IACH,OAAO,CAAC,KAAK;IAIb;;;;;OAKG;WACU,cAAc,CACzB,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAM7B;;;;;;;;;OASG;WACU,UAAU,CACrB,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,qBAAqB,EAChC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAY7B;;;;OAIG;IACH,MAAM,CAAC,2BAA2B,CAAC,eAAe,EAAE,eAAe,GAAG,mBAAmB;IAqBzF;;;;;;;;;;OAUG;WACU,uBAAuB,CAClC,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,qBAAqB,GAC/B,OAAO,CAAC,mBAAmB,CAAC;CA4ChC"}

package/dist/i3s-converter/helpers/node-index-document.js

@@ -16,6 +16,9 @@ const node_1 = require("../json-templates/node");
  * on disk: the data is written on disk in a file. The file can be rewritten when new childrend or neighbors have to be added
  */
 class NodeIndexDocument {
+    get finalized() {
+        return this._finalized;
+    }
     /**
      * Constructor
      * @param id - id of the node in node pages
@@ -26,6 +29,11 @@ class NodeIndexDocument {
         this.data = null;
         /** children */
         this.children = [];
+        /**
+         * Finalized property. It means that all child nodes are saved and their data
+         * is unloaded
+         */
+        this._finalized = false;
         this.inPageId = id;
         this.id = id === 0 ? 'root' : id.toString();
         this.converter = converter;
@@ -76,6 +84,9 @@ class NodeIndexDocument {
      * Add neighbors to child nodes of this node
      */
     async addNeighbors() {
+        if (this.finalized) {
+            return;
+        }
         const nodeData = await this.load();
         for (const childNode of this.children) {
             const childNodeData = await childNode.load();
@@ -98,9 +109,9 @@ class NodeIndexDocument {
                 await childNode.write(childNodeData);
             }
             await childNode.save();
-            // The save after adding neighbors is the last one. Flush the the node
-            childNode.flush();
         }
+        // The save after adding neighbors is the last one. Finalize the the node
+        this.finalize();
     }
     /** Save 3DNodeIndexDocument in file on disk */
     async save() {
@@ -108,6 +119,13 @@ class NodeIndexDocument {
             await this.write(this.data);
         }
     }
+    /** Finalize the node */
+    finalize() {
+        this._finalized = true;
+        for (const child of this.children) {
+            child.flush();
+        }
+    }
     /**
      * Write 3DNodeIndexDocument https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md
      * @param node - Node3DIndexDocument object

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

@@ -11,7 +11,7 @@ const file_utils_1 = require("../../lib/utils/file-utils");
  * class NodePages - wrapper of nodePages array
  *
  * @example
- * import {writeFile} from './helpers/write-file.js';
+ * import {writeFile} from './helpers/write-file';
  *
  * // create an instance of the class
  * const nodePages = new NodePages(writeFile, HARDCODED_NODES_PER_PAGE);

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

@@ -0,0 +1,23 @@
+import { Tiles3DTileContent, Tiles3DTileJSONPostprocessed } from '@loaders.gl/3d-tiles';
+import { GltfPrimitiveModeString, PreprocessData } from '../types';
+/**
+ * glTF primitive modes
+ * @see https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#_mesh_primitive_mode
+ */
+export declare const GLTF_PRIMITIVE_MODES: GltfPrimitiveModeString[];
+/**
+ * Analyze tile content. This function is used during preprocess stage of
+ * conversion
+ * @param tile - 3DTiles tile JSON metadata
+ * @param tileContent - 3DTiles tile content ArrayBuffer
+ * @returns
+ */
+export declare const analyzeTileContent: (tile: Tiles3DTileJSONPostprocessed, tileContent: Tiles3DTileContent | null) => Promise<PreprocessData>;
+/**
+ * Merge object2 into object1
+ * @param object1
+ * @param object2
+ * @returns nothing
+ */
+export declare const mergePreprocessData: (object1: PreprocessData, object2: PreprocessData) => void;
+//# sourceMappingURL=preprocess-3d-tiles.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"preprocess-3d-tiles.d.ts","sourceRoot":"","sources":["../../../src/i3s-converter/helpers/preprocess-3d-tiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAE,4BAA4B,EAAC,MAAM,sBAAsB,CAAC;AACtF,OAAO,EAAC,uBAAuB,EAAE,cAAc,EAAC,MAAM,UAAU,CAAC;AAIjE;;;GAGG;AACH,eAAO,MAAM,oBAAoB,2BAQhC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,SACvB,4BAA4B,eACrB,kBAAkB,GAAG,IAAI,KACrC,QAAQ,cAAc,CAmBxB,CAAC;AAqBF;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,YAAa,cAAc,WAAW,cAAc,KAAG,IAKtF,CAAC"}