@loaders.gl/tile-converter 3.1.2 → 3.1.6

package/dist/dist.min.js

@@ -10622,16 +10622,16 @@ var require_bounding_sphere = __commonJS({
     }
     var scratchVector7 = new _core.Vector3();
     var scratchVector23 = new _core.Vector3();
-    var BoundingSphere3 = function() {
-      function BoundingSphere4() {
+    var BoundingSphere4 = function() {
+      function BoundingSphere5() {
         var center = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [0, 0, 0];
         var radius = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
-        (0, _classCallCheck2.default)(this, BoundingSphere4);
+        (0, _classCallCheck2.default)(this, BoundingSphere5);
         this.radius = -0;
         this.center = new _core.Vector3();
         this.fromCenterRadius(center, radius);
       }
-      (0, _createClass2.default)(BoundingSphere4, [{
+      (0, _createClass2.default)(BoundingSphere5, [{
         key: "fromCenterRadius",
         value: function fromCenterRadius(center, radius) {
           this.center.from(center);
@@ -10654,7 +10654,7 @@ var require_bounding_sphere = __commonJS({
       }, {
         key: "clone",
         value: function clone2() {
-          return new BoundingSphere4(this.center, this.radius);
+          return new BoundingSphere5(this.center, this.radius);
         }
       }, {
         key: "union",
@@ -10723,9 +10723,9 @@ var require_bounding_sphere = __commonJS({
           return _constants.INTERSECTION.INSIDE;
         }
       }]);
-      return BoundingSphere4;
+      return BoundingSphere5;
     }();
-    exports.default = BoundingSphere3;
+    exports.default = BoundingSphere4;
   }
 });
 
@@ -10762,15 +10762,15 @@ var require_oriented_bounding_box = __commonJS({
       COLUMN2ROW1: 7,
       COLUMN2ROW2: 8
     };
-    var OrientedBoundingBox6 = function() {
-      function OrientedBoundingBox7() {
+    var OrientedBoundingBox7 = function() {
+      function OrientedBoundingBox8() {
         var center = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [0, 0, 0];
         var halfAxes = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : [0, 0, 0, 0, 0, 0, 0, 0, 0];
-        (0, _classCallCheck2.default)(this, OrientedBoundingBox7);
+        (0, _classCallCheck2.default)(this, OrientedBoundingBox8);
         this.center = new _core.Vector3().from(center);
         this.halfAxes = new _core.Matrix3(halfAxes);
       }
-      (0, _createClass2.default)(OrientedBoundingBox7, [{
+      (0, _createClass2.default)(OrientedBoundingBox8, [{
         key: "halfSize",
         get: function get() {
           var xAxis = this.halfAxes.getColumn(0);
@@ -10810,7 +10810,7 @@ var require_oriented_bounding_box = __commonJS({
       }, {
         key: "clone",
         value: function clone2() {
-          return new OrientedBoundingBox7(this.center, this.halfAxes);
+          return new OrientedBoundingBox8(this.center, this.halfAxes);
         }
       }, {
         key: "equals",
@@ -10957,9 +10957,9 @@ var require_oriented_bounding_box = __commonJS({
           throw new Error("not implemented");
         }
       }]);
-      return OrientedBoundingBox7;
+      return OrientedBoundingBox8;
     }();
-    exports.default = OrientedBoundingBox6;
+    exports.default = OrientedBoundingBox7;
   }
 });
 
@@ -74748,18 +74748,21 @@ function commonSpacePlanesToWGS84(viewport, viewportCenterCartesian) {
 
 // ../tiles/src/tileset/helpers/zoom.ts
 var import_core3 = __toModule(require_es54());
+var import_culling2 = __toModule(require_es57());
 var WGS84_RADIUS_X = 6378137;
 var WGS84_RADIUS_Y = 6378137;
 var WGS84_RADIUS_Z = 6356752314245179e-9;
 var scratchVector2 = new import_core3.Vector3();
-function getZoomFromBoundingVolume(boundingVolume) {
-  const { halfAxes, radius, width, height } = boundingVolume;
-  if (halfAxes) {
+function getZoomFromBoundingVolume(boundingVolume, cartorgraphicCenter) {
+  if (boundingVolume instanceof import_culling2.OrientedBoundingBox) {
+    const { halfAxes } = boundingVolume;
     const obbSize = getObbSize(halfAxes);
-    return Math.log2(WGS84_RADIUS_Z / obbSize);
-  } else if (radius) {
-    return Math.log2(WGS84_RADIUS_Z / radius);
-  } else if (height && width) {
+    return Math.log2(WGS84_RADIUS_Z / (obbSize + cartorgraphicCenter[2]));
+  } else if (boundingVolume instanceof import_culling2.BoundingSphere) {
+    const { radius } = boundingVolume;
+    return Math.log2(WGS84_RADIUS_Z / (radius + cartorgraphicCenter[2]));
+  } else if (boundingVolume.width && boundingVolume.height) {
+    const { width, height } = boundingVolume;
     const zoomX = Math.log2(WGS84_RADIUS_X / width);
     const zoomY = Math.log2(WGS84_RADIUS_Y / height);
     return (zoomX + zoomY) / 2;
@@ -74777,7 +74780,7 @@ function getObbSize(halfAxes) {
 
 // ../tiles/src/tileset/tile-3d.ts
 var import_core7 = __toModule(require_es54());
-var import_culling3 = __toModule(require_es57());
+var import_culling4 = __toModule(require_es57());
 
 // ../tiles/src/constants.ts
 var TILE_CONTENT_STATE = {
@@ -74814,7 +74817,7 @@ var TILE3D_OPTIMIZATION_HINT = {
 
 // ../tiles/src/tileset/helpers/bounding-volume.ts
 var import_core4 = __toModule(require_es54());
-var import_culling2 = __toModule(require_es57());
+var import_culling3 = __toModule(require_es57());
 var import_geospatial3 = __toModule(require_es55());
 function defined2(x) {
   return x !== void 0 && x !== null;
@@ -74880,7 +74883,7 @@ function createBox(box, transform9, result) {
     result.halfAxes = halfAxes;
     return result;
   }
-  return new import_culling2.OrientedBoundingBox(center, halfAxes);
+  return new import_culling3.OrientedBoundingBox(center, halfAxes);
 }
 function createSphere(sphere, transform9, result) {
   const center = new import_core4.Vector3(sphere[0], sphere[1], sphere[2]);
@@ -74893,7 +74896,7 @@ function createSphere(sphere, transform9, result) {
     result.radius = radius;
     return result;
   }
-  return new import_culling2.BoundingSphere(center, radius);
+  return new import_culling3.BoundingSphere(center, radius);
 }
 
 // ../tiles/src/tileset/helpers/tiles-3d-lod.ts
@@ -75473,7 +75476,7 @@ var TileHeader = class {
       return;
     }
     const parent = this.parent;
-    const parentVisibilityPlaneMask = parent ? parent._visibilityPlaneMask : import_culling3.CullingVolume.MASK_INDETERMINATE;
+    const parentVisibilityPlaneMask = parent ? parent._visibilityPlaneMask : import_culling4.CullingVolume.MASK_INDETERMINATE;
     if (this.tileset._traverser.options.updateTransforms) {
       const parentTransform = parent ? parent.computedTransform : this.tileset.modelMatrix;
       this._updateTransform(parentTransform);
@@ -75481,7 +75484,7 @@ var TileHeader = class {
     this._distanceToCamera = this.distanceToTile(frameState);
     this._screenSpaceError = this.getScreenSpaceError(frameState, false);
     this._visibilityPlaneMask = this.visibility(frameState, parentVisibilityPlaneMask);
-    this._visible = this._visibilityPlaneMask !== import_culling3.CullingVolume.MASK_OUTSIDE;
+    this._visible = this._visibilityPlaneMask !== import_culling4.CullingVolume.MASK_OUTSIDE;
     this._inRequestVolume = this.insideViewerRequestVolume(frameState);
     this._frameNumber = frameState.frameNumber;
     this.viewportIds = viewportIds;
@@ -75563,7 +75566,7 @@ var TileHeader = class {
     this._distanceToCamera = 0;
     this._centerZDepth = 0;
     this._screenSpaceError = 0;
-    this._visibilityPlaneMask = import_culling3.CullingVolume.MASK_INDETERMINATE;
+    this._visibilityPlaneMask = import_culling4.CullingVolume.MASK_INDETERMINATE;
     this._visible = void 0;
     this._inRequestVolume = false;
     this._stackLength = 0;
@@ -76022,7 +76025,7 @@ var Tileset3D = class {
     }
     this.cartographicCenter = import_geospatial5.Ellipsoid.WGS84.cartesianToCartographic(center, new import_core10.Vector3());
     this.cartesianCenter = center;
-    this.zoom = getZoomFromBoundingVolume(root.boundingVolume);
+    this.zoom = getZoomFromBoundingVolume(root.boundingVolume, this.cartographicCenter);
   }
   _initializeStats() {
     this.stats.get(TILES_TOTAL);
@@ -82359,7 +82362,8 @@ async function parseImplicitTiles(subtree, options, parentData = {
     const currentTile = await parseImplicitTiles(subtree, options, pData, index, childTileLevel, globalData);
     if (currentTile.contentUrl || currentTile.children.length) {
       const globalLevel = lev + 1;
-      const formattedTile = formatTileData(currentTile, globalLevel, options);
+      const childCoordinates = { childTileX, childTileY, childTileZ };
+      const formattedTile = formatTileData(currentTile, globalLevel, childCoordinates, options);
       tile.children.push(formattedTile);
     }
   }
@@ -82374,10 +82378,19 @@ function getAvailabilityResult(availabilityData, index) {
   }
   return false;
 }
-function formatTileData(tile, level, options) {
-  const { basePath, refine, getRefine: getRefine2, lodMetricType, getTileType: getTileType2, rootLodMetricValue } = options;
+function formatTileData(tile, level, childCoordinates, options) {
+  const {
+    basePath,
+    refine,
+    getRefine: getRefine2,
+    lodMetricType,
+    getTileType: getTileType2,
+    rootLodMetricValue,
+    rootBoundingVolume
+  } = options;
   const uri = tile.contentUrl && tile.contentUrl.replace(`${basePath}/`, "");
   const lodMetricValue = rootLodMetricValue / 2 ** level;
+  const boundingVolume = calculateBoundingVolumeForChildTile(level, rootBoundingVolume, childCoordinates);
   return {
     children: tile.children,
     contentUrl: tile.contentUrl,
@@ -82386,9 +82399,31 @@ function formatTileData(tile, level, options) {
     refine: getRefine2(refine),
     type: getTileType2(tile),
     lodMetricType,
-    lodMetricValue
+    lodMetricValue,
+    boundingVolume
   };
 }
+function calculateBoundingVolumeForChildTile(level, rootBoundingVolume, childCoordinates) {
+  if (rootBoundingVolume.region) {
+    const { childTileX, childTileY, childTileZ } = childCoordinates;
+    const [west, south, east, north, minimumHeight, maximumHeight] = rootBoundingVolume.region;
+    const boundingVolumesCount = 2 ** level;
+    const sizeX = (east - west) / boundingVolumesCount;
+    const sizeY = (north - south) / boundingVolumesCount;
+    const sizeZ = (maximumHeight - minimumHeight) / boundingVolumesCount;
+    const [childWest, childEast] = [west + sizeX * childTileX, west + sizeX * (childTileX + 1)];
+    const [childSouth, childNorth] = [south + sizeY * childTileY, south + sizeY * (childTileY + 1)];
+    const [childMinimumHeight, childMaximumHeight] = [
+      minimumHeight + sizeZ * childTileZ,
+      minimumHeight + sizeZ * (childTileZ + 1)
+    ];
+    return {
+      region: [childWest, childSouth, childEast, childNorth, childMinimumHeight, childMaximumHeight]
+    };
+  }
+  console.warn("Unsupported bounding volume type: ", rootBoundingVolume);
+  return null;
+}
 function concatBits(first, second) {
   return parseInt(first.toString(2) + second.toString(2), 2);
 }
@@ -82490,6 +82525,7 @@ async function normalizeImplicitTileHeaders(tileset) {
   const contentUrlTemplate = `${basePath}/${tileset.root.content.uri}`;
   const refine = tileset.root.refine;
   const rootLodMetricValue = tileset.root.geometricError;
+  const rootBoundingVolume = tileset.root.boundingVolume;
   const options = {
     contentUrlTemplate,
     subtreesUriTemplate,
@@ -82500,6 +82536,7 @@ async function normalizeImplicitTileHeaders(tileset) {
     basePath,
     lodMetricType: LOD_METRIC_TYPE.GEOMETRIC_ERROR,
     rootLodMetricValue,
+    rootBoundingVolume,
     getTileType,
     getRefine
   };
@@ -83162,11 +83199,11 @@ function generateAttributes(attributes) {
       colors
     };
   }
-  const { faceRange, featureCount, featureIds } = calculateFaceRangesAndFeaturesCount(featureIndices);
-  const attributeObjects = makeAttributeObjects({ faceRange, featureIds, ...attributes });
+  const data = calculateFaceRangesAndFeaturesCount(featureIndices);
+  const attributeObjects = makeAttributeObjects({ ...data, ...attributes });
   const unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);
-  const groupedAttributes = groupAttributesAndRangesByFeatureId(unifiedAttributeObjectsByFeatureIds);
-  return { featureCount, ...groupedAttributes };
+  const groupedAttributes = groupAttributesAndRangesByFeatureId(unifiedAttributeObjectsByFeatureIds, data.featureCount);
+  return groupedAttributes;
 }
 function calculateFaceRangesAndFeaturesCount(featureIndices) {
   let rangeIndex = 1;
@@ -83196,7 +83233,14 @@ function calculateFaceRangesAndFeaturesCount(featureIndices) {
   return { faceRange, featureCount, featureIds };
 }
 function makeAttributeObjects(attributes) {
-  const { featureIds, positions, normals, colors, texCoords, faceRange } = attributes;
+  const {
+    featureIds,
+    positions,
+    normals,
+    colors,
+    texCoords,
+    faceRange = new Uint32Array(0)
+  } = attributes;
   const groupedData = [];
   let positionsList = new Float32Array(positions);
   let normalsList = new Float32Array(normals);
@@ -83258,9 +83302,9 @@ function unifyObjectsByFeatureId(sortedData) {
   }
   return uniqueObjects;
 }
-function groupAttributesAndRangesByFeatureId(unifiedObjects) {
+function groupAttributesAndRangesByFeatureId(unifiedObjects, featureCount) {
   const firstAttributeObject = unifiedObjects[0];
-  const featureIds = [firstAttributeObject.featureId];
+  const featureIds = [firstAttributeObject.featureId || 0];
   let positions = new Float32Array(firstAttributeObject.positions);
   let normals = new Float32Array(firstAttributeObject.normals);
   let colors = new Uint8Array(firstAttributeObject.colors);
@@ -83270,7 +83314,7 @@ function groupAttributesAndRangesByFeatureId(unifiedObjects) {
   let sum = 0;
   for (let index = 1; index < unifiedObjects.length; index++) {
     const currentAttributesObject = unifiedObjects[index];
-    featureIds.push(currentAttributesObject.featureId);
+    featureIds.push(currentAttributesObject.featureId || 0);
     positions = concatenateTypedArrays(positions, currentAttributesObject.positions);
     normals = concatenateTypedArrays(normals, currentAttributesObject.normals);
     colors = concatenateTypedArrays(colors, currentAttributesObject.colors);
@@ -83283,13 +83327,13 @@ function groupAttributesAndRangesByFeatureId(unifiedObjects) {
   }
   range.push(positions.length / POSITIONS_AND_NORMALS_PER_TRIANGLE - 1);
   const faceRange = new Uint32Array(range);
-  return { faceRange, featureIds, positions, normals, colors, texCoords };
+  return { faceRange, featureIds, positions, normals, colors, texCoords, featureCount };
 }
 
 // src/i3s-converter/helpers/coordinate-converter.ts
 var import_core20 = __toModule(require_es54());
 var import_geospatial7 = __toModule(require_es55());
-var import_culling4 = __toModule(require_es57());
+var import_culling5 = __toModule(require_es57());
 function createBoundingVolumes(tile, geoidHeightModel) {
   let radius;
   let halfSize;
@@ -83297,7 +83341,7 @@ function createBoundingVolumes(tile, geoidHeightModel) {
   const boundingVolume = tile.boundingVolume;
   const cartographicCenter = import_geospatial7.Ellipsoid.WGS84.cartesianToCartographic(boundingVolume.center, new import_core20.Vector3());
   cartographicCenter[2] = cartographicCenter[2] - geoidHeightModel.getHeight(cartographicCenter[1], cartographicCenter[0]);
-  if (boundingVolume instanceof import_culling4.OrientedBoundingBox) {
+  if (boundingVolume instanceof import_culling5.OrientedBoundingBox) {
     halfSize = boundingVolume.halfSize;
     radius = new import_core20.Vector3(halfSize[0], halfSize[1], halfSize[2]).len();
     quaternion = boundingVolume.quaternion;
@@ -83317,8 +83361,8 @@ function createBoundingVolumes(tile, geoidHeightModel) {
 }
 function createBoundingVolumesFromGeometry(cartesianPositions, geoidHeightModel) {
   const positionVectors = convertPositionsToVectors(cartesianPositions);
-  const geometryObb = (0, import_culling4.makeOrientedBoundingBoxFromPoints)(positionVectors);
-  const geometryMbs = (0, import_culling4.makeBoundingSphereFromPoints)(positionVectors);
+  const geometryObb = (0, import_culling5.makeOrientedBoundingBoxFromPoints)(positionVectors);
+  const geometryMbs = (0, import_culling5.makeBoundingSphereFromPoints)(positionVectors);
   let mbsCenter = import_geospatial7.Ellipsoid.WGS84.cartesianToCartographic(geometryMbs.center, new import_core20.Vector3());
   let obbCenter = import_geospatial7.Ellipsoid.WGS84.cartesianToCartographic(geometryObb.center, new import_core20.Vector3());
   mbsCenter[2] = mbsCenter[2] - geoidHeightModel.getHeight(mbsCenter[1], mbsCenter[0]);
@@ -83361,10 +83405,12 @@ function createObbFromMbs(mbs) {
   const radius = mbs[3];
   const center = new import_core20.Vector3(mbs[0], mbs[1], mbs[2]);
   const halfAxex = new import_core20.Matrix3([radius, 0, 0, 0, radius, 0, 0, 0, radius]);
-  return new import_culling4.OrientedBoundingBox(center, halfAxex);
+  return new import_culling5.OrientedBoundingBox(center, halfAxex);
 }
 
 // src/i3s-converter/helpers/geometry-converter.js
+var DEFAULT_ROUGHNESS_FACTOR = 1;
+var DEFAULT_METALLIC_FACTOR = 1;
 var VALUES_PER_VERTEX2 = 3;
 var VALUES_PER_TEX_COORD = 2;
 var VALUES_PER_COLOR_ELEMENT = 4;
@@ -83503,14 +83549,30 @@ function convertNodes(nodes, tileContent, attributesMap, useCartesianPositions,
     }
   }
 }
+function getCompositeTransformationMatrix(node2, matrix) {
+  let transformationMatrix = matrix;
+  const { matrix: nodeMatrix, rotation, scale, translation } = node2;
+  if (nodeMatrix) {
+    transformationMatrix = matrix.multiplyRight(nodeMatrix);
+  }
+  if (rotation) {
+    transformationMatrix = transformationMatrix.rotateXYZ(rotation);
+  }
+  if (scale) {
+    transformationMatrix = transformationMatrix.scale(scale);
+  }
+  if (translation) {
+    transformationMatrix = transformationMatrix.translate(translation);
+  }
+  return transformationMatrix;
+}
 function convertNode(node2, tileContent, attributesMap, useCartesianPositions, matrix = new import_core21.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
-  const nodeMatrix = node2.matrix;
-  const compositeMatrix = nodeMatrix ? matrix.multiplyRight(nodeMatrix) : matrix;
+  const transformationMatrix = getCompositeTransformationMatrix(node2, matrix);
   const mesh = node2.mesh;
   if (mesh) {
-    convertMesh(mesh, tileContent, attributesMap, useCartesianPositions, compositeMatrix);
+    convertMesh(mesh, tileContent, attributesMap, useCartesianPositions, transformationMatrix);
   }
-  convertNodes(node2.children, tileContent, attributesMap, useCartesianPositions, compositeMatrix);
+  convertNodes(node2.children, tileContent, attributesMap, useCartesianPositions, transformationMatrix);
 }
 function convertMesh(mesh, content, attributesMap, useCartesianPositions = false, matrix = new import_core21.Matrix4([1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1])) {
   for (const primitive of mesh.primitives) {
@@ -83652,12 +83714,12 @@ function convertMaterial(sourceMaterial) {
     emissiveFactor: sourceMaterial.emissiveFactor.map((c) => Math.round(c * 255)),
     alphaMode: (sourceMaterial.alphaMode || "OPAQUE").toLowerCase(),
     pbrMetallicRoughness: {
-      roughnessFactor: sourceMaterial.pbrMetallicRoughness.roughnessFactor,
-      metallicFactor: sourceMaterial.pbrMetallicRoughness.metallicFactor
+      roughnessFactor: sourceMaterial?.pbrMetallicRoughness?.roughnessFactor || DEFAULT_ROUGHNESS_FACTOR,
+      metallicFactor: sourceMaterial?.pbrMetallicRoughness?.metallicFactor || DEFAULT_METALLIC_FACTOR
     }
   };
   let texture;
-  if (sourceMaterial.pbrMetallicRoughness.baseColorTexture) {
+  if (sourceMaterial?.pbrMetallicRoughness?.baseColorTexture) {
     texture = sourceMaterial.pbrMetallicRoughness.baseColorTexture.texture.source;
     material.pbrMetallicRoughness.baseColorTexture = {
       textureSetDefinitionId: 0
@@ -83669,7 +83731,7 @@ function convertMaterial(sourceMaterial) {
     };
   }
   if (!texture) {
-    const baseColorFactor = sourceMaterial.pbrMetallicRoughness.baseColorFactor;
+    const baseColorFactor = sourceMaterial?.pbrMetallicRoughness?.baseColorFactor;
     material.pbrMetallicRoughness.baseColorFactor = baseColorFactor && baseColorFactor.map((c) => Math.round(c * 255)) || void 0;
   }
   return { material, texture };
@@ -83698,12 +83760,12 @@ function getSharedResources(tileContent, nodeId) {
   return i3sResources;
 }
 function convertGLTFMaterialToI3sSharedResources(gltfMaterial, nodeId) {
-  const texture = gltfMaterial.pbrMetallicRoughness.baseColorTexture || gltfMaterial.emissiveTexture;
+  const texture = gltfMaterial?.pbrMetallicRoughness?.baseColorTexture || gltfMaterial.emissiveTexture;
   let textureDefinitionInfo = null;
   if (texture) {
     textureDefinitionInfo = extractSharedResourcesTextureInfo(texture.texture, nodeId);
   }
-  const { baseColorFactor, metallicFactor } = gltfMaterial.pbrMetallicRoughness;
+  const { baseColorFactor, metallicFactor } = gltfMaterial?.pbrMetallicRoughness || {};
   let colorFactor = baseColorFactor;
   if ((!baseColorFactor || baseColorFactor[3] === 0) && gltfMaterial.emissiveFactor) {
     colorFactor = gltfMaterial.emissiveFactor;
@@ -83714,7 +83776,7 @@ function convertGLTFMaterialToI3sSharedResources(gltfMaterial, nodeId) {
     textureDefinitionInfo
   };
 }
-function extractSharedResourcesMaterialInfo(baseColorFactor, metallicFactor = 0) {
+function extractSharedResourcesMaterialInfo(baseColorFactor, metallicFactor = 1) {
   const matDielectricColorComponent = 0.04 / 255;
   const black = new import_core21.Vector4(0, 0, 0, 1);
   const unitVector = new import_core21.Vector4(1, 1, 1, 1);
@@ -84501,12 +84563,12 @@ function transfromTextureDefinitions(textureDefinitionInfos, thisObject, origina
 }
 
 // src/i3s-converter/helpers/node-debug.ts
-var import_culling5 = __toModule(require_es57());
+var import_culling6 = __toModule(require_es57());
 var import_engine = __toModule(require_es514());
 var import_core23 = __toModule(require_es54());
 var import_geospatial9 = __toModule(require_es55());
 function validateNodeBoundingVolumes(node2) {
-  if (!node2.parentNode.obb || !node2.parentNode.mbs) {
+  if (!node2?.parentNode?.obb || !node2?.parentNode?.mbs) {
     return [];
   }
   const tileWarnings = [];
@@ -84521,7 +84583,7 @@ function validateObb(tileWarnings, node2) {
   if (isTileObbInsideParentObb) {
     return;
   }
-  const title = `OBB of Tile (${node2.id}) doesn't fit into Parent (${node2.parentNode.id}) tile OBB`;
+  const title = `OBB of Tile (${node2.id}) doesn't fit into Parent (${node2.parentNode?.id}) tile OBB`;
   tileWarnings.push(title);
 }
 function validateMbs(tileWarnings, node2) {
@@ -84529,16 +84591,16 @@ function validateMbs(tileWarnings, node2) {
   const parentMbs = createBoundingSphereFromTileMbs(node2.parentNode.mbs);
   const distanceBetweenCenters = tileMbs.center.distanceTo(parentMbs.center);
   if (distanceBetweenCenters + tileMbs.radius > parentMbs.radius) {
-    const title = `MBS of Tile (${node2.id}) doesn't fit into Parent (${node2.parentNode.id}) tile MBS`;
+    const title = `MBS of Tile (${node2.id}) doesn't fit into Parent (${node2.parentNode?.id}) tile MBS`;
     tileWarnings.push(title);
   }
 }
 function createBoundingSphereFromTileMbs(mbs) {
-  return new import_culling5.BoundingSphere([mbs[0], mbs[1], mbs[2]], mbs[3]);
+  return new import_culling6.BoundingSphere([mbs[0], mbs[1], mbs[2]], mbs[3]);
 }
 function createBoundingBoxFromTileObb(obb) {
   const { center, halfSize, quaternion } = obb;
-  return new import_culling5.OrientedBoundingBox().fromCenterHalfSizeQuaternion(center, halfSize, quaternion);
+  return new import_culling6.OrientedBoundingBox().fromCenterHalfSizeQuaternion(center, halfSize, quaternion);
 }
 function getTileObbVertices(node2) {
   const geometry = new import_engine.CubeGeometry();
@@ -85042,12 +85104,13 @@ var I3SConverter = class {
     }
   }
   async writeTextureFile(textureData, name8, format, childPath, slpkChildPath) {
-    const texturePath = (0, import_path7.join)(childPath, `textures/${name8}/`);
-    await writeFile3(texturePath, textureData, `index.${format}`);
     if (this.options.slpk) {
       const slpkTexturePath = (0, import_path7.join)(childPath, "textures");
       const compress = false;
       this.fileMap[`${slpkChildPath}/textures/${name8}.${format}`] = await writeFileForSlpk(slpkTexturePath, textureData, `${name8}.${format}`, compress);
+    } else {
+      const texturePath = (0, import_path7.join)(childPath, `textures/${name8}/`);
+      await writeFile3(texturePath, textureData, `index.${format}`);
     }
   }
   async _writeAttributes(attributes, childPath, slpkChildPath) {
@@ -85765,7 +85828,7 @@ async function parse6(data, options, context) {
 }
 
 // ../i3s/src/lib/parsers/parse-i3s.ts
-var import_culling6 = __toModule(require_es57());
+var import_culling7 = __toModule(require_es57());
 var import_geospatial11 = __toModule(require_es55());
 
 // ../i3s/src/i3s-node-page-loader.ts
@@ -85991,7 +86054,7 @@ function normalizeTileNonUrlData(tile) {
       ...tile.obb.halfSize,
       ...tile.obb.quaternion
     ];
-    const obb = new import_culling6.OrientedBoundingBox().fromCenterHalfSizeQuaternion(boundingVolume.box.slice(0, 3), tile.obb.halfSize, tile.obb.quaternion);
+    const obb = new import_culling7.OrientedBoundingBox().fromCenterHalfSizeQuaternion(boundingVolume.box.slice(0, 3), tile.obb.halfSize, tile.obb.quaternion);
     const boundingSphere = obb.getBoundingSphere();
     boundingVolume.sphere = [...boundingSphere.center, boundingSphere.radius];
     mbs = [...tile.obb.center, boundingSphere.radius];
@@ -86011,7 +86074,13 @@ async function normalizeTilesetData(tileset, options, context) {
   } else {
     const rootNodeUrl = getUrlWithToken(`${tileset.url}/nodes/root`, options.i3s?.token);
     tileset.root = await load(rootNodeUrl, tileset.loader, {
-      i3s: { loadContent: false, isTileHeader: true, isTileset: false }
+      ...options,
+      i3s: {
+        ...options.i3s,
+        loadContent: false,
+        isTileHeader: true,
+        isTileset: false
+      }
     });
   }
   tileset.basePath = tileset.url;
@@ -86178,7 +86247,7 @@ async function parse8(data, options) {
 // src/3d-tiles-converter/helpers/i3s-obb-to-3d-tiles-obb.ts
 var import_core30 = __toModule(require_es54());
 var import_geospatial12 = __toModule(require_es55());
-var import_culling7 = __toModule(require_es57());
+var import_culling8 = __toModule(require_es57());
 function i3sObbTo3dTilesObb(i3SObb, geoidHeightModel) {
   const tiles3DCenter = [
     i3SObb.center[0],
@@ -86186,7 +86255,7 @@ function i3sObbTo3dTilesObb(i3SObb, geoidHeightModel) {
     i3SObb.center[2] + geoidHeightModel.getHeight(i3SObb.center[1], i3SObb.center[0])
   ];
   const cartesianCenter = import_geospatial12.Ellipsoid.WGS84.cartographicToCartesian(tiles3DCenter, new import_core30.Vector3());
-  const tiles3DObb = new import_culling7.OrientedBoundingBox().fromCenterHalfSizeQuaternion(cartesianCenter, i3SObb.halfSize, i3SObb.quaternion);
+  const tiles3DObb = new import_culling8.OrientedBoundingBox().fromCenterHalfSizeQuaternion(cartesianCenter, i3SObb.halfSize, i3SObb.quaternion);
   return [...tiles3DObb.center, ...tiles3DObb.halfAxes.toArray()];
 }
 

package/dist/es5/i3s-converter/helpers/create-scene-server-path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/i3s-converter/helpers/create-scene-server-path.ts"],"names":["createSceneServerPath","layerName","layers0","rootPath","sceneServerData","serviceItemId","replace","sceneServer","nodePagePath","JSON","stringify"],"mappings":";;;;;;;;;;;;;AAAA;;AACA;;AACA;;AAEA;;AACA;;SASsBA,qB;;;;;qFAAf,iBAAqCC,SAArC,EAAgDC,OAAhD,EAAyDC,QAAzD;AAAA;AAAA;AAAA;AAAA;AAAA;AACCC,YAAAA,eADD,GACmB;AACtBC,cAAAA,aAAa,EAAE,gBAASC,OAAT,CAAiB,KAAjB,EAAwB,EAAxB,CADO;AAEtBL,cAAAA,SAAS,EAATA,SAFsB;AAGtBC,cAAAA,OAAO,EAAPA;AAHsB,aADnB;AAOCK,YAAAA,WAPD,GAOe,+BAAUH,eAAV,EAA2B,gCAA3B,CAPf;AAQCI,YAAAA,YARD,GAQgB,gBAAKL,QAAL,EAAe,aAAf,CARhB;AAAA;AAAA,mBASC,0BAAUK,YAAV,EAAwBC,IAAI,CAACC,SAAL,CAAeH,WAAf,CAAxB,CATD;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import {v4 as uuidv4} from 'uuid';\nimport transform from 'json-map-transform';\nimport {join} from 'path';\n\nimport {SCENE_SERVER as sceneServerTemplate} from '../json-templates/scene-server';\nimport {writeFile} from '../../lib/utils/file-utils';\n\n/**\n * Form and save sceneServer meta data into a file\n * @param {string} layerName - layer name to display\n * @param {object} layers0 - layer object embedded into sceneServer meta data\n * @param {string} rootPath - root path of new converted tileset\n * @return {promise}\n */\nexport async function createSceneServerPath(layerName, layers0, rootPath) {\n  const sceneServerData = {\n    serviceItemId: uuidv4().replace(/-/gi, ''),\n    layerName,\n    layers0\n  };\n\n  const sceneServer = transform(sceneServerData, sceneServerTemplate());\n  const nodePagePath = join(rootPath, 'SceneServer');\n  await writeFile(nodePagePath, JSON.stringify(sceneServer));\n}\n"],"file":"create-scene-server-path.js"}
+{"version":3,"sources":["../../../../src/i3s-converter/helpers/create-scene-server-path.ts"],"names":["createSceneServerPath","layerName","layers0","rootPath","sceneServerData","serviceItemId","replace","sceneServer","nodePagePath","JSON","stringify"],"mappings":";;;;;;;;;;;;;AACA;;AACA;;AACA;;AAEA;;AACA;;SAQsBA,qB;;;;;qFAAf,iBACLC,SADK,EAELC,OAFK,EAGLC,QAHK;AAAA;AAAA;AAAA;AAAA;AAAA;AAKCC,YAAAA,eALD,GAKmB;AACtBC,cAAAA,aAAa,EAAE,gBAASC,OAAT,CAAiB,KAAjB,EAAwB,EAAxB,CADO;AAEtBL,cAAAA,SAAS,EAATA,SAFsB;AAGtBC,cAAAA,OAAO,EAAPA;AAHsB,aALnB;AAWCK,YAAAA,WAXD,GAWe,+BAAUH,eAAV,EAA2B,gCAA3B,CAXf;AAYCI,YAAAA,YAZD,GAYgB,gBAAKL,QAAL,EAAe,aAAf,CAZhB;AAAA;AAAA,mBAaC,0BAAUK,YAAV,EAAwBC,IAAI,CAACC,SAAL,CAAeH,WAAf,CAAxB,CAbD;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import type {SceneLayer3D} from '@loaders.gl/i3s';\nimport {v4 as uuidv4} from 'uuid';\nimport transform from 'json-map-transform';\nimport {join} from 'path';\n\nimport {SCENE_SERVER as sceneServerTemplate} from '../json-templates/scene-server';\nimport {writeFile} from '../../lib/utils/file-utils';\n\n/**\n * Form and save sceneServer meta data into a file\n * @param layerName - layer name to display\n * @param layers0 - layer object embedded into sceneServer meta data\n * @param rootPath - root path of new converted tileset\n */\nexport async function createSceneServerPath(\n  layerName: string,\n  layers0: SceneLayer3D,\n  rootPath: string\n): Promise<void> {\n  const sceneServerData = {\n    serviceItemId: uuidv4().replace(/-/gi, ''),\n    layerName,\n    layers0\n  };\n\n  const sceneServer = transform(sceneServerData, sceneServerTemplate());\n  const nodePagePath = join(rootPath, 'SceneServer');\n  await writeFile(nodePagePath, JSON.stringify(sceneServer));\n}\n"],"file":"create-scene-server-path.js"}

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

@@ -38,20 +38,11 @@ function generateAttributes(attributes) {
     };
   }
 
-  var _calculateFaceRangesA = calculateFaceRangesAndFeaturesCount(featureIndices),
-      faceRange = _calculateFaceRangesA.faceRange,
-      featureCount = _calculateFaceRangesA.featureCount,
-      featureIds = _calculateFaceRangesA.featureIds;
-
-  var attributeObjects = makeAttributeObjects(_objectSpread({
-    faceRange: faceRange,
-    featureIds: featureIds
-  }, attributes));
+  var data = calculateFaceRangesAndFeaturesCount(featureIndices);
+  var attributeObjects = makeAttributeObjects(_objectSpread(_objectSpread({}, data), attributes));
   var unifiedAttributeObjectsByFeatureIds = unifyObjectsByFeatureId(attributeObjects);
-  var groupedAttributes = groupAttributesAndRangesByFeatureId(unifiedAttributeObjectsByFeatureIds);
-  return _objectSpread({
-    featureCount: featureCount
-  }, groupedAttributes);
+  var groupedAttributes = groupAttributesAndRangesByFeatureId(unifiedAttributeObjectsByFeatureIds, data.featureCount);
+  return groupedAttributes;
 }
 
 function calculateFaceRangesAndFeaturesCount(featureIndices) {
@@ -97,7 +88,8 @@ function makeAttributeObjects(attributes) {
       normals = attributes.normals,
       colors = attributes.colors,
       texCoords = attributes.texCoords,
-      faceRange = attributes.faceRange;
+      _attributes$faceRange = attributes.faceRange,
+      faceRange = _attributes$faceRange === void 0 ? new Uint32Array(0) : _attributes$faceRange;
   var groupedData = [];
   var positionsList = new Float32Array(positions);
   var normalsList = new Float32Array(normals);
@@ -179,9 +171,9 @@ function unifyObjectsByFeatureId(sortedData) {
   return uniqueObjects;
 }
 
-function groupAttributesAndRangesByFeatureId(unifiedObjects) {
+function groupAttributesAndRangesByFeatureId(unifiedObjects, featureCount) {
   var firstAttributeObject = unifiedObjects[0];
-  var featureIds = [firstAttributeObject.featureId];
+  var featureIds = [firstAttributeObject.featureId || 0];
   var positions = new Float32Array(firstAttributeObject.positions);
   var normals = new Float32Array(firstAttributeObject.normals);
   var colors = new Uint8Array(firstAttributeObject.colors);
@@ -192,7 +184,7 @@ function groupAttributesAndRangesByFeatureId(unifiedObjects) {
 
   for (var index = 1; index < unifiedObjects.length; index++) {
     var currentAttributesObject = unifiedObjects[index];
-    featureIds.push(currentAttributesObject.featureId);
+    featureIds.push(currentAttributesObject.featureId || 0);
     positions = (0, _loaderUtils.concatenateTypedArrays)(positions, currentAttributesObject.positions);
     normals = (0, _loaderUtils.concatenateTypedArrays)(normals, currentAttributesObject.normals);
     colors = (0, _loaderUtils.concatenateTypedArrays)(colors, currentAttributesObject.colors);
@@ -212,7 +204,8 @@ function groupAttributesAndRangesByFeatureId(unifiedObjects) {
     positions: positions,
     normals: normals,
     colors: colors,
-    texCoords: texCoords
+    texCoords: texCoords,
+    featureCount: featureCount
   };
 }
 //# sourceMappingURL=geometry-attributes.js.map