@loaders.gl/tiles 4.0.0-alpha.23 → 4.0.0-alpha.25

package/dist/dist.min.js

@@ -3659,16 +3659,45 @@
     }
   });
 
+  // ../loader-utils/src/lib/option-utils/merge-loader-options.ts
+  function mergeLoaderOptions(baseOptions, newOptions) {
+    return mergeOptionsRecursively(baseOptions || {}, newOptions);
+  }
+  function mergeOptionsRecursively(baseOptions, newOptions) {
+    const options = { ...baseOptions };
+    for (const [key, newValue] of Object.entries(newOptions)) {
+      if (newValue && typeof newValue === "object" && !Array.isArray(newValue)) {
+        options[key] = mergeOptionsRecursively(options[key] || {}, newOptions[key]);
+      } else {
+        options[key] = newOptions[key];
+      }
+    }
+    return options;
+  }
+  var init_merge_loader_options = __esm({
+    "../loader-utils/src/lib/option-utils/merge-loader-options.ts"() {
+    }
+  });
+
   // ../worker-utils/src/lib/env-utils/version.ts
-  var DEFAULT_VERSION, VERSION;
-  var init_version = __esm({
-    "../worker-utils/src/lib/env-utils/version.ts"() {
-      DEFAULT_VERSION = "beta";
-      VERSION = typeof __VERSION__ !== "undefined" ? __VERSION__ : DEFAULT_VERSION;
+  function getVersion() {
+    if (!globalThis._loadersgl_?.version) {
+      globalThis._loadersgl_ = globalThis._loadersgl_ || {};
       if (typeof __VERSION__ === "undefined") {
         console.error("loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.");
+        globalThis._loadersgl_.version = NPM_TAG;
+      } else {
+        globalThis._loadersgl_.version = __VERSION__;
       }
     }
+    return globalThis._loadersgl_.version;
+  }
+  var NPM_TAG, VERSION;
+  var init_version = __esm({
+    "../worker-utils/src/lib/env-utils/version.ts"() {
+      NPM_TAG = "beta";
+      VERSION = getVersion();
+    }
   });
 
   // ../worker-utils/src/lib/env-utils/assert.ts
@@ -4132,12 +4161,11 @@
     assert3(url);
     return url;
   }
-  var NPM_TAG;
   var init_get_worker_url = __esm({
     "../worker-utils/src/lib/worker-api/get-worker-url.ts"() {
       init_assert3();
       init_globals2();
-      NPM_TAG = "beta";
+      init_version();
     }
   });
 
@@ -4809,6 +4837,7 @@
     "../loader-utils/src/index.ts"() {
       init_assert2();
       init_globals();
+      init_merge_loader_options();
       init_parse_with_worker();
       init_array_buffer_utils();
       init_async_iteration();
@@ -7280,6 +7309,7 @@
   }
   async function parseWithLoader(loader, data, options, context) {
     validateWorkerVersion(loader);
+    options = mergeLoaderOptions(loader.options, options);
     if (isResponse(data)) {
       const response = data;
       const { ok, redirected, status, statusText, type, url } = response;
@@ -7310,6 +7340,7 @@
       init_normalize_loader();
       init_is_type();
       init_option_utils();
+      init_src2();
       init_get_data();
       init_loader_context();
       init_resource_utils();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tiles",
-  "version": "4.0.0-alpha.23",
+  "version": "4.0.0-alpha.25",
   "description": "Common components for different tiles loaders.",
   "license": "MIT",
   "publishConfig": {
@@ -33,8 +33,8 @@
     "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/dist.min.js"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.0.0-alpha.23",
-    "@loaders.gl/math": "4.0.0-alpha.23",
+    "@loaders.gl/loader-utils": "4.0.0-alpha.25",
+    "@loaders.gl/math": "4.0.0-alpha.25",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geospatial": "^3.5.1",
@@ -47,5 +47,5 @@
   "devDependencies": {
     "@deck.gl/core": "^8.9.0"
   },
-  "gitHead": "e212f2a0c0e342f7cb65ce84fa2ff39f64b7d94b"
+  "gitHead": "40135f391b869388dbbcd615bbe51178d0c370be"
 }

package/dist/bundle.js

@@ -1,5 +0,0 @@
-"use strict";
-// @ts-nocheck
-const moduleExports = require('./index');
-globalThis.loaders = globalThis.loaders || {};
-module.exports = Object.assign(globalThis.loaders, moduleExports);

package/dist/constants.js

@@ -1,39 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TILE3D_OPTIMIZATION_HINT = exports.LOD_METRIC_TYPE = exports.TILESET_TYPE = exports.TILE_TYPE = exports.TILE_REFINEMENT = exports.TILE_CONTENT_STATE = void 0;
-exports.TILE_CONTENT_STATE = {
-    UNLOADED: 0,
-    LOADING: 1,
-    PROCESSING: 2,
-    READY: 3,
-    EXPIRED: 4,
-    FAILED: 5 // Request failed.
-};
-var TILE_REFINEMENT;
-(function (TILE_REFINEMENT) {
-    TILE_REFINEMENT[TILE_REFINEMENT["ADD"] = 1] = "ADD";
-    TILE_REFINEMENT[TILE_REFINEMENT["REPLACE"] = 2] = "REPLACE"; // Render tile or, if screen space error exceeded, refine to its descendants instead.
-})(TILE_REFINEMENT || (exports.TILE_REFINEMENT = TILE_REFINEMENT = {}));
-var TILE_TYPE;
-(function (TILE_TYPE) {
-    TILE_TYPE["EMPTY"] = "empty";
-    TILE_TYPE["SCENEGRAPH"] = "scenegraph";
-    TILE_TYPE["POINTCLOUD"] = "pointcloud";
-    TILE_TYPE["MESH"] = "mesh";
-})(TILE_TYPE || (exports.TILE_TYPE = TILE_TYPE = {}));
-var TILESET_TYPE;
-(function (TILESET_TYPE) {
-    TILESET_TYPE["I3S"] = "I3S";
-    TILESET_TYPE["TILES3D"] = "TILES3D";
-})(TILESET_TYPE || (exports.TILESET_TYPE = TILESET_TYPE = {}));
-var LOD_METRIC_TYPE;
-(function (LOD_METRIC_TYPE) {
-    LOD_METRIC_TYPE["GEOMETRIC_ERROR"] = "geometricError";
-    LOD_METRIC_TYPE["MAX_SCREEN_THRESHOLD"] = "maxScreenThreshold";
-})(LOD_METRIC_TYPE || (exports.LOD_METRIC_TYPE = LOD_METRIC_TYPE = {}));
-exports.TILE3D_OPTIMIZATION_HINT = {
-    NOT_COMPUTED: -1,
-    USE_OPTIMIZATION: 1,
-    SKIP_OPTIMIZATION: 0
-};

package/dist/index.js

@@ -1,26 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LOD_METRIC_TYPE = exports.TILESET_TYPE = exports.TILE_TYPE = exports.TILE_REFINEMENT = exports.TILE_CONTENT_STATE = exports.getLodStatus = exports.getFrameState = exports.calculateTransformProps = exports.createBoundingVolume = exports.TilesetCache = exports.TilesetTraverser = exports.Tile3D = exports.Tileset3D = void 0;
-var tileset_3d_1 = require("./tileset/tileset-3d");
-Object.defineProperty(exports, "Tileset3D", { enumerable: true, get: function () { return tileset_3d_1.Tileset3D; } });
-var tile_3d_1 = require("./tileset/tile-3d");
-Object.defineProperty(exports, "Tile3D", { enumerable: true, get: function () { return tile_3d_1.Tile3D; } });
-var tileset_traverser_1 = require("./tileset/tileset-traverser");
-Object.defineProperty(exports, "TilesetTraverser", { enumerable: true, get: function () { return tileset_traverser_1.TilesetTraverser; } });
-var tileset_cache_1 = require("./tileset/tileset-cache");
-Object.defineProperty(exports, "TilesetCache", { enumerable: true, get: function () { return tileset_cache_1.TilesetCache; } });
-var bounding_volume_1 = require("./tileset/helpers/bounding-volume");
-Object.defineProperty(exports, "createBoundingVolume", { enumerable: true, get: function () { return bounding_volume_1.createBoundingVolume; } });
-var transform_utils_1 = require("./tileset/helpers/transform-utils");
-Object.defineProperty(exports, "calculateTransformProps", { enumerable: true, get: function () { return transform_utils_1.calculateTransformProps; } });
-var frame_state_1 = require("./tileset/helpers/frame-state");
-Object.defineProperty(exports, "getFrameState", { enumerable: true, get: function () { return frame_state_1.getFrameState; } });
-var i3s_lod_1 = require("./tileset/helpers/i3s-lod");
-Object.defineProperty(exports, "getLodStatus", { enumerable: true, get: function () { return i3s_lod_1.getLodStatus; } });
-var constants_1 = require("./constants");
-Object.defineProperty(exports, "TILE_CONTENT_STATE", { enumerable: true, get: function () { return constants_1.TILE_CONTENT_STATE; } });
-Object.defineProperty(exports, "TILE_REFINEMENT", { enumerable: true, get: function () { return constants_1.TILE_REFINEMENT; } });
-Object.defineProperty(exports, "TILE_TYPE", { enumerable: true, get: function () { return constants_1.TILE_TYPE; } });
-Object.defineProperty(exports, "TILESET_TYPE", { enumerable: true, get: function () { return constants_1.TILESET_TYPE; } });
-Object.defineProperty(exports, "LOD_METRIC_TYPE", { enumerable: true, get: function () { return constants_1.LOD_METRIC_TYPE; } });

package/dist/tileset/format-3d-tiles/tileset-3d-traverser.js

@@ -1,54 +0,0 @@
-"use strict";
-// loaders.gl, MIT license
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tileset3DTraverser = void 0;
-// This file is derived from the Cesium code base under Apache 2 license
-// See LICENSE.md and https://github.com/AnalyticalGraphicsInc/cesium/blob/master/LICENSE.md
-const constants_1 = require("../../constants");
-const tileset_traverser_1 = require("../tileset-traverser");
-class Tileset3DTraverser extends tileset_traverser_1.TilesetTraverser {
-    compareDistanceToCamera(a, b) {
-        // Sort by farthest child first since this is going on a stack
-        return b._distanceToCamera === 0 && a._distanceToCamera === 0
-            ? b._centerZDepth - a._centerZDepth
-            : b._distanceToCamera - a._distanceToCamera;
-    }
-    updateTileVisibility(tile, frameState) {
-        super.updateTileVisibility(tile, frameState);
-        //  Optimization - if none of the tile's children are visible then this tile isn't visible
-        if (!tile.isVisibleAndInRequestVolume) {
-            return;
-        }
-        const hasChildren = tile.children.length > 0;
-        if (tile.hasTilesetContent && hasChildren) {
-            // Use the root tile's visibility instead of this tile's visibility.
-            // The root tile may be culled by the children bounds optimization in which
-            // case this tile should also be culled.
-            const firstChild = tile.children[0];
-            this.updateTileVisibility(firstChild, frameState);
-            tile._visible = firstChild._visible;
-            return;
-        }
-        if (this.meetsScreenSpaceErrorEarly(tile, frameState)) {
-            tile._visible = false;
-            return;
-        }
-        const replace = tile.refine === constants_1.TILE_REFINEMENT.REPLACE;
-        const useOptimization = tile._optimChildrenWithinParent === constants_1.TILE3D_OPTIMIZATION_HINT.USE_OPTIMIZATION;
-        if (replace && useOptimization && hasChildren) {
-            if (!this.anyChildrenVisible(tile, frameState)) {
-                tile._visible = false;
-                return;
-            }
-        }
-    }
-    meetsScreenSpaceErrorEarly(tile, frameState) {
-        const { parent } = tile;
-        if (!parent || parent.hasTilesetContent || parent.refine !== constants_1.TILE_REFINEMENT.ADD) {
-            return false;
-        }
-        // Use parent's geometric error with child's box to see if the tile already meet the SSE
-        return !this.shouldRefine(tile, frameState, true);
-    }
-}
-exports.Tileset3DTraverser = Tileset3DTraverser;

package/dist/tileset/format-i3s/i3s-pending-tiles-register.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.I3SPendingTilesRegister = void 0;
-/**
- * Counter to register pending tile headers for the particular frameNumber
- * Until all tiles are loaded we won't call `onTraversalEnd` callback
- */
-class I3SPendingTilesRegister {
-    constructor() {
-        this.frameNumberMap = new Map();
-    }
-    /**
-     * Register a new pending tile header for the particular frameNumber
-     * @param viewportId
-     * @param frameNumber
-     */
-    register(viewportId, frameNumber) {
-        const viewportMap = this.frameNumberMap.get(viewportId) || new Map();
-        const oldCount = viewportMap.get(frameNumber) || 0;
-        viewportMap.set(frameNumber, oldCount + 1);
-        this.frameNumberMap.set(viewportId, viewportMap);
-    }
-    /**
-     * Deregister a pending tile header for the particular frameNumber
-     * @param viewportId
-     * @param frameNumber
-     */
-    deregister(viewportId, frameNumber) {
-        const viewportMap = this.frameNumberMap.get(viewportId);
-        if (!viewportMap) {
-            return;
-        }
-        const oldCount = viewportMap.get(frameNumber) || 1;
-        viewportMap.set(frameNumber, oldCount - 1);
-    }
-    /**
-     * Check is there are no pending tile headers registered for the particular frameNumber
-     * @param viewportId
-     * @param frameNumber
-     * @returns
-     */
-    isZero(viewportId, frameNumber) {
-        const count = this.frameNumberMap.get(viewportId)?.get(frameNumber) || 0;
-        return count === 0;
-    }
-}
-exports.I3SPendingTilesRegister = I3SPendingTilesRegister;

package/dist/tileset/format-i3s/i3s-tile-manager.js

@@ -1,80 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.I3STileManager = void 0;
-const i3s_pending_tiles_register_1 = require("./i3s-pending-tiles-register");
-const STATUS = {
-    REQUESTED: 'REQUESTED',
-    COMPLETED: 'COMPLETED',
-    ERROR: 'ERROR'
-};
-// A helper class to manage tile metadata fetching
-class I3STileManager {
-    constructor() {
-        this.pendingTilesRegister = new i3s_pending_tiles_register_1.I3SPendingTilesRegister();
-        this._statusMap = {};
-    }
-    /**
-     * Add request to map
-     * @param request - node metadata request
-     * @param key - unique key
-     * @param callback - callback after request completed
-     * @param frameState - frameState data
-     */
-    add(request, key, callback, frameState) {
-        if (!this._statusMap[key]) {
-            const { frameNumber, viewport: { id } } = frameState;
-            this._statusMap[key] = { request, callback, key, frameState, status: STATUS.REQUESTED };
-            // Register pending request for the frameNumber
-            this.pendingTilesRegister.register(id, frameNumber);
-            request()
-                .then((data) => {
-                this._statusMap[key].status = STATUS.COMPLETED;
-                const { frameNumber: actualFrameNumber, viewport: { id } } = this._statusMap[key].frameState;
-                // Deregister pending request for the frameNumber
-                this.pendingTilesRegister.deregister(id, actualFrameNumber);
-                this._statusMap[key].callback(data, frameState);
-            })
-                .catch((error) => {
-                this._statusMap[key].status = STATUS.ERROR;
-                const { frameNumber: actualFrameNumber, viewport: { id } } = this._statusMap[key].frameState;
-                // Deregister pending request for the frameNumber
-                this.pendingTilesRegister.deregister(id, actualFrameNumber);
-                callback(error);
-            });
-        }
-    }
-    /**
-     * Update request if it is still actual for the new frameState
-     * @param key - unique key
-     * @param frameState - frameState data
-     */
-    update(key, frameState) {
-        if (this._statusMap[key]) {
-            // Deregister pending request for the old frameNumber
-            const { frameNumber, viewport: { id } } = this._statusMap[key].frameState;
-            this.pendingTilesRegister.deregister(id, frameNumber);
-            // Register pending request for the new frameNumber
-            const { frameNumber: newFrameNumber, viewport: { id: newViewportId } } = frameState;
-            this.pendingTilesRegister.register(newViewportId, newFrameNumber);
-            this._statusMap[key].frameState = frameState;
-        }
-    }
-    /**
-     * Find request in the map
-     * @param key - unique key
-     * @returns
-     */
-    find(key) {
-        return this._statusMap[key];
-    }
-    /**
-     * Check it there are pending tile headers for the particular frameNumber
-     * @param viewportId
-     * @param frameNumber
-     * @returns
-     */
-    hasPendingTiles(viewportId, frameNumber) {
-        return !this.pendingTilesRegister.isZero(viewportId, frameNumber);
-    }
-}
-exports.I3STileManager = I3STileManager;

package/dist/tileset/format-i3s/i3s-tileset-traverser.js

@@ -1,92 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.I3STilesetTraverser = void 0;
-const core_1 = require("@loaders.gl/core");
-const tileset_traverser_1 = require("../tileset-traverser");
-const i3s_lod_1 = require("../helpers/i3s-lod");
-const tile_3d_1 = require("../tile-3d");
-const i3s_tile_manager_1 = require("./i3s-tile-manager");
-class I3STilesetTraverser extends tileset_traverser_1.TilesetTraverser {
-    constructor(options) {
-        super(options);
-        this._tileManager = new i3s_tile_manager_1.I3STileManager();
-    }
-    /**
-     * Check if there are no penging tile header requests,
-     * that means the traversal is finished and we can call
-     * following-up callbacks.
-     */
-    traversalFinished(frameState) {
-        return !this._tileManager.hasPendingTiles(frameState.viewport.id, this._frameNumber || 0);
-    }
-    shouldRefine(tile, frameState) {
-        tile._lodJudge = (0, i3s_lod_1.getLodStatus)(tile, frameState);
-        return tile._lodJudge === 'DIG';
-    }
-    updateChildTiles(tile, frameState) {
-        const children = tile.header.children || [];
-        // children which are already fetched and constructed as Tile3D instances
-        const childTiles = tile.children;
-        const tileset = tile.tileset;
-        for (const child of children) {
-            const extendedId = `${child.id}-${frameState.viewport.id}`;
-            // if child tile is not fetched
-            const childTile = childTiles && childTiles.find((t) => t.id === extendedId);
-            if (!childTile) {
-                let request = () => this._loadTile(child.id, tileset);
-                const cachedRequest = this._tileManager.find(extendedId);
-                if (!cachedRequest) {
-                    // eslint-disable-next-line max-depth
-                    if (tileset.tileset.nodePages) {
-                        request = () => tileset.tileset.nodePagesTile.formTileFromNodePages(child.id);
-                    }
-                    this._tileManager.add(request, extendedId, (header) => this._onTileLoad(header, tile, extendedId), frameState);
-                }
-                else {
-                    // update frameNumber since it is still needed in current frame
-                    this._tileManager.update(extendedId, frameState);
-                }
-            }
-            else if (childTile) {
-                // if child tile is fetched and available
-                this.updateTile(childTile, frameState);
-            }
-        }
-        return false;
-    }
-    async _loadTile(nodeId, tileset) {
-        const { loader } = tileset;
-        const nodeUrl = tileset.getTileUrl(`${tileset.url}/nodes/${nodeId}`);
-        // load metadata
-        const options = {
-            ...tileset.loadOptions,
-            i3s: {
-                ...tileset.loadOptions.i3s,
-                isTileHeader: true
-            }
-        };
-        return await (0, core_1.load)(nodeUrl, loader, options);
-    }
-    /**
-     * The callback to init Tile3D instance after loading the tile JSON
-     * @param {Object} header - the tile JSON from a dataset
-     * @param {Tile3D} tile - the parent Tile3D instance
-     * @param {string} extendedId - optional ID to separate copies of a tile for different viewports.
-     *                              const extendedId = `${tile.id}-${frameState.viewport.id}`;
-     * @return {void}
-     */
-    _onTileLoad(header, tile, extendedId) {
-        // after child tile is fetched
-        const childTile = new tile_3d_1.Tile3D(tile.tileset, header, tile, extendedId);
-        tile.children.push(childTile);
-        const frameState = this._tileManager.find(childTile.id).frameState;
-        this.updateTile(childTile, frameState);
-        // after tile fetched, resume traversal if still in current update/traversal frame
-        if (this._frameNumber === frameState.frameNumber &&
-            (this.traversalFinished(frameState) ||
-                new Date().getTime() - this.lastUpdate > this.updateDebounceTime)) {
-            this.executeTraversal(childTile, frameState);
-        }
-    }
-}
-exports.I3STilesetTraverser = I3STilesetTraverser;

package/dist/tileset/helpers/3d-tiles-options.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.get3dTilesOptions = void 0;
-function get3dTilesOptions(tileset) {
-    return {
-        assetGltfUpAxis: (tileset.asset && tileset.asset.gltfUpAxis) || 'Y'
-    };
-}
-exports.get3dTilesOptions = get3dTilesOptions;