@loaders.gl/tile-converter 4.2.0-alpha.4 → 4.2.0-alpha.6

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

@@ -1,7 +1,7 @@
 import type { Tiles3DTileContent } from '@loaders.gl/3d-tiles';
 import { Matrix4, Vector3 } from '@math.gl/core';
 import { BoundingSphere, OrientedBoundingBox } from '@math.gl/culling';
-import { GLTFAttributesData } from '../types';
+import { GLTFAttributesData } from "../types.js";
 /**
  * Prepare attributes for conversion to avoid binary data breaking in worker thread.
  * @param tileContent - 3DTiles tile content

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,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAC,OAAO,EAAc,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAC,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAE5C;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,kBAAkB,EAC/B,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,mBAAmB,GAAG,cAAc,GACnD,kBAAkB,CAyCpB;AAqBD;;;;;;;;;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"}
+{"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,EAAC,OAAO,EAAc,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAErE,OAAO,EAAC,kBAAkB,EAAC,oBAAiB;AAE5C;;;;;;;GAOG;AACH,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,kBAAkB,EAC/B,aAAa,EAAE,OAAO,EACtB,cAAc,EAAE,mBAAmB,GAAG,cAAc,GACnD,kBAAkB,CAwCpB;AAqBD;;;;;;;;;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,110 +1,122 @@
 import { Matrix4, Vector3 } from '@math.gl/core';
 import { Ellipsoid } from '@math.gl/geospatial';
+/**
+ * Prepare attributes for conversion to avoid binary data breaking in worker thread.
+ * @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 3DTiles content data, prepared for conversion
+ */
 export function prepareDataForAttributesConversion(tileContent, tileTransform, boundingVolume) {
-  var _tileContent$gltf, _tileContent$gltf$sce, _tileContent$gltf2, _tileContent$gltf2$sc, _tileContent$gltf2$sc2, _tileContent$gltf3, _tileContent$gltf4, _tileContent$gltf4$im;
-  let nodes = ((_tileContent$gltf = tileContent.gltf) === null || _tileContent$gltf === void 0 ? void 0 : (_tileContent$gltf$sce = _tileContent$gltf.scene) === null || _tileContent$gltf$sce === void 0 ? void 0 : _tileContent$gltf$sce.nodes) || ((_tileContent$gltf2 = tileContent.gltf) === null || _tileContent$gltf2 === void 0 ? void 0 : (_tileContent$gltf2$sc = _tileContent$gltf2.scenes) === null || _tileContent$gltf2$sc === void 0 ? void 0 : (_tileContent$gltf2$sc2 = _tileContent$gltf2$sc[0]) === null || _tileContent$gltf2$sc2 === void 0 ? void 0 : _tileContent$gltf2$sc2.nodes) || ((_tileContent$gltf3 = tileContent.gltf) === null || _tileContent$gltf3 === void 0 ? void 0 : _tileContent$gltf3.nodes) || [];
-  const images = ((_tileContent$gltf4 = tileContent.gltf) === null || _tileContent$gltf4 === void 0 ? void 0 : (_tileContent$gltf4$im = _tileContent$gltf4.images) === null || _tileContent$gltf4$im === void 0 ? void 0 : _tileContent$gltf4$im.map(imageObject => {
-    var _imageObject$image;
-    if (imageObject !== null && imageObject !== void 0 && (_imageObject$image = imageObject.image) !== null && _imageObject$image !== void 0 && _imageObject$image.compressed) {
-      return null;
-    } else {
-      var _imageObject$image2;
-      const data = imageObject === null || imageObject === void 0 ? void 0 : (_imageObject$image2 = imageObject.image) === null || _imageObject$image2 === void 0 ? void 0 : _imageObject$image2.data;
-      const dataCopy = new Uint8Array(data.length);
-      dataCopy.set(data);
-      return {
-        data: dataCopy,
-        compressed: false,
-        height: imageObject.image.height,
-        width: imageObject.image.width,
-        components: imageObject.image.components,
-        mimeType: imageObject.mimeType
-      };
-    }
-  })) || [];
-  prepareNodes(nodes);
-  const {
-    cartographicOrigin,
-    modelMatrix: cartesianModelMatrix
-  } = calculateTransformProps(tileContent, tileTransform, boundingVolume);
-  return {
-    nodes,
-    images,
-    cartographicOrigin,
-    cartesianModelMatrix
-  };
+    const nodes = tileContent.gltf?.scene?.nodes ||
+        tileContent.gltf?.scenes?.[0]?.nodes ||
+        tileContent.gltf?.nodes ||
+        [];
+    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 null;
+        }
+        const data = imageObject?.image?.data;
+        const dataCopy = new Uint8Array(data.length);
+        dataCopy.set(data);
+        return {
+            data: dataCopy,
+            compressed: false,
+            height: imageObject.image.height,
+            width: imageObject.image.width,
+            components: imageObject.image.components,
+            mimeType: imageObject.mimeType
+        };
+    }) || [];
+    prepareNodes(nodes);
+    const { cartographicOrigin, modelMatrix: cartesianModelMatrix } = calculateTransformProps(tileContent, tileTransform, boundingVolume);
+    return {
+        nodes,
+        images,
+        cartographicOrigin,
+        cartesianModelMatrix
+    };
 }
+/**
+ * Keep only values for glTF attributes to pass data to worker thread.
+ * @param attributes - geometry attributes
+ * @returns attributes with only `value` item
+ */
 function getB3DMAttributesWithoutBufferView(attributes) {
-  const attributesWithoutBufferView = {};
-  for (const attributeName in attributes) {
-    attributesWithoutBufferView[attributeName] = {
-      value: attributes[attributeName].value
-    };
-  }
-  return attributesWithoutBufferView;
+    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
+ */
 export function calculateTransformProps(tileContent, tileTransform, boundingVolume) {
-  const {
-    rtcCenter,
-    gltfUpAxis
-  } = tileContent;
-  const {
-    center
-  } = boundingVolume;
-  let modelMatrix = new Matrix4(tileTransform);
-  if (rtcCenter) {
-    modelMatrix.translate(rtcCenter);
-  }
-  switch (gltfUpAxis) {
-    case 'Z':
-      break;
-    case 'Y':
-      const rotationY = new Matrix4().rotateX(Math.PI / 2);
-      modelMatrix = modelMatrix.multiplyRight(rotationY);
-      break;
-    case 'X':
-      const rotationX = new Matrix4().rotateY(-Math.PI / 2);
-      modelMatrix = modelMatrix.multiplyRight(rotationX);
-      break;
-    default:
-      break;
-  }
-  const cartesianOrigin = new Vector3(center);
-  const cartographicOrigin = Ellipsoid.WGS84.cartesianToCartographic(cartesianOrigin, new Vector3());
-  return {
-    modelMatrix,
-    cartographicOrigin
-  };
+    const { rtcCenter, gltfUpAxis } = tileContent;
+    const { center } = boundingVolume;
+    let modelMatrix = new 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 Matrix4().rotateX(Math.PI / 2);
+            modelMatrix = modelMatrix.multiplyRight(rotationY);
+            break;
+        case 'X':
+            const rotationX = new Matrix4().rotateY(-Math.PI / 2);
+            modelMatrix = modelMatrix.multiplyRight(rotationX);
+            break;
+        default:
+            break;
+    }
+    const cartesianOrigin = new Vector3(center);
+    const cartographicOrigin = Ellipsoid.WGS84.cartesianToCartographic(cartesianOrigin, new Vector3());
+    return { modelMatrix, cartographicOrigin };
 }
+/**
+ * Traverse all nodes to replace all sensible data with copy to avoid data corruption in worker.
+ * @param nodes
+ */
 function prepareNodes(nodes) {
-  for (let index = 0; index < nodes.length; index++) {
-    const node = nodes[index];
-    if (node.mesh) {
-      var _node$mesh;
-      nodes[index] = {
-        ...node,
-        mesh: {
-          ...node.mesh,
-          primitives: (_node$mesh = node.mesh) === null || _node$mesh === void 0 ? void 0 : _node$mesh.primitives.map(primitive => {
-            var _primitive$indices, _primitive$material, _primitive$material2;
-            return {
-              ...primitive,
-              indices: {
-                value: primitive === null || primitive === void 0 ? void 0 : (_primitive$indices = primitive.indices) === null || _primitive$indices === void 0 ? void 0 : _primitive$indices.value
-              },
-              attributes: getB3DMAttributesWithoutBufferView(primitive.attributes),
-              material: {
-                id: primitive === null || primitive === void 0 ? void 0 : (_primitive$material = primitive.material) === null || _primitive$material === void 0 ? void 0 : _primitive$material.id,
-                uniqueId: primitive === null || primitive === void 0 ? void 0 : (_primitive$material2 = primitive.material) === null || _primitive$material2 === void 0 ? void 0 : _primitive$material2.uniqueId
-              }
+    for (let index = 0; index < nodes.length; index++) {
+        const node = nodes[index];
+        if (node.mesh) {
+            nodes[index] = {
+                ...node,
+                mesh: {
+                    ...node.mesh,
+                    primitives: node.mesh?.primitives.map((primitive) => ({
+                        ...primitive,
+                        indices: { value: primitive?.indices?.value },
+                        attributes: getB3DMAttributesWithoutBufferView(primitive.attributes),
+                        material: {
+                            id: primitive?.material?.id,
+                            uniqueId: primitive?.material?.uniqueId
+                        }
+                    }))
+                }
             };
-          })
         }
-      };
-    }
-    if (node.children) {
-      prepareNodes(node.children);
+        if (node.children) {
+            prepareNodes(node.children);
+        }
     }
-  }
 }
-//# sourceMappingURL=gltf-attributes.js.map

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

@@ -2,83 +2,120 @@ import { Tiles3DArchive } from '@loaders.gl/3d-tiles';
 import { load } from '@loaders.gl/core';
 import { FileHandleFile } from '@loaders.gl/loader-utils';
 import { CD_HEADER_SIGNATURE, ZipFileSystem, parseHashTable, parseZipCDFileHeader, parseZipLocalFileHeader, searchFromTheEnd } from '@loaders.gl/zip';
+/**
+ * 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 const loadNestedTileset = async (sourceTileset, sourceTile, tilesetLoadOptions) => {
-  const isTileset = isNestedTileset(sourceTile);
-  if (!sourceTileset || !sourceTile.contentUrl || !isTileset) {
-    return;
-  }
-  const loadOptions = {
-    ...tilesetLoadOptions,
-    [sourceTileset.loader.id]: {
-      isTileset,
-      assetGltfUpAxis: sourceTileset.asset && sourceTileset.asset.gltfUpAxis || 'Y'
+    const isTileset = isNestedTileset(sourceTile);
+    if (!sourceTileset || !sourceTile.contentUrl || !isTileset) {
+        return;
+    }
+    const loadOptions = {
+        ...tilesetLoadOptions,
+        [sourceTileset.loader.id]: {
+            isTileset,
+            assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'
+        }
+    };
+    const tileContent = await loadFromArchive(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
+    if (tileContent.root) {
+        sourceTile.children = [tileContent.root];
     }
-  };
-  const tileContent = await loadFromArchive(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
-  if (tileContent.root) {
-    sourceTile.children = [tileContent.root];
-  }
 };
+/**
+ * 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 const loadTile3DContent = async (sourceTileset, sourceTile, tilesetLoadOptions) => {
-  const isTileset = isNestedTileset(sourceTile);
-  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 isTileset = isNestedTileset(sourceTile);
+    if (!sourceTileset || !sourceTile.contentUrl || isTileset) {
+        return null;
     }
-  };
-  const tileContent = await loadFromArchive(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
-  return tileContent;
+    const loadOptions = {
+        ...tilesetLoadOptions,
+        [sourceTileset.loader.id]: {
+            // @ts-ignore
+            ...(tilesetLoadOptions[sourceTileset.loader.id] || {}),
+            isTileset,
+            assetGltfUpAxis: (sourceTileset.asset && sourceTileset.asset.gltfUpAxis) || 'Y'
+        }
+    };
+    const tileContent = await loadFromArchive(sourceTile.contentUrl, sourceTileset.loader, loadOptions);
+    return tileContent;
 };
+/**
+ * Load a resource with load options and .3tz format support
+ * @param url - resource URL
+ * @param loader - loader to parse data (Tiles3DLoader / CesiumIonLoader)
+ * @param loadOptions - 3d-tiles loader options
+ * @returns 3d-tiles resource
+ */
 export async function loadFromArchive(url, loader, loadOptions) {
-  const tz3UrlParts = url.split('.3tz');
-  let filename;
-  if (tz3UrlParts.length === 1) {
-    filename = null;
-  } else if (tz3UrlParts.length === 2) {
-    filename = tz3UrlParts[1].slice(1);
-    if (filename === '') {
-      filename = 'tileset.json';
+    const tz3UrlParts = url.split('.3tz');
+    let filename;
+    // No '.3tz'. The file will be loaded with global fetch function
+    if (tz3UrlParts.length === 1) {
+        filename = null;
+    }
+    else if (tz3UrlParts.length === 2) {
+        filename = tz3UrlParts[1].slice(1);
+        if (filename === '') {
+            filename = 'tileset.json';
+        }
+    }
+    else {
+        throw new Error('Unexpected URL format');
+    }
+    if (filename) {
+        const tz3Path = `${tz3UrlParts[0]}.3tz`;
+        const fileProvider = new FileHandleFile(tz3Path);
+        const hashTable = await loadHashTable(fileProvider);
+        const archive = new Tiles3DArchive(fileProvider, hashTable, tz3Path);
+        const fileSystem = new ZipFileSystem(archive);
+        const content = await load(filename, loader, {
+            ...loadOptions,
+            fetch: fileSystem.fetch.bind(fileSystem)
+        });
+        await fileSystem.destroy();
+        return content;
     }
-  } else {
-    throw new Error('Unexpected URL format');
-  }
-  if (filename) {
-    const tz3Path = `${tz3UrlParts[0]}.3tz`;
-    const fileProvider = new FileHandleFile(tz3Path);
-    const hashTable = await loadHashTable(fileProvider);
-    const archive = new Tiles3DArchive(fileProvider, hashTable, tz3Path);
-    const fileSystem = new ZipFileSystem(archive);
-    const content = await load(filename, loader, {
-      ...loadOptions,
-      fetch: fileSystem.fetch.bind(fileSystem)
-    });
-    await fileSystem.destroy();
-    return content;
-  }
-  return await load(url, loader, loadOptions);
+    return await load(url, loader, loadOptions);
 }
+/**
+ * Check if tile is nested tileset
+ * @param tile - 3DTiles header data
+ * @returns true if tile is nested tileset
+ */
 export function isNestedTileset(tile) {
-  return (tile === null || tile === void 0 ? void 0 : tile.type) === 'json' || (tile === null || tile === void 0 ? void 0 : tile.type) === '3tz';
+    return tile?.type === 'json' || tile?.type === '3tz';
 }
+/**
+ * Load hash file from 3TZ
+ * @param fileProvider - binary reader of 3TZ
+ * @returns hash table of the 3TZ file content or undefined if the hash file is not presented inside
+ */
 async function loadHashTable(fileProvider) {
-  let hashTable;
-  const hashCDOffset = await searchFromTheEnd(fileProvider, CD_HEADER_SIGNATURE);
-  const cdFileHeader = await parseZipCDFileHeader(hashCDOffset, fileProvider);
-  if ((cdFileHeader === null || cdFileHeader === void 0 ? void 0 : cdFileHeader.fileName) === '@3dtilesIndex1@') {
-    const localFileHeader = await parseZipLocalFileHeader(cdFileHeader.localHeaderOffset, fileProvider);
-    if (!localFileHeader) {
-      throw new Error('corrupted 3tz');
+    let hashTable;
+    const hashCDOffset = await searchFromTheEnd(fileProvider, CD_HEADER_SIGNATURE);
+    const cdFileHeader = await parseZipCDFileHeader(hashCDOffset, fileProvider);
+    // '@3dtilesIndex1@' is index file that must be the last in the archive. It allows
+    // to improve load and read performance when the archive contains a very large number
+    // of files.
+    if (cdFileHeader?.fileName === '@3dtilesIndex1@') {
+        const localFileHeader = await parseZipLocalFileHeader(cdFileHeader.localHeaderOffset, fileProvider);
+        if (!localFileHeader) {
+            throw new Error('corrupted 3tz');
+        }
+        const fileDataOffset = localFileHeader.fileDataOffset;
+        const hashFile = await fileProvider.slice(fileDataOffset, fileDataOffset + localFileHeader.compressedSize);
+        hashTable = parseHashTable(hashFile);
     }
-    const fileDataOffset = localFileHeader.fileDataOffset;
-    const hashFile = await fileProvider.slice(fileDataOffset, fileDataOffset + localFileHeader.compressedSize);
-    hashTable = parseHashTable(hashFile);
-  }
-  return hashTable;
+    return hashTable;
 }
-//# sourceMappingURL=load-3d-tiles.js.map

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

@@ -1,72 +1,116 @@
 import { OrientedBoundingBox, BoundingSphere } from '@math.gl/culling';
 import { Vector3 } from '@math.gl/core';
 import { Ellipsoid } from '@math.gl/geospatial';
-const CUBE_POSITIONS = new Float32Array([-1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1, -1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1, -1, -1, 1, -1, -1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, 1, -1, -1, 1, -1, 1, -1, -1, 1, 1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, -1, -1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1]);
+// prettier-ignore
+const CUBE_POSITIONS = new Float32Array([
+    -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1, 1,
+    -1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1, -1,
+    -1, 1, -1, -1, 1, 1, 1, 1, 1, 1, 1, -1,
+    -1, -1, -1, 1, -1, -1, 1, -1, 1, -1, -1, 1,
+    1, -1, -1, 1, 1, -1, 1, 1, 1, 1, -1, 1,
+    -1, -1, -1, -1, -1, 1, -1, 1, 1, -1, 1, -1
+]);
+// TODO Unite Tile validation logic in i3s-17-and-debug with this code.
+/**
+ * Do validation of bounding volumes for particular node.
+ * Generates special warnings if there are some issues.
+ * @param node
+ */
 export function validateNodeBoundingVolumes(node) {
-  var _node$parentNode, _node$parentNode2;
-  if (!(node !== null && node !== void 0 && (_node$parentNode = node.parentNode) !== null && _node$parentNode !== void 0 && _node$parentNode.obb) || !(node !== null && node !== void 0 && (_node$parentNode2 = node.parentNode) !== null && _node$parentNode2 !== void 0 && _node$parentNode2.mbs)) {
-    return [];
-  }
-  const tileWarnings = [];
-  validateObb(tileWarnings, node);
-  validateMbs(tileWarnings, node);
-  return tileWarnings;
+    if (!node?.parentNode?.obb || !node?.parentNode?.mbs) {
+        return [];
+    }
+    const tileWarnings = [];
+    validateObb(tileWarnings, node);
+    validateMbs(tileWarnings, node);
+    return tileWarnings;
 }
+/**
+ * Check if child Obb fit into parent Obb.
+ * @param tileWarnings
+ * @param node
+ */
 function validateObb(tileWarnings, node) {
-  var _node$parentNode3;
-  const parentObb = createBoundingBoxFromTileObb(node.parentNode.obb);
-  const tileVertices = getTileObbVertices(node);
-  const isTileObbInsideParentObb = isAllVerticesInsideBoundingVolume(parentObb, tileVertices);
-  if (isTileObbInsideParentObb) {
-    return;
-  }
-  const title = `OBB of Tile (${node.id}) doesn't fit into Parent (${(_node$parentNode3 = node.parentNode) === null || _node$parentNode3 === void 0 ? void 0 : _node$parentNode3.id}) tile OBB`;
-  tileWarnings.push(title);
+    // @ts-expect-error
+    const parentObb = createBoundingBoxFromTileObb(node.parentNode.obb);
+    const tileVertices = getTileObbVertices(node);
+    const isTileObbInsideParentObb = isAllVerticesInsideBoundingVolume(parentObb, tileVertices);
+    if (isTileObbInsideParentObb) {
+        return;
+    }
+    const title = `OBB of Tile (${node.id}) doesn't fit into Parent (${node.parentNode?.id}) tile OBB`;
+    tileWarnings.push(title);
 }
+/**
+ * Check if child Mbs fit into parent Mbs.
+ * @param tileWarnings
+ * @param node
+ */
 function validateMbs(tileWarnings, node) {
-  const tileMbs = createBoundingSphereFromTileMbs(node.mbs);
-  const parentMbs = createBoundingSphereFromTileMbs(node.parentNode.mbs);
-  const distanceBetweenCenters = tileMbs.center.distanceTo(parentMbs.center);
-  if (distanceBetweenCenters + tileMbs.radius > parentMbs.radius) {
-    var _node$parentNode4;
-    const title = `MBS of Tile (${node.id}) doesn't fit into Parent (${(_node$parentNode4 = node.parentNode) === null || _node$parentNode4 === void 0 ? void 0 : _node$parentNode4.id}) tile MBS`;
-    tileWarnings.push(title);
-  }
+    // @ts-expect-error
+    const tileMbs = createBoundingSphereFromTileMbs(node.mbs);
+    // @ts-expect-error
+    const parentMbs = createBoundingSphereFromTileMbs(node.parentNode.mbs);
+    const distanceBetweenCenters = tileMbs.center.distanceTo(parentMbs.center);
+    if (distanceBetweenCenters + tileMbs.radius > parentMbs.radius) {
+        const title = `MBS of Tile (${node.id}) doesn't fit into Parent (${node.parentNode?.id}) tile MBS`;
+        tileWarnings.push(title);
+    }
 }
+/**
+ * Generates bounding sphere from mbs
+ * @param mbs
+ */
 function createBoundingSphereFromTileMbs(mbs) {
-  return new BoundingSphere([mbs[0], mbs[1], mbs[2]], mbs[3]);
+    return new BoundingSphere([mbs[0], mbs[1], mbs[2]], mbs[3]);
 }
+/**
+ * Generates oriented bounding box from tile obb
+ * @param obb
+ * @returns
+ */
 function createBoundingBoxFromTileObb(obb) {
-  const {
-    center,
-    halfSize,
-    quaternion
-  } = obb;
-  return new OrientedBoundingBox().fromCenterHalfSizeQuaternion(center, halfSize, quaternion);
+    const { center, halfSize, quaternion } = obb;
+    return new OrientedBoundingBox().fromCenterHalfSizeQuaternion(center, halfSize, quaternion);
 }
+/**
+ * Get vertices fromnode obb
+ * TODO check if Obb generates properly
+ * @param node
+ */
 function getTileObbVertices(node) {
-  const halfSize = node.obb.halfSize;
-  const positions = CUBE_POSITIONS;
-  const obbCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(node.obb.center);
-  let vertices = [];
-  for (let i = 0; i < positions.length; i += 3) {
-    const positionsVector = new Vector3(positions[i] *= halfSize[0], positions[i + 1] *= halfSize[1], positions[i + 2] *= halfSize[2]);
-    const rotatedPositions = positionsVector.transformByQuaternion(node.obb.quaternion).add(obbCenterCartesian);
-    vertices = vertices.concat(rotatedPositions);
-  }
-  return vertices;
+    // @ts-expect-error
+    const halfSize = node.obb.halfSize;
+    const positions = CUBE_POSITIONS;
+    // @ts-expect-error
+    const obbCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(node.obb.center);
+    let vertices = [];
+    for (let i = 0; i < positions.length; i += 3) {
+        const positionsVector = new Vector3((positions[i] *= halfSize[0]), (positions[i + 1] *= halfSize[1]), (positions[i + 2] *= halfSize[2]));
+        const rotatedPositions = positionsVector
+            // @ts-expect-error
+            .transformByQuaternion(node.obb.quaternion)
+            .add(obbCenterCartesian);
+        // @ts-expect-error
+        vertices = vertices.concat(rotatedPositions);
+    }
+    return vertices;
 }
+/**
+ * Check if all vertices inside bounding volume
+ * @param boundingVolume
+ * @param positions
+ */
 function isAllVerticesInsideBoundingVolume(boundingVolume, positions) {
-  let isVerticesInsideObb = true;
-  for (let index = 0; index < positions.length / 3; index += 3) {
-    const point = [positions[index], positions[index + 1], positions[index + 2]];
-    const cartographicPoint = Ellipsoid.WGS84.cartesianToCartographic(point);
-    const distance = boundingVolume.distanceTo(cartographicPoint);
-    if (distance > 0) {
-      isVerticesInsideObb = false;
-      break;
+    let isVerticesInsideObb = true;
+    for (let index = 0; index < positions.length / 3; index += 3) {
+        const point = [positions[index], positions[index + 1], positions[index + 2]];
+        const cartographicPoint = Ellipsoid.WGS84.cartesianToCartographic(point);
+        const distance = boundingVolume.distanceTo(cartographicPoint);
+        if (distance > 0) {
+            isVerticesInsideObb = false;
+            break;
+        }
     }
-  }
-  return isVerticesInsideObb;
+    return isVerticesInsideObb;
 }
-//# sourceMappingURL=node-debug.js.map

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

@@ -1,7 +1,7 @@
 import { BoundingVolumes, LodSelection, Node3DIndexDocument, NodeInPage } from '@loaders.gl/i3s';
-import I3SConverter from '../i3s-converter';
-import { I3SConvertedResources } from '../types';
-import { DumpMetadata } from '../../lib/utils/conversion-dump';
+import I3SConverter from "../i3s-converter.js";
+import { I3SConvertedResources } from "../types.js";
+import { DumpMetadata } from "../../lib/utils/conversion-dump.js";
 /**
  * Wrapper for https://github.com/Esri/i3s-spec/blob/master/docs/1.7/3DNodeIndexDocument.cmn.md data
  * The class allows working with 3DNodeIndexDocument in 2 modes:
@@ -81,7 +81,14 @@ export declare class NodeIndexDocument {
      * @param converter - I3SConverter instance
      * @returns NodeIndexDocument instance
      */
-    static createNode(parentNode: NodeIndexDocument, boundingVolumes: BoundingVolumes, lodSelection: LodSelection[], nodeInPage: NodeInPage, resources: I3SConvertedResources, converter: I3SConverter): Promise<NodeIndexDocument>;
+    static createNode({ parentNode, boundingVolumes, lodSelection, nodeInPage, resources, converter }: {
+        parentNode: NodeIndexDocument;
+        boundingVolumes: BoundingVolumes;
+        lodSelection: LodSelection[];
+        nodeInPage: NodeInPage;
+        resources: I3SConvertedResources;
+        converter: I3SConverter;
+    }): Promise<NodeIndexDocument>;
     /**
      * Form 3DNodeIndexDocument data for the root node
      * @param boundingVolumes - mbs and obb data about node's bounding volume

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;AAC/C,OAAO,EAAC,YAAY,EAAC,MAAM,iCAAiC,CAAC;AAE7D;;;;;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,GAAG,YAAY,GAC9C,OAAO,CAAC,mBAAmB,CAAC;CAyDhC"}
+{"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,4BAAyB;AAE5C,OAAO,EAAC,qBAAqB,EAAC,oBAAiB;AAC/C,OAAO,EAAC,YAAY,EAAC,2CAAwC;AAE7D;;;;;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,CAAC,EACtB,UAAU,EACV,eAAe,EACf,YAAY,EACZ,UAAU,EACV,SAAS,EACT,SAAS,EACV,EAAE;QACD,UAAU,EAAE,iBAAiB,CAAC;QAC9B,eAAe,EAAE,eAAe,CAAC;QACjC,YAAY,EAAE,YAAY,EAAE,CAAC;QAC7B,UAAU,EAAE,UAAU,CAAC;QACvB,SAAS,EAAE,qBAAqB,CAAC;QACjC,SAAS,EAAE,YAAY,CAAC;KACzB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAY9B;;;;OAIG;IACH,MAAM,CAAC,2BAA2B,CAAC,eAAe,EAAE,eAAe,GAAG,mBAAmB;IAqBzF;;;;;;;;;;OAUG;WAEU,uBAAuB,CAClC,UAAU,EAAE,iBAAiB,EAC7B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAAE,EAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,qBAAqB,GAAG,YAAY,GAC9C,OAAO,CAAC,mBAAmB,CAAC;CAyDhC"}