@loaders.gl/tiles 3.3.0-alpha.1 → 3.3.0-alpha.11

package/dist/tileset/traversers/{i3s-frame-counter.d.ts → i3s-pending-tiles-register.d.ts}

@@ -6,19 +6,22 @@ export default class I3SPendingTilesRegister {
     private frameNumberMap;
     /**
      * Register a new pending tile header for the particular frameNumber
+     * @param viewportId
      * @param frameNumber
      */
-    register(frameNumber: number): void;
+    register(viewportId: string, frameNumber: number): void;
     /**
      * Deregister a pending tile header for the particular frameNumber
+     * @param viewportId
      * @param frameNumber
      */
-    deregister(frameNumber: number): void;
+    deregister(viewportId: string, frameNumber: number): void;
     /**
      * Check is there are no pending tile headers registered for the particular frameNumber
+     * @param viewportId
      * @param frameNumber
      * @returns
      */
-    isZero(frameNumber: number): boolean;
+    isZero(viewportId: string, frameNumber: number): boolean;
 }
-//# sourceMappingURL=i3s-frame-counter.d.ts.map
+//# sourceMappingURL=i3s-pending-tiles-register.d.ts.map

package/dist/tileset/traversers/i3s-pending-tiles-register.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i3s-pending-tiles-register.d.ts","sourceRoot":"","sources":["../../../src/tileset/traversers/i3s-pending-tiles-register.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,OAAO,CAAC,cAAc,CAA+C;IAErE;;;;OAIG;IACH,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IAOhD;;;;OAIG;IACH,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;IASlD;;;;;OAKG;IACH,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;CAI/C"}

package/dist/tileset/traversers/{i3s-frame-counter.js → i3s-pending-tiles-register.js}

@@ -10,27 +10,36 @@ class I3SPendingTilesRegister {
     }
     /**
      * Register a new pending tile header for the particular frameNumber
+     * @param viewportId
      * @param frameNumber
      */
-    register(frameNumber) {
-        const oldCount = this.frameNumberMap.get(frameNumber) || 0;
-        this.frameNumberMap.set(frameNumber, oldCount + 1);
+    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(frameNumber) {
-        const oldCount = this.frameNumberMap.get(frameNumber) || 1;
-        this.frameNumberMap.set(frameNumber, oldCount - 1);
+    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(frameNumber) {
-        const count = this.frameNumberMap.get(frameNumber) || 0;
+    isZero(viewportId, frameNumber) {
+        const count = this.frameNumberMap.get(viewportId)?.get(frameNumber) || 0;
         return count === 0;
     }
 }

package/dist/tileset/traversers/i3s-tile-manager.d.ts

@@ -3,14 +3,32 @@ export default class I3STileManager {
     private _statusMap;
     private pendingTilesRegister;
     constructor();
+    /**
+     * 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: any, key: any, callback: any, frameState: FrameState): void;
+    /**
+     * Update request if it is still actual for the new frameState
+     * @param key - unique key
+     * @param frameState - frameState data
+     */
     update(key: any, frameState: FrameState): void;
+    /**
+     * Find request in the map
+     * @param key - unique key
+     * @returns
+     */
     find(key: any): any;
     /**
      * Check it there are pending tile headers for the particular frameNumber
+     * @param viewportId
      * @param frameNumber
      * @returns
      */
-    hasPendingTiles(frameNumber: number): boolean;
+    hasPendingTiles(viewportId: string, frameNumber: number): boolean;
 }
 //# sourceMappingURL=i3s-tile-manager.d.ts.map

package/dist/tileset/traversers/i3s-tile-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-tile-manager.d.ts","sourceRoot":"","sources":["../../../src/tileset/traversers/i3s-tile-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAUlD,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,oBAAoB,CAAiC;;IAM7D,GAAG,CAAC,OAAO,KAAA,EAAE,GAAG,KAAA,EAAE,QAAQ,KAAA,EAAE,UAAU,EAAE,UAAU;IAwBlD,MAAM,CAAC,GAAG,KAAA,EAAE,UAAU,EAAE,UAAU;IAUlC,IAAI,CAAC,GAAG,KAAA;IAIR;;;;OAIG;IACH,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;CAG9C"}
+{"version":3,"file":"i3s-tile-manager.d.ts","sourceRoot":"","sources":["../../../src/tileset/traversers/i3s-tile-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAUlD,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,oBAAoB,CAAiC;;IAM7D;;;;;;OAMG;IACH,GAAG,CAAC,OAAO,KAAA,EAAE,GAAG,KAAA,EAAE,QAAQ,KAAA,EAAE,UAAU,EAAE,UAAU;IAiClD;;;;OAIG;IACH,MAAM,CAAC,GAAG,KAAA,EAAE,UAAU,EAAE,UAAU;IAmBlC;;;;OAIG;IACH,IAAI,CAAC,GAAG,KAAA;IAIR;;;;;OAKG;IACH,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;CAGlE"}

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const i3s_frame_counter_1 = __importDefault(require("./i3s-frame-counter"));
+const i3s_pending_tiles_register_1 = __importDefault(require("./i3s-pending-tiles-register"));
 const STATUS = {
     REQUESTED: 'REQUESTED',
     COMPLETED: 'COMPLETED',
@@ -12,51 +12,71 @@ const STATUS = {
 // A helper class to manage tile metadata fetching
 class I3STileManager {
     constructor() {
-        this.pendingTilesRegister = new i3s_frame_counter_1.default();
+        this.pendingTilesRegister = new i3s_pending_tiles_register_1.default();
         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 } = frameState;
+            const { frameNumber, viewport: { id } } = frameState;
             this._statusMap[key] = { request, callback, key, frameState, status: STATUS.REQUESTED };
             // Register pending request for the frameNumber
-            this.pendingTilesRegister.register(frameNumber);
+            this.pendingTilesRegister.register(id, frameNumber);
             request()
                 .then((data) => {
                 this._statusMap[key].status = STATUS.COMPLETED;
-                const { frameNumber: actualFrameNumber } = this._statusMap[key].frameState;
+                const { frameNumber: actualFrameNumber, viewport: { id } } = this._statusMap[key].frameState;
                 // Deregister pending request for the frameNumber
-                this.pendingTilesRegister.deregister(actualFrameNumber);
+                this.pendingTilesRegister.deregister(id, actualFrameNumber);
                 this._statusMap[key].callback(data, frameState);
             })
                 .catch((error) => {
                 this._statusMap[key].status = STATUS.ERROR;
-                const { frameNumber: actualFrameNumber } = this._statusMap[key].frameState;
+                const { frameNumber: actualFrameNumber, viewport: { id } } = this._statusMap[key].frameState;
                 // Deregister pending request for the frameNumber
-                this.pendingTilesRegister.deregister(actualFrameNumber);
+                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
-            this.pendingTilesRegister.deregister(this._statusMap[key].frameState.frameNumber);
+            const { frameNumber, viewport: { id } } = this._statusMap[key].frameState;
+            this.pendingTilesRegister.deregister(id, frameNumber);
             // Register pending request for the new frameNumber
-            this.pendingTilesRegister.register(frameState.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(frameNumber) {
-        return !this.pendingTilesRegister.isZero(frameNumber);
+    hasPendingTiles(viewportId, frameNumber) {
+        return !this.pendingTilesRegister.isZero(viewportId, frameNumber);
     }
 }
 exports.default = I3STileManager;

package/dist/tileset/traversers/i3s-tileset-traverser.d.ts

@@ -7,7 +7,7 @@ export default class I3STilesetTraverser extends TilesetTraverser {
      * that means the traversal is finished and we can call
      * following-up callbacks.
      */
-    protected get traversalFinished(): boolean;
+    protected traversalFinished(frameState: FrameState): boolean;
     constructor(options: any);
     shouldRefine(tile: any, frameState: FrameState): boolean;
     updateChildTiles(tile: any, frameState: FrameState): boolean;

package/dist/tileset/traversers/i3s-tileset-traverser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i3s-tileset-traverser.d.ts","sourceRoot":"","sources":["../../../src/tileset/traversers/i3s-tileset-traverser.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,qBAAqB,CAAC;AAKnD,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,gBAAgB;IAC/D,OAAO,CAAC,YAAY,CAAiB;IAErC;;;;OAIG;IACH,SAAS,KAAK,iBAAiB,IAAI,OAAO,CAEzC;gBAEW,OAAO,KAAA;IAKnB,YAAY,CAAC,IAAI,KAAA,EAAE,UAAU,EAAE,UAAU;IAKzC,gBAAgB,CAAC,IAAI,KAAA,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO;IAoCjD,SAAS,CAAC,MAAM,KAAA,EAAE,OAAO,KAAA;IAgB/B;;;;;;;OAOG;IACH,WAAW,CAAC,MAAM,KAAA,EAAE,IAAI,KAAA,EAAE,UAAU,KAAA;CAerC"}
+{"version":3,"file":"i3s-tileset-traverser.d.ts","sourceRoot":"","sources":["../../../src/tileset/traversers/i3s-tileset-traverser.ts"],"names":[],"mappings":"AACA,OAAO,gBAAgB,MAAM,qBAAqB,CAAC;AAKnD,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,gBAAgB;IAC/D,OAAO,CAAC,YAAY,CAAiB;IAErC;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;gBAIhD,OAAO,KAAA;IAKnB,YAAY,CAAC,IAAI,KAAA,EAAE,UAAU,EAAE,UAAU;IAKzC,gBAAgB,CAAC,IAAI,KAAA,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO;IAoCjD,SAAS,CAAC,MAAM,KAAA,EAAE,OAAO,KAAA;IAe/B;;;;;;;OAOG;IACH,WAAW,CAAC,MAAM,KAAA,EAAE,IAAI,KAAA,EAAE,UAAU,KAAA;CAgBrC"}

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

@@ -9,17 +9,17 @@ const i3s_lod_1 = require("../helpers/i3s-lod");
 const tile_3d_1 = __importDefault(require("../tile-3d"));
 const i3s_tile_manager_1 = __importDefault(require("./i3s-tile-manager"));
 class I3STilesetTraverser extends tileset_traverser_1.default {
-    constructor(options) {
-        super(options);
-        this._tileManager = new i3s_tile_manager_1.default();
-    }
     /**
      * Check if there are no penging tile header requests,
      * that means the traversal is finished and we can call
      * following-up callbacks.
      */
-    get traversalFinished() {
-        return !this._tileManager.hasPendingTiles(this._frameNumber || 0);
+    traversalFinished(frameState) {
+        return !this._tileManager.hasPendingTiles(frameState.viewport.id, this._frameNumber || 0);
+    }
+    constructor(options) {
+        super(options);
+        this._tileManager = new i3s_tile_manager_1.default();
     }
     shouldRefine(tile, frameState) {
         tile._lodJudge = (0, i3s_lod_1.getLodStatus)(tile, frameState);
@@ -64,8 +64,7 @@ class I3STilesetTraverser extends tileset_traverser_1.default {
             ...tileset.loadOptions,
             i3s: {
                 ...tileset.loadOptions.i3s,
-                isTileHeader: true,
-                loadContent: false
+                isTileHeader: true
             }
         };
         return await (0, core_1.load)(nodeUrl, loader, options);
@@ -86,7 +85,8 @@ class I3STilesetTraverser extends tileset_traverser_1.default {
         this.updateTile(childTile, frameState);
         // after tile fetched, resume traversal if still in current update/traversal frame
         if (this._frameNumber === frameState.frameNumber &&
-            (this.traversalFinished || new Date().getTime() - this.lastUpdate > this.updateDebounceTime)) {
+            (this.traversalFinished(frameState) ||
+                new Date().getTime() - this.lastUpdate > this.updateDebounceTime)) {
             this.executeTraversal(childTile, frameState);
         }
     }

package/dist/tileset/traversers/tileset-traverser.d.ts

@@ -1,6 +1,6 @@
 import ManagedArray from '../../utils/managed-array';
 import { FrameState } from '../helpers/frame-state';
-export declare type TilesetTraverserProps = {
+export type TilesetTraverserProps = {
     loadSiblings?: boolean;
     skipLevelOfDetail?: boolean;
     maximumScreenSpaceError?: number;
@@ -10,7 +10,7 @@ export declare type TilesetTraverserProps = {
     };
     basePath?: string;
 };
-export declare type Props = {
+export type Props = {
     loadSiblings: boolean;
     skipLevelOfDetail: boolean;
     updateTransforms: boolean;
@@ -33,7 +33,7 @@ export default class TilesetTraverser {
     protected _traversalStack: ManagedArray;
     protected _emptyTraversalStack: ManagedArray;
     protected _frameNumber: number | null;
-    protected get traversalFinished(): boolean;
+    protected traversalFinished(frameState: FrameState): boolean;
     constructor(options: TilesetTraverserProps);
     traverse(root: any, frameState: any, options: any): void;
     reset(): void;

package/dist/tileset/traversers/tileset-traverser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tileset-traverser.d.ts","sourceRoot":"","sources":["../../../src/tileset/traversers/tileset-traverser.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAElD,oBAAY,qBAAqB,GAAG;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,cAAc,CAAC,EAAE,CAAC,UAAU,KAAA,KAAK,GAAG,CAAC;IACrC,qBAAqB,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oBAAY,KAAK,GAAG;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,CAAC,UAAU,KAAA,KAAK,GAAG,CAAC;IACpC,qBAAqB,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,KAQ3B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,KAAK,CAAC;IAEf,IAAI,EAAE,GAAG,CAAC;IACV,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,CAAC,UAAU,EAAE,MAAM,CAAwB;IACpD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,QAAQ;IAC7C,SAAS,CAAC,eAAe,EAAE,YAAY,CAAC;IACxC,SAAS,CAAC,oBAAoB,EAAE,YAAY,CAAC;IAC7C,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtC,SAAS,KAAK,iBAAiB,IAAI,OAAO,CAEzC;gBAGW,OAAO,EAAE,qBAAqB;IAuB1C,QAAQ,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA;IAclC,KAAK;IAgBL,gBAAgB,CAAC,IAAI,KAAA,EAAE,UAAU,EAAE,UAAU;IAmE7C,gBAAgB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IASjC,qBAAqB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,KAAK,KAAA,EAAE,KAAK,KAAA;IAuDpD,UAAU,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAK3B,UAAU,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAS3B,QAAQ,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IASzB,SAAS,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAQ1B,WAAW,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,eAAe,UAAQ,EAAE,gBAAgB,UAAQ;IAmB/E,cAAc,CAAC,IAAI,KAAA;IAMnB,gBAAgB,CAAC,IAAI,KAAA;IAOrB,YAAY,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,eAAe,KAAA;IAS9C,oBAAoB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAiBrC,uBAAuB,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA;IAI5B,kBAAkB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAWnC,qBAAqB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;CAqCvC"}
+{"version":3,"file":"tileset-traverser.d.ts","sourceRoot":"","sources":["../../../src/tileset/traversers/tileset-traverser.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAElD,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,cAAc,CAAC,EAAE,CAAC,UAAU,KAAA,KAAK,GAAG,CAAC;IACrC,qBAAqB,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,CAAC,UAAU,KAAA,KAAK,GAAG,CAAC;IACpC,qBAAqB,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC5C,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,KAQ3B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,OAAO,EAAE,KAAK,CAAC;IAEf,IAAI,EAAE,GAAG,CAAC;IACV,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,CAAC,UAAU,EAAE,MAAM,CAAwB;IACpD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,QAAQ;IAC7C,SAAS,CAAC,eAAe,EAAE,YAAY,CAAC;IACxC,SAAS,CAAC,oBAAoB,EAAE,YAAY,CAAC;IAC7C,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtC,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;gBAKhD,OAAO,EAAE,qBAAqB;IAuB1C,QAAQ,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,OAAO,KAAA;IAclC,KAAK;IAgBL,gBAAgB,CAAC,IAAI,KAAA,EAAE,UAAU,EAAE,UAAU;IAmE7C,gBAAgB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IASjC,qBAAqB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,KAAK,KAAA,EAAE,KAAK,KAAA;IAuDpD,UAAU,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAK3B,UAAU,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAS3B,QAAQ,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IASzB,SAAS,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAQ1B,WAAW,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,eAAe,UAAQ,EAAE,gBAAgB,UAAQ;IAmB/E,cAAc,CAAC,IAAI,KAAA;IAMnB,gBAAgB,CAAC,IAAI,KAAA;IAOrB,YAAY,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA,EAAE,eAAe,KAAA;IAS9C,oBAAoB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAiBrC,uBAAuB,CAAC,CAAC,KAAA,EAAE,CAAC,KAAA;IAI5B,kBAAkB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;IAWnC,qBAAqB,CAAC,IAAI,KAAA,EAAE,UAAU,KAAA;CAqCvC"}

package/dist/tileset/traversers/tileset-traverser.js

@@ -16,6 +16,9 @@ exports.DEFAULT_PROPS = {
     basePath: ''
 };
 class TilesetTraverser {
+    traversalFinished(frameState) {
+        return true;
+    }
     // TODO nested props
     constructor(options) {
         this.lastUpdate = new Date().getTime();
@@ -37,9 +40,6 @@ class TilesetTraverser {
         // tiles does not have render content
         this.emptyTiles = {};
     }
-    get traversalFinished() {
-        return true;
-    }
     // tiles should be visible
     traverse(root, frameState, options) {
         this.root = root; // for root screen space error
@@ -116,7 +116,7 @@ class TilesetTraverser {
             tile._shouldRefine = shouldRefine && parentRefines;
         }
         const newTime = new Date().getTime();
-        if (this.traversalFinished || newTime - this.lastUpdate > this.updateDebounceTime) {
+        if (this.traversalFinished(frameState) || newTime - this.lastUpdate > this.updateDebounceTime) {
             this.lastUpdate = newTime;
             this.options.onTraversalEnd(frameState);
         }

package/dist/types.d.ts

@@ -1,5 +1,34 @@
-export declare type BoundingRectangle = {
+import { Vector3 } from '@math.gl/core';
+export type BoundingRectangle = {
     width: number;
     height: number;
 };
+/** Deck.gl Viewport instance type.
+ * We can't import it from Deck.gl to avoid circular reference */
+export type Viewport = {
+    id: string;
+    cameraPosition: number[] | Vector3;
+    height: number;
+    width: number;
+    zoom: number;
+    distanceScales: {
+        unitsPerMeter: number[];
+        metersPerUnit: number[];
+    };
+    center: number[] | Vector3;
+    unprojectPosition: (position: number[] | Vector3) => [number, number, number];
+    project: (coorinates: number[] | Vector3) => number[];
+};
+/**
+ * Contain extra fields from WebMercatorViewport and FirstPersonViewport
+ */
+export type GeospatialViewport = Viewport & {
+    /** @todo This field is not represented in Deck.gl viewports. Can be removed in the next version */
+    cameraDirection: [number, number, number];
+    /** @todo This field is not represented in Deck.gl viewports. Can be removed in the next version */
+    cameraUp: [number, number, number];
+    longitude: number;
+    latitude: number;
+    bearing: number;
+};
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,oBAAY,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAEtC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;iEACiE;AACjE,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE;QACd,aAAa,EAAE,MAAM,EAAE,CAAC;QACxB,aAAa,EAAE,MAAM,EAAE,CAAC;KACzB,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9E,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,KAAK,MAAM,EAAE,CAAC;CACvD,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,QAAQ,GAAG;IAC1C,mGAAmG;IACnG,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,mGAAmG;IACnG,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/tiles",
-  "version": "3.3.0-alpha.1",
+  "version": "3.3.0-alpha.11",
   "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": "3.3.0-alpha.1",
-    "@loaders.gl/math": "3.3.0-alpha.1",
+    "@loaders.gl/loader-utils": "3.3.0-alpha.11",
+    "@loaders.gl/math": "3.3.0-alpha.11",
     "@math.gl/core": "^3.5.1",
     "@math.gl/culling": "^3.5.1",
     "@math.gl/geospatial": "^3.5.1",
@@ -44,5 +44,5 @@
   "peerDependencies": {
     "@loaders.gl/core": "^3.2.0"
   },
-  "gitHead": "85ed2df7d17dd0d204c8bd8feb44779f70bc693b"
+  "gitHead": "1863a8875f63d578c0fdf5bdb3b7d6827f799db9"
 }

package/src/tileset/helpers/frame-state.ts

@@ -2,6 +2,7 @@ import {Tile3D} from '@loaders.gl/tiles';
 import {Vector3} from '@math.gl/core';
 import {CullingVolume, Plane} from '@math.gl/culling';
 import {Ellipsoid} from '@math.gl/geospatial';
+import {GeospatialViewport, Viewport} from '../../types';
 
 export type FrameState = {
   camera: {
@@ -9,8 +10,8 @@ export type FrameState = {
     direction: number[];
     up: number[];
   };
-  viewport: {[key: string]: any};
-  topDownViewport: {[key: string]: any}; // Use it to calculate projected radius for a tile
+  viewport: GeospatialViewport;
+  topDownViewport: GeospatialViewport; // Use it to calculate projected radius for a tile
   height: number;
   cullingVolume: CullingVolume;
   frameNumber: number; // TODO: This can be the same between updates, what number is unique for between updates?
@@ -30,18 +31,15 @@ const cullingVolume = new CullingVolume([
 
 // Extracts a frame state appropriate for tile culling from a deck.gl viewport
 // TODO - this could likely be generalized and merged back into deck.gl for other culling scenarios
-export function getFrameState(viewport, frameNumber: number): FrameState {
+export function getFrameState(viewport: GeospatialViewport, frameNumber: number): FrameState {
+  // Traverse and and request. Update _selectedTiles so that we know what to render.
   // Traverse and and request. Update _selectedTiles so that we know what to render.
   const {cameraDirection, cameraUp, height} = viewport;
   const {metersPerUnit} = viewport.distanceScales;
 
-  const viewportCenterCartographic = viewport.unprojectPosition(viewport.center);
   // TODO - Ellipsoid.eastNorthUpToFixedFrame() breaks on raw array, create a Vector.
   // TODO - Ellipsoid.eastNorthUpToFixedFrame() takes a cartesian, is that intuitive?
-  const viewportCenterCartesian = Ellipsoid.WGS84.cartographicToCartesian(
-    viewportCenterCartographic,
-    new Vector3()
-  );
+  const viewportCenterCartesian = worldToCartesian(viewport, viewport.center);
   const enuToFixedTransform = Ellipsoid.WGS84.eastNorthUpToFixedFrame(viewportCenterCartesian);
 
   const cameraPositionCartographic = viewport.unprojectPosition(viewport.cameraPosition);
@@ -60,7 +58,7 @@ export function getFrameState(viewport, frameNumber: number): FrameState {
     enuToFixedTransform.transformAsVector(new Vector3(cameraUp).scale(metersPerUnit))
   ).normalize();
 
-  commonSpacePlanesToWGS84(viewport, viewportCenterCartesian);
+  commonSpacePlanesToWGS84(viewport);
 
   const ViewportClass = viewport.constructor;
   const {longitude, latitude, width, bearing, zoom} = viewport;
@@ -131,25 +129,55 @@ export function limitSelectedTiles(
   return [selectedTiles, unselectedTiles];
 }
 
-function commonSpacePlanesToWGS84(viewport, viewportCenterCartesian) {
+function commonSpacePlanesToWGS84(viewport) {
   // Extract frustum planes based on current view.
   const frustumPlanes = viewport.getFrustumPlanes();
+
+  // Get the near/far plane centers
+  const nearCenterCommon = closestPointOnPlane(frustumPlanes.near, viewport.cameraPosition);
+  const nearCenterCartesian = worldToCartesian(viewport, nearCenterCommon);
+  const cameraCartesian = worldToCartesian(viewport, viewport.cameraPosition, scratchPosition);
+
   let i = 0;
+  cullingVolume.planes[i++].fromPointNormal(
+    nearCenterCartesian,
+    scratchVector.copy(nearCenterCartesian).subtract(cameraCartesian)
+  );
+
   for (const dir in frustumPlanes) {
+    if (dir === 'near') {
+      continue; // eslint-disable-line no-continue
+    }
     const plane = frustumPlanes[dir];
-    const distanceToCenter = plane.normal.dot(viewport.center);
-    scratchPosition
-      .copy(plane.normal)
-      .scale(plane.distance - distanceToCenter)
-      .add(viewport.center);
-    const cartographicPos = viewport.unprojectPosition(scratchPosition);
-
-    const cartesianPos = Ellipsoid.WGS84.cartographicToCartesian(cartographicPos, new Vector3());
+    const posCommon = closestPointOnPlane(plane, nearCenterCommon, scratchPosition);
+    const cartesianPos = worldToCartesian(viewport, posCommon, scratchPosition);
 
     cullingVolume.planes[i++].fromPointNormal(
       cartesianPos,
       // Want the normal to point into the frustum since that's what culling expects
-      scratchVector.copy(viewportCenterCartesian).subtract(cartesianPos)
+      scratchVector.copy(nearCenterCartesian).subtract(cartesianPos)
     );
   }
 }
+
+function closestPointOnPlane(
+  plane: {distance: number; normal: Vector3},
+  refPoint: [number, number, number] | Vector3,
+  out: Vector3 = new Vector3()
+): Vector3 {
+  const distanceToRef = plane.normal.dot(refPoint);
+  out
+    .copy(plane.normal)
+    .scale(plane.distance - distanceToRef)
+    .add(refPoint);
+  return out;
+}
+
+function worldToCartesian(
+  viewport: Viewport,
+  point: number[] | Vector3,
+  out: Vector3 = new Vector3()
+): Vector3 {
+  const cartographicPos = viewport.unprojectPosition(point);
+  return Ellipsoid.WGS84.cartographicToCartesian(cartographicPos, out);
+}

package/src/tileset/helpers/i3s-lod.ts

@@ -80,7 +80,9 @@ export function getProjectedRadius(tile: Tile3D, frameState: FrameState): number
 
   // Project center vertex and border vertex and calculate projected radius of MBS
   const projectedOrigin = viewport.project([mbsLon, mbsLat, mbsZ]);
-  const projectedMbsBorderVertex = viewport.project(sphereMbsBorderVertexCartographic);
+  const projectedMbsBorderVertex = viewport.project(
+    sphereMbsBorderVertexCartographic as [number, number, number]
+  );
   const projectedRadius = projectedOriginVector
     .copy(projectedOrigin)
     .subtract(projectedMbsBorderVertex)

package/src/tileset/tile-3d.ts

@@ -61,6 +61,7 @@ export default class TileHeader {
   viewportIds: any[];
   transform: Matrix4;
   extensions: any;
+  implicitTiling?: any;
 
   // Container to store application specific data
   userData: {[key: string]: any};
@@ -205,6 +206,7 @@ export default class TileHeader {
     // TODO Cesium 3d tiles specific
     this._expireDate = null;
     this._expiredContent = null;
+    this.implicitTiling = null;
 
     Object.seal(this);
   }
@@ -770,8 +772,20 @@ export default class TileHeader {
       case 'i3s':
         return {
           ...this.tileset.options.i3s,
-          tile: this.header,
-          tileset: this.tileset.tileset,
+          _tileOptions: {
+            attributeUrls: this.header.attributeUrls,
+            textureUrl: this.header.textureUrl,
+            textureFormat: this.header.textureFormat,
+            textureLoaderOptions: this.header.textureLoaderOptions,
+            materialDefinition: this.header.materialDefinition,
+            isDracoGeometry: this.header.isDracoGeometry,
+            mbs: this.header.mbs
+          },
+          _tilesetOptions: {
+            store: this.tileset.tileset.store,
+            attributeStorageInfo: this.tileset.tileset.attributeStorageInfo,
+            fields: this.tileset.tileset.fields
+          },
           isTileHeader: false
         };
       case '3d-tiles':