@loaders.gl/3d-tiles 4.0.0-alpha.5 → 4.0.0-alpha.7

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

@@ -1,13 +1,15 @@
-import { Tileset3D } from '@loaders.gl/tiles';
-import { Subtree } from '../../types';
+import type { Tiles3DLoaderOptions } from '../../tiles-3d-loader';
+import type { LoaderOptions } from '@loaders.gl/loader-utils';
+import { Tileset3D, Tile3D } from '@loaders.gl/tiles';
+import { ImplicitTilingExtension, Subtree } from '../../types';
 export declare function normalizeTileData(tile: any, options: any): any;
-export declare function normalizeTileHeaders(tileset: any): any;
+export declare function normalizeTileHeaders(tileset: Tileset3D, options: LoaderOptions): Promise<Tileset3D>;
 /**
  * Do normalisation of implicit tile headers
  * TODO Check if Tile3D class can be a return type here.
  * @param tileset
  */
-export declare function normalizeImplicitTileHeaders(tileset: Tileset3D): Promise<any>;
+export declare function normalizeImplicitTileHeaders(tile: Tile3D, tileset: Tileset3D, implicitTilingExtension: ImplicitTilingExtension, options: Tiles3DLoaderOptions): Promise<any>;
 /**
  * Do implicit data normalisation to create hierarchical tile structure
  * @param tile

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

@@ -1 +1 @@
-{"version":3,"file":"parse-3d-tile-header.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-3d-tile-header.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAA8C,MAAM,mBAAmB,CAAC;AACzF,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AAoCpC,wBAAgB,iBAAiB,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,OAgB9C;AAGD,wBAAgB,oBAAoB,CAAC,OAAO,KAAA,OAiB3C;AAED;;;;GAIG;AACH,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,SAAS,gBAsCpE;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,KAAA,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,gBAsBvF"}
+{"version":3,"file":"parse-3d-tile-header.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-3d-tile-header.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,uBAAuB,CAAC;AAChE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAG5D,OAAO,EAAC,SAAS,EAA+C,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAC,uBAAuB,EAAE,OAAO,EAAC,MAAM,aAAa,CAAC;AAqD7D,wBAAgB,iBAAiB,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,OAgB9C;AAGD,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,SAAS,CAAC,CAwCpB;AAED;;;;GAIG;AACH,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,SAAS,EAClB,uBAAuB,EAAE,uBAAuB,EAChD,OAAO,EAAE,oBAAoB,gBA2C9B;AAED;;;;;;GAMG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,KAAA,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,gBA0BvF"}

package/dist/lib/parsers/parse-3d-tile-header.js

@@ -1,149 +1,177 @@
-import { Tile3DSubtreeLoader } from '../../tile-3d-subtree-loader';
-import { load } from '@loaders.gl/core';
-import { LOD_METRIC_TYPE, TILE_REFINEMENT, TILE_TYPE } from '@loaders.gl/tiles';
-import { parseImplicitTiles, replaceContentUrlTemplate } from './helpers/parse-3d-implicit-tiles';
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeImplicitTileData = exports.normalizeImplicitTileHeaders = exports.normalizeTileHeaders = exports.normalizeTileData = void 0;
+const tile_3d_subtree_loader_1 = require("../../tile-3d-subtree-loader");
+const core_1 = require("@loaders.gl/core");
+const tiles_1 = require("@loaders.gl/tiles");
+const parse_3d_implicit_tiles_1 = require("./helpers/parse-3d-implicit-tiles");
+const s2_corners_to_obb_1 = require("../utils/obb/s2-corners-to-obb");
 function getTileType(tile) {
-  if (!tile.contentUrl) {
-    return TILE_TYPE.EMPTY;
-  }
-
-  const contentUrl = tile.contentUrl;
-  const fileExtension = contentUrl.split('.').pop();
-
-  switch (fileExtension) {
-    case 'pnts':
-      return TILE_TYPE.POINTCLOUD;
-
-    case 'i3dm':
-    case 'b3dm':
-    case 'glb':
-    case 'gltf':
-      return TILE_TYPE.SCENEGRAPH;
-
-    default:
-      return fileExtension;
-  }
+    if (!tile.contentUrl) {
+        return tiles_1.TILE_TYPE.EMPTY;
+    }
+    const contentUrl = tile.contentUrl.split('?')[0]; // Discard query string
+    const fileExtension = contentUrl.split('.').pop();
+    switch (fileExtension) {
+        case 'pnts':
+            return tiles_1.TILE_TYPE.POINTCLOUD;
+        case 'i3dm':
+        case 'b3dm':
+        case 'glb':
+        case 'gltf':
+            return tiles_1.TILE_TYPE.SCENEGRAPH;
+        default:
+            return fileExtension;
+    }
 }
-
 function getRefine(refine) {
-  switch (refine) {
-    case 'REPLACE':
-    case 'replace':
-      return TILE_REFINEMENT.REPLACE;
-
-    case 'ADD':
-    case 'add':
-      return TILE_REFINEMENT.ADD;
-
-    default:
-      return refine;
-  }
+    switch (refine) {
+        case 'REPLACE':
+        case 'replace':
+            return tiles_1.TILE_REFINEMENT.REPLACE;
+        case 'ADD':
+        case 'add':
+            return tiles_1.TILE_REFINEMENT.ADD;
+        default:
+            return refine;
+    }
 }
-
-export function normalizeTileData(tile, options) {
-  if (!tile) {
-    return null;
-  }
-
-  if (tile.content) {
-    const contentUri = tile.content.uri || tile.content.url;
-    tile.contentUrl = "".concat(options.basePath, "/").concat(contentUri);
-  }
-
-  tile.id = tile.contentUrl;
-  tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;
-  tile.lodMetricValue = tile.geometricError;
-  tile.transformMatrix = tile.transform;
-  tile.type = getTileType(tile);
-  tile.refine = getRefine(tile.refine);
-  return tile;
+function resolveUri(uri, basePath) {
+    // url scheme per RFC3986
+    const urlSchemeRegex = /^[a-z][0-9a-z+.-]*:/i;
+    if (urlSchemeRegex.test(basePath)) {
+        const url = new URL(uri, `${basePath}/`);
+        return decodeURI(url.toString());
+    }
+    else if (uri.startsWith('/')) {
+        return uri;
+    }
+    return `${basePath}/${uri}`;
 }
-export function normalizeTileHeaders(tileset) {
-  const basePath = tileset.basePath;
-  const root = normalizeTileData(tileset.root, tileset);
-  const stack = [];
-  stack.push(root);
-
-  while (stack.length > 0) {
-    const tile = stack.pop() || {};
-    const children = tile.children || [];
-
-    for (const childHeader of children) {
-      normalizeTileData(childHeader, {
-        basePath
-      });
-      stack.push(childHeader);
+function normalizeTileData(tile, options) {
+    if (!tile) {
+        return null;
+    }
+    if (tile.content) {
+        const contentUri = tile.content.uri || tile.content.url;
+        tile.contentUrl = resolveUri(contentUri, options.basePath);
     }
-  }
-
-  return root;
+    tile.id = tile.contentUrl;
+    tile.lodMetricType = tiles_1.LOD_METRIC_TYPE.GEOMETRIC_ERROR;
+    tile.lodMetricValue = tile.geometricError;
+    tile.transformMatrix = tile.transform;
+    tile.type = getTileType(tile);
+    tile.refine = getRefine(tile.refine);
+    return tile;
 }
-export async function normalizeImplicitTileHeaders(tileset) {
-  if (!tileset.root) {
-    return null;
-  }
-
-  const basePath = tileset.basePath;
-  const implicitTilingExtension = tileset.root.extensions['3DTILES_implicit_tiling'];
-  const {
-    subdivisionScheme,
-    maximumLevel,
-    subtreeLevels,
-    subtrees: {
-      uri: subtreesUriTemplate
+exports.normalizeTileData = normalizeTileData;
+// normalize tile headers
+async function normalizeTileHeaders(tileset, options) {
+    const basePath = tileset.basePath;
+    let root;
+    const rootImplicitTilingExtension = getImplicitTilingExtensionData(tileset?.root);
+    if (rootImplicitTilingExtension && tileset.root) {
+        root = await normalizeImplicitTileHeaders(tileset.root, tileset, rootImplicitTilingExtension, options);
+    }
+    else {
+        root = normalizeTileData(tileset.root, tileset);
     }
-  } = implicitTilingExtension;
-  const subtreeUrl = replaceContentUrlTemplate(subtreesUriTemplate, 0, 0, 0, 0);
-  const rootSubtreeUrl = "".concat(basePath, "/").concat(subtreeUrl);
-  const rootSubtree = await load(rootSubtreeUrl, Tile3DSubtreeLoader);
-  const contentUrlTemplate = "".concat(basePath, "/").concat(tileset.root.content.uri);
-  const refine = tileset.root.refine;
-  const rootLodMetricValue = tileset.root.geometricError;
-  const rootBoundingVolume = tileset.root.boundingVolume;
-  const options = {
-    contentUrlTemplate,
-    subtreesUriTemplate,
-    subdivisionScheme,
-    subtreeLevels,
-    maximumLevel,
-    refine,
-    basePath,
-    lodMetricType: LOD_METRIC_TYPE.GEOMETRIC_ERROR,
-    rootLodMetricValue,
-    rootBoundingVolume,
-    getTileType,
-    getRefine
-  };
-  return await normalizeImplicitTileData(tileset.root, rootSubtree, options);
+    const stack = [];
+    stack.push(root);
+    while (stack.length > 0) {
+        const tile = stack.pop() || {};
+        const children = tile.children || [];
+        for (let childHeader of children) {
+            const childImplicitTilingExtension = getImplicitTilingExtensionData(childHeader);
+            if (childImplicitTilingExtension) {
+                childHeader = await normalizeImplicitTileHeaders(childHeader, tileset, childImplicitTilingExtension, options);
+            }
+            else {
+                normalizeTileData(childHeader, { basePath });
+            }
+            stack.push(childHeader);
+        }
+    }
+    return root;
 }
-export async function normalizeImplicitTileData(tile, rootSubtree, options) {
-  if (!tile) {
-    return null;
-  }
-
-  tile.lodMetricType = LOD_METRIC_TYPE.GEOMETRIC_ERROR;
-  tile.lodMetricValue = tile.geometricError;
-  tile.transformMatrix = tile.transform;
-  const {
-    children,
-    contentUrl
-  } = await parseImplicitTiles({
-    subtree: rootSubtree,
-    options
-  });
-
-  if (contentUrl) {
-    tile.contentUrl = contentUrl;
-    tile.content = {
-      uri: contentUrl.replace("".concat(options.basePath, "/"), '')
+exports.normalizeTileHeaders = normalizeTileHeaders;
+/**
+ * Do normalisation of implicit tile headers
+ * TODO Check if Tile3D class can be a return type here.
+ * @param tileset
+ */
+async function normalizeImplicitTileHeaders(tile, tileset, implicitTilingExtension, options) {
+    const basePath = tileset.basePath;
+    const { subdivisionScheme, maximumLevel, subtreeLevels, subtrees: { uri: subtreesUriTemplate } } = implicitTilingExtension;
+    const replacedUrlTemplate = (0, parse_3d_implicit_tiles_1.replaceContentUrlTemplate)(subtreesUriTemplate, 0, 0, 0, 0);
+    const subtreeUrl = resolveUri(replacedUrlTemplate, basePath);
+    const subtree = await (0, core_1.load)(subtreeUrl, tile_3d_subtree_loader_1.Tile3DSubtreeLoader, options);
+    const contentUrlTemplate = resolveUri(tile.content.uri, basePath);
+    const refine = tileset?.root?.refine;
+    // @ts-ignore
+    const rootLodMetricValue = tile.geometricError;
+    // Replace tile.boundingVolume with the the bounding volume specified by the extensions['3DTILES_bounding_volume_S2']
+    const s2VolumeInfo = tile.boundingVolume.extensions?.['3DTILES_bounding_volume_S2'];
+    if (s2VolumeInfo) {
+        const box = (0, s2_corners_to_obb_1.convertS2BoundingVolumetoOBB)(s2VolumeInfo);
+        const s2VolumeBox = { box, s2VolumeInfo };
+        tile.boundingVolume = s2VolumeBox;
+    }
+    const rootBoundingVolume = tile.boundingVolume;
+    const implicitOptions = {
+        contentUrlTemplate,
+        subtreesUriTemplate,
+        subdivisionScheme,
+        subtreeLevels,
+        maximumLevel,
+        refine,
+        basePath,
+        lodMetricType: tiles_1.LOD_METRIC_TYPE.GEOMETRIC_ERROR,
+        rootLodMetricValue,
+        rootBoundingVolume,
+        getTileType,
+        getRefine
     };
-  }
-
-  tile.refine = getRefine(tile.refine);
-  tile.type = getTileType(tile);
-  tile.children = children;
-  tile.id = tile.contentUrl;
-  return tile;
+    return await normalizeImplicitTileData(tile, subtree, implicitOptions);
+}
+exports.normalizeImplicitTileHeaders = normalizeImplicitTileHeaders;
+/**
+ * Do implicit data normalisation to create hierarchical tile structure
+ * @param tile
+ * @param rootSubtree
+ * @param options
+ * @returns
+ */
+async function normalizeImplicitTileData(tile, rootSubtree, options) {
+    if (!tile) {
+        return null;
+    }
+    tile.lodMetricType = tiles_1.LOD_METRIC_TYPE.GEOMETRIC_ERROR;
+    tile.lodMetricValue = tile.geometricError;
+    tile.transformMatrix = tile.transform;
+    const { children, contentUrl } = await (0, parse_3d_implicit_tiles_1.parseImplicitTiles)({
+        subtree: rootSubtree,
+        options,
+        s2VolumeBox: tile
+    });
+    if (contentUrl) {
+        tile.contentUrl = contentUrl;
+        tile.content = { uri: contentUrl.replace(`${options.basePath}/`, '') };
+    }
+    tile.refine = getRefine(tile.refine);
+    tile.type = getTileType(tile);
+    tile.children = children;
+    tile.id = tile.contentUrl;
+    return tile;
+}
+exports.normalizeImplicitTileData = normalizeImplicitTileData;
+/**
+ * Implicit Tiling data can be in 3DTILES_implicit_tiling for 3DTiles v.Next or directly in implicitTiling object for 3DTiles v1.1.
+ * Spec 3DTiles v.Next - https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_implicit_tiling
+ * Spec 3DTiles v.1.1 - https://github.com/CesiumGS/3d-tiles/tree/draft-1.1/specification/ImplicitTiling
+ * @param tile
+ * @returns
+ */
+function getImplicitTilingExtensionData(tile) {
+    return tile?.extensions?.['3DTILES_implicit_tiling'] || tile?.implicitTiling;
 }
-//# sourceMappingURL=parse-3d-tile-header.js.map

package/dist/lib/parsers/parse-3d-tile-instanced-model.d.ts

@@ -1,2 +1,4 @@
-export declare function parseInstancedModel3DTile(tile: any, arrayBuffer: any, byteOffset: any, options: any, context: any): Promise<any>;
+import { Tiles3DLoaderOptions } from '../../tiles-3d-loader';
+import { LoaderContext } from '@loaders.gl/loader-utils';
+export declare function parseInstancedModel3DTile(tile: any, arrayBuffer: ArrayBuffer, byteOffset: number, options: Tiles3DLoaderOptions, context: LoaderContext): Promise<number>;
 //# sourceMappingURL=parse-3d-tile-instanced-model.d.ts.map

package/dist/lib/parsers/parse-3d-tile-instanced-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-3d-tile-instanced-model.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-3d-tile-instanced-model.ts"],"names":[],"mappings":"AAaA,wBAAsB,yBAAyB,CAAC,IAAI,KAAA,EAAE,WAAW,KAAA,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA,EAAE,OAAO,KAAA,gBAI9F"}
+{"version":3,"file":"parse-3d-tile-instanced-model.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/parse-3d-tile-instanced-model.ts"],"names":[],"mappings":"AAYA,OAAO,EAAC,oBAAoB,EAAC,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAEvD,wBAAsB,yBAAyB,CAC7C,IAAI,KAAA,EACJ,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,CAIjB"}