@loaders.gl/tiles 3.2.3 → 3.2.6

package/src/tileset/traversers/i3s-tile-manager.ts

@@ -1,5 +1,5 @@
 import {FrameState} from '../helpers/frame-state';
-import I3SPendingTilesRegister from './i3s-frame-counter';
+import I3SPendingTilesRegister from './i3s-pending-tiles-register';
 
 const STATUS = {
   REQUESTED: 'REQUESTED',
@@ -16,50 +16,86 @@ export default class I3STileManager {
     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: 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: 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: number): boolean {
-    return !this.pendingTilesRegister.isZero(frameNumber);
+  hasPendingTiles(viewportId: string, frameNumber: number): boolean {
+    return !this.pendingTilesRegister.isZero(viewportId, frameNumber);
   }
 }

package/src/tileset/traversers/i3s-tileset-traverser.ts

@@ -14,8 +14,8 @@ export default class I3STilesetTraverser extends TilesetTraverser {
    * that means the traversal is finished and we can call
    * following-up callbacks.
    */
-  protected get traversalFinished(): boolean {
-    return !this._tileManager.hasPendingTiles(this._frameNumber || 0);
+  protected traversalFinished(frameState: FrameState): boolean {
+    return !this._tileManager.hasPendingTiles(frameState.viewport.id, this._frameNumber || 0);
   }
 
   constructor(options) {
@@ -98,7 +98,8 @@ export default class I3STilesetTraverser extends TilesetTraverser {
     // 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/src/tileset/traversers/tileset-traverser.ts

@@ -45,7 +45,7 @@ export default class TilesetTraverser {
   protected _emptyTraversalStack: ManagedArray;
   protected _frameNumber: number | null;
 
-  protected get traversalFinished(): boolean {
+  protected traversalFinished(frameState: FrameState): boolean {
     return true;
   }
 
@@ -164,7 +164,7 @@ export default class TilesetTraverser {
     }
 
     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/src/types.ts

@@ -1,4 +1,27 @@
+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;
+  longitude: number;
+  latitude: number;
+  cameraPosition: [number, number, number];
+  cameraDirection: [number, number, number];
+  cameraUp: [number, number, number];
+  height: number;
+  width: number;
+  bearing: number;
+  zoom: number;
+  distanceScales: {
+    metersPerUnit: number;
+  };
+  center: [number, number, number];
+  unprojectPosition: (position: [number, number, number] | Vector3) => Vector3;
+  project: (coorinates: [number, number, number] | Vector3) => Vector3;
+};

package/dist/es5/tileset/traversers/i3s-frame-counter.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/tileset/traversers/i3s-frame-counter.ts"],"names":["I3SPendingTilesRegister","Map","frameNumber","oldCount","frameNumberMap","get","set","count"],"mappings":";;;;;;;;;;;;;;;IAIqBA,uB;;;0DAC2B,IAAIC,GAAJ,E;;;;;WAM9C,kBAASC,WAAT,EAA8B;AAC5B,UAAMC,QAAQ,GAAG,KAAKC,cAAL,CAAoBC,GAApB,CAAwBH,WAAxB,KAAwC,CAAzD;AACA,WAAKE,cAAL,CAAoBE,GAApB,CAAwBJ,WAAxB,EAAqCC,QAAQ,GAAG,CAAhD;AACD;;;WAMD,oBAAWD,WAAX,EAAgC;AAC9B,UAAMC,QAAQ,GAAG,KAAKC,cAAL,CAAoBC,GAApB,CAAwBH,WAAxB,KAAwC,CAAzD;AACA,WAAKE,cAAL,CAAoBE,GAApB,CAAwBJ,WAAxB,EAAqCC,QAAQ,GAAG,CAAhD;AACD;;;WAOD,gBAAOD,WAAP,EAA4B;AAC1B,UAAMK,KAAK,GAAG,KAAKH,cAAL,CAAoBC,GAApB,CAAwBH,WAAxB,KAAwC,CAAtD;AACA,aAAOK,KAAK,KAAK,CAAjB;AACD","sourcesContent":["/**\n * Counter to register pending tile headers for the particular frameNumber\n * Until all tiles are loaded we won't call `onTraversalEnd` callback\n */\nexport default class I3SPendingTilesRegister {\n  private frameNumberMap: Map<number, number> = new Map();\n\n  /**\n   * Register a new pending tile header for the particular frameNumber\n   * @param frameNumber\n   */\n  register(frameNumber: number) {\n    const oldCount = this.frameNumberMap.get(frameNumber) || 0;\n    this.frameNumberMap.set(frameNumber, oldCount + 1);\n  }\n\n  /**\n   * Deregister a pending tile header for the particular frameNumber\n   * @param frameNumber\n   */\n  deregister(frameNumber: number) {\n    const oldCount = this.frameNumberMap.get(frameNumber) || 1;\n    this.frameNumberMap.set(frameNumber, oldCount - 1);\n  }\n\n  /**\n   * Check is there are no pending tile headers registered for the particular frameNumber\n   * @param frameNumber\n   * @returns\n   */\n  isZero(frameNumber: number) {\n    const count = this.frameNumberMap.get(frameNumber) || 0;\n    return count === 0;\n  }\n}\n"],"file":"i3s-frame-counter.js"}

package/dist/esm/tileset/traversers/i3s-frame-counter.js

@@ -1,23 +0,0 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-export default class I3SPendingTilesRegister {
-  constructor() {
-    _defineProperty(this, "frameNumberMap", new Map());
-  }
-
-  register(frameNumber) {
-    const oldCount = this.frameNumberMap.get(frameNumber) || 0;
-    this.frameNumberMap.set(frameNumber, oldCount + 1);
-  }
-
-  deregister(frameNumber) {
-    const oldCount = this.frameNumberMap.get(frameNumber) || 1;
-    this.frameNumberMap.set(frameNumber, oldCount - 1);
-  }
-
-  isZero(frameNumber) {
-    const count = this.frameNumberMap.get(frameNumber) || 0;
-    return count === 0;
-  }
-
-}
-//# sourceMappingURL=i3s-frame-counter.js.map

package/dist/esm/tileset/traversers/i3s-frame-counter.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/tileset/traversers/i3s-frame-counter.ts"],"names":["I3SPendingTilesRegister","Map","register","frameNumber","oldCount","frameNumberMap","get","set","deregister","isZero","count"],"mappings":";AAIA,eAAe,MAAMA,uBAAN,CAA8B;AAAA;AAAA,4CACG,IAAIC,GAAJ,EADH;AAAA;;AAO3CC,EAAAA,QAAQ,CAACC,WAAD,EAAsB;AAC5B,UAAMC,QAAQ,GAAG,KAAKC,cAAL,CAAoBC,GAApB,CAAwBH,WAAxB,KAAwC,CAAzD;AACA,SAAKE,cAAL,CAAoBE,GAApB,CAAwBJ,WAAxB,EAAqCC,QAAQ,GAAG,CAAhD;AACD;;AAMDI,EAAAA,UAAU,CAACL,WAAD,EAAsB;AAC9B,UAAMC,QAAQ,GAAG,KAAKC,cAAL,CAAoBC,GAApB,CAAwBH,WAAxB,KAAwC,CAAzD;AACA,SAAKE,cAAL,CAAoBE,GAApB,CAAwBJ,WAAxB,EAAqCC,QAAQ,GAAG,CAAhD;AACD;;AAODK,EAAAA,MAAM,CAACN,WAAD,EAAsB;AAC1B,UAAMO,KAAK,GAAG,KAAKL,cAAL,CAAoBC,GAApB,CAAwBH,WAAxB,KAAwC,CAAtD;AACA,WAAOO,KAAK,KAAK,CAAjB;AACD;;AA7B0C","sourcesContent":["/**\n * Counter to register pending tile headers for the particular frameNumber\n * Until all tiles are loaded we won't call `onTraversalEnd` callback\n */\nexport default class I3SPendingTilesRegister {\n  private frameNumberMap: Map<number, number> = new Map();\n\n  /**\n   * Register a new pending tile header for the particular frameNumber\n   * @param frameNumber\n   */\n  register(frameNumber: number) {\n    const oldCount = this.frameNumberMap.get(frameNumber) || 0;\n    this.frameNumberMap.set(frameNumber, oldCount + 1);\n  }\n\n  /**\n   * Deregister a pending tile header for the particular frameNumber\n   * @param frameNumber\n   */\n  deregister(frameNumber: number) {\n    const oldCount = this.frameNumberMap.get(frameNumber) || 1;\n    this.frameNumberMap.set(frameNumber, oldCount - 1);\n  }\n\n  /**\n   * Check is there are no pending tile headers registered for the particular frameNumber\n   * @param frameNumber\n   * @returns\n   */\n  isZero(frameNumber: number) {\n    const count = this.frameNumberMap.get(frameNumber) || 0;\n    return count === 0;\n  }\n}\n"],"file":"i3s-frame-counter.js"}

package/dist/tileset/traversers/i3s-frame-counter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"i3s-frame-counter.d.ts","sourceRoot":"","sources":["../../../src/tileset/traversers/i3s-frame-counter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C,OAAO,CAAC,cAAc,CAAkC;IAExD;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM;IAK5B;;;OAGG;IACH,UAAU,CAAC,WAAW,EAAE,MAAM;IAK9B;;;;OAIG;IACH,MAAM,CAAC,WAAW,EAAE,MAAM;CAI3B"}

package/src/tileset/traversers/i3s-frame-counter.ts

@@ -1,35 +0,0 @@
-/**
- * Counter to register pending tile headers for the particular frameNumber
- * Until all tiles are loaded we won't call `onTraversalEnd` callback
- */
-export default class I3SPendingTilesRegister {
-  private frameNumberMap: Map<number, number> = new Map();
-
-  /**
-   * Register a new pending tile header for the particular frameNumber
-   * @param frameNumber
-   */
-  register(frameNumber: number) {
-    const oldCount = this.frameNumberMap.get(frameNumber) || 0;
-    this.frameNumberMap.set(frameNumber, oldCount + 1);
-  }
-
-  /**
-   * Deregister a pending tile header for the particular frameNumber
-   * @param frameNumber
-   */
-  deregister(frameNumber: number) {
-    const oldCount = this.frameNumberMap.get(frameNumber) || 1;
-    this.frameNumberMap.set(frameNumber, oldCount - 1);
-  }
-
-  /**
-   * Check is there are no pending tile headers registered for the particular frameNumber
-   * @param frameNumber
-   * @returns
-   */
-  isZero(frameNumber: number) {
-    const count = this.frameNumberMap.get(frameNumber) || 0;
-    return count === 0;
-  }
-}