@loaders.gl/3d-tiles 4.0.0-alpha.13 → 4.0.0-alpha.15

package/src/lib/parsers/parse-3d-tile-header.ts

@@ -6,6 +6,7 @@ import {LOD_METRIC_TYPE, TILE_REFINEMENT, TILE_TYPE} from '@loaders.gl/tiles';
 import {
   ImplicitTilingExensionData,
   Subtree,
+  Tile3DBoundingVolume,
   Tiles3DTileContentJSON,
   Tiles3DTileJSON,
   Tiles3DTileJSONPostprocessed,
@@ -16,6 +17,34 @@ import {parseImplicitTiles, replaceContentUrlTemplate} from './helpers/parse-3d-
 import type {S2VolumeInfo} from '../utils/obb/s2-corners-to-obb';
 import {convertS2BoundingVolumetoOBB} from '../utils/obb/s2-corners-to-obb';
 
+/** Options for recursive loading implicit subtrees */
+export type ImplicitOptions = {
+  /** Template of the full url of the content template */
+  contentUrlTemplate: string;
+  /** Template of the full url of the subtree  */
+  subtreesUriTemplate: string;
+  /** Implicit subdivision scheme */
+  subdivisionScheme: 'QUADTREE' | 'OCTREE' | string;
+  /** Levels per subtree */
+  subtreeLevels: number;
+  /** Maximum implicit level through all subtrees */
+  maximumLevel?: number;
+  /** 3DTiles refine method (add/replace) */
+  refine?: string;
+  /** Tileset base path */
+  basePath: string;
+  /** 3DTiles LOD metric type */
+  lodMetricType: LOD_METRIC_TYPE.GEOMETRIC_ERROR;
+  /** Root metric value of the root tile of the implicit subtrees */
+  rootLodMetricValue: number;
+  /** Bounding volume of the root tile of the implicit subtrees */
+  rootBoundingVolume: Tile3DBoundingVolume;
+  /** Function that detects TILE_TYPE by tile metadata and content URL */
+  getTileType: (tile: Tiles3DTileJSON, tileContentUrl?: string) => TILE_TYPE | string;
+  /** Function that converts string refine method to enum value */
+  getRefine: (refine?: string) => TILE_REFINEMENT | string | undefined;
+};
+
 function getTileType(tile: Tiles3DTileJSON, tileContentUrl: string = ''): TILE_TYPE | string {
   if (!tileContentUrl) {
     return TILE_TYPE.EMPTY;
@@ -158,6 +187,7 @@ export async function normalizeImplicitTileHeaders(
   const {
     subdivisionScheme,
     maximumLevel,
+    availableLevels,
     subtreeLevels,
     subtrees: {uri: subtreesUriTemplate}
   } = implicitTilingExtension;
@@ -179,12 +209,12 @@ export async function normalizeImplicitTileHeaders(
 
   const rootBoundingVolume = tile.boundingVolume;
 
-  const implicitOptions = {
+  const implicitOptions: ImplicitOptions = {
     contentUrlTemplate,
     subtreesUriTemplate,
     subdivisionScheme,
     subtreeLevels,
-    maximumLevel,
+    maximumLevel: Number.isFinite(availableLevels) ? availableLevels - 1 : maximumLevel,
     refine,
     basePath,
     lodMetricType: LOD_METRIC_TYPE.GEOMETRIC_ERROR,
@@ -194,7 +224,7 @@ export async function normalizeImplicitTileHeaders(
     getRefine
   };
 
-  return await normalizeImplicitTileData(tile, basePath, subtree, implicitOptions);
+  return await normalizeImplicitTileData(tile, basePath, subtree, implicitOptions, options);
 }
 
 /**
@@ -208,7 +238,8 @@ export async function normalizeImplicitTileData(
   tile: Tiles3DTileJSON,
   basePath: string,
   rootSubtree: Subtree,
-  options: any
+  implicitOptions: ImplicitOptions,
+  loaderOptions: Tiles3DLoaderOptions
 ): Promise<Tiles3DTileJSONPostprocessed | null> {
   if (!tile) {
     return null;
@@ -216,7 +247,8 @@ export async function normalizeImplicitTileData(
 
   const {children, contentUrl} = await parseImplicitTiles({
     subtree: rootSubtree,
-    options
+    implicitOptions,
+    loaderOptions
   });
 
   let tileContentUrl: string | undefined;

package/src/types.ts

@@ -372,6 +372,10 @@ export type BufferView = {
  * Spec - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling
  */
 export type ImplicitTilingExensionData = ImplicitTilingData & {
+  /** This property is not part of the schema
+   * https://github.com/CesiumGS/3d-tiles/blob/main/extensions/3DTILES_implicit_tiling/schema/tile.3DTILES_implicit_tiling.schema.json
+   * But it can be seen in some test datasets. It is handled as substitute of `availableLevels`
+   */
   maximumLevel?: number;
 };