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

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

@@ -55,6 +55,7 @@ import Tileset3DTraverser from './traversers/tileset-3d-traverser';
 import TilesetTraverser from './traversers/tileset-traverser';
 import I3SetTraverser from './traversers/i3s-tileset-traverser';
 import {TILESET_TYPE} from '../constants';
+import {GeospatialViewport, Viewport} from '../types';
 
 export type Tileset3DProps = {
   // loading
@@ -211,6 +212,9 @@ export default class Tileset3D {
 
   stats: Stats;
 
+  /** flags that contain information about data types in nested tiles */
+  contentFormats = {draco: false, meshopt: false, dds: false, ktx2: false};
+
   traverseCounter: number;
   geometricError: number;
   selectedTiles: Tile3D[];
@@ -244,7 +248,7 @@ export default class Tileset3D {
   private _pendingCount: any;
 
   // HOLD TRAVERSAL RESULTS
-  private lastUpdatedVieports: any[] | null;
+  private lastUpdatedVieports: Viewport[] | Viewport | null;
   private _requestedTiles: any;
   private _emptyTiles: any;
   private frameStateData: any;
@@ -393,7 +397,7 @@ export default class Tileset3D {
    * @param viewports - list of viewports
    * @deprecated
    */
-  update(viewports: any[] | null = null) {
+  update(viewports: Viewport[] | Viewport | null = null) {
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.tilesetInitializationPromise.then(() => {
       if (!viewports && this.lastUpdatedVieports) {
@@ -401,7 +405,9 @@ export default class Tileset3D {
       } else {
         this.lastUpdatedVieports = viewports;
       }
-      this.doUpdate(viewports);
+      if (viewports) {
+        this.doUpdate(viewports);
+      }
     });
   }
 
@@ -411,7 +417,7 @@ export default class Tileset3D {
    * @param viewports viewports
    * @returns Promise of new frameNumber
    */
-  async selectTiles(viewports: any[] | null = null): Promise<number> {
+  async selectTiles(viewports: Viewport[] | Viewport | null = null): Promise<number> {
     await this.tilesetInitializationPromise;
     if (viewports) {
       this.lastUpdatedVieports = viewports;
@@ -419,7 +425,9 @@ export default class Tileset3D {
     if (!this.updatePromise) {
       this.updatePromise = new Promise<number>((resolve) => {
         setTimeout(() => {
-          this.doUpdate(this.lastUpdatedVieports);
+          if (this.lastUpdatedVieports) {
+            this.doUpdate(this.lastUpdatedVieports);
+          }
           resolve(this._frameNumber);
           this.updatePromise = null;
         }, this.options.debounceTime);
@@ -433,24 +441,22 @@ export default class Tileset3D {
    * @param viewports viewports
    */
   // eslint-disable-next-line max-statements, complexity
-  private doUpdate(viewports: any[] | null = null): void {
+  private doUpdate(viewports: Viewport[] | Viewport): void {
     if ('loadTiles' in this.options && !this.options.loadTiles) {
       return;
     }
     if (this.traverseCounter > 0) {
       return;
     }
-    if (!(viewports instanceof Array)) {
-      viewports = [viewports];
-    }
+    const preparedViewports = viewports instanceof Array ? viewports : [viewports];
 
     this._cache.reset();
     this._frameNumber++;
-    this.traverseCounter = viewports.length;
+    this.traverseCounter = preparedViewports.length;
     const viewportsToTraverse: string[] = [];
     // First loop to decrement traverseCounter
-    for (const viewport of viewports) {
-      const id = viewport.id as string;
+    for (const viewport of preparedViewports) {
+      const id = viewport.id;
       if (this._needTraverse(id)) {
         viewportsToTraverse.push(id);
       } else {
@@ -459,8 +465,8 @@ export default class Tileset3D {
     }
 
     // Second loop to traverse
-    for (const viewport of viewports) {
-      const id = viewport.id as string;
+    for (const viewport of preparedViewports) {
+      const id = viewport.id;
       if (!this.roots[id]) {
         this.roots[id] = this._initializeTileHeaders(this.tileset, null);
       }
@@ -468,7 +474,7 @@ export default class Tileset3D {
       if (!viewportsToTraverse.includes(id)) {
         continue; // eslint-disable-line no-continue
       }
-      const frameState = getFrameState(viewport, this._frameNumber);
+      const frameState = getFrameState(viewport as GeospatialViewport, this._frameNumber);
       this._traverser.traverse(this.roots[id], frameState, this.options);
     }
   }
@@ -693,7 +699,7 @@ export default class Tileset3D {
     this.stats.get(TILES_LOADED);
     this.stats.get(TILES_UNLOADED);
     this.stats.get(TILES_LOAD_FAILED);
-    this.stats.get(POINTS_COUNT, 'memory');
+    this.stats.get(POINTS_COUNT);
     this.stats.get(TILES_GPU_MEMORY, 'memory');
   }
 
@@ -796,10 +802,43 @@ export default class Tileset3D {
       calculateTransformProps(tile, tile.content);
     }
 
+    this.updateContentTypes(tile);
     this._addTileToCache(tile);
     this.options.onTileLoad(tile);
   }
 
+  /**
+   * Update information about data types in nested tiles
+   * @param tile instance of a nested Tile3D
+   */
+  private updateContentTypes(tile: Tile3D) {
+    if (this.type === TILESET_TYPE.I3S) {
+      if (tile.header.isDracoGeometry) {
+        this.contentFormats.draco = true;
+      }
+      switch (tile.header.textureFormat) {
+        case 'dds':
+          this.contentFormats.dds = true;
+          break;
+        case 'ktx2':
+          this.contentFormats.ktx2 = true;
+          break;
+        default:
+      }
+    } else if (this.type === TILESET_TYPE.TILES3D) {
+      const {extensionsRemoved = []} = tile.content?.gltf || {};
+      if (extensionsRemoved.includes('KHR_draco_mesh_compression')) {
+        this.contentFormats.draco = true;
+      }
+      if (extensionsRemoved.includes('EXT_meshopt_compression')) {
+        this.contentFormats.meshopt = true;
+      }
+      if (extensionsRemoved.includes('KHR_texture_basisu')) {
+        this.contentFormats.ktx2 = true;
+      }
+    }
+  }
+
   _onStartTileLoading() {
     this._pendingCount++;
     this.stats.get(TILES_LOADING).incrementCount();

package/src/tileset/traversers/i3s-pending-tiles-register.ts

@@ -0,0 +1,44 @@
+/**
+ * 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<string, Map<number, number>> = new Map();
+
+  /**
+   * Register a new pending tile header for the particular frameNumber
+   * @param viewportId
+   * @param frameNumber
+   */
+  register(viewportId: string, frameNumber: number) {
+    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: string, frameNumber: number) {
+    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: string, frameNumber: number) {
+    const count = this.frameNumberMap.get(viewportId)?.get(frameNumber) || 0;
+    return count === 0;
+  }
+}

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) {
@@ -72,8 +72,7 @@ export default class I3STilesetTraverser extends TilesetTraverser {
       ...tileset.loadOptions,
       i3s: {
         ...tileset.loadOptions.i3s,
-        isTileHeader: true,
-        loadContent: false
+        isTileHeader: true
       }
     };
 
@@ -98,7 +97,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,36 @@
+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;
+};

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;
-  }
-}