bruce-cesium 7.2.4 → 7.2.6

package/dist/types/rendering/entity-gatherer.d.ts

@@ -1,6 +1,9 @@
 import { BruceApi, BruceEvent, Entity, EntityTag } from "bruce-models";
 import * as Cesium from "cesium";
+import { CesiumViewMonitor } from "../viewer/cesium-view-monitor";
 export declare class EntityGatherer {
+    static readonly MIN_ORDER_QUEUE = 500;
+    static readonly REORDER_MOVE_METRES = 250;
     private disposed;
     private api;
     private viewer;
@@ -13,6 +16,11 @@ export declare class EntityGatherer {
     private lastDateTimeMax;
     private lastFoundDateTimes;
     private eIdQueue;
+    private eIdQueued;
+    private positionOf;
+    private priorityCount;
+    private lastOrderFocus;
+    private monitor;
     private allEIds;
     private runningTick;
     private entityDataOverrides;
@@ -30,6 +38,22 @@ export declare class EntityGatherer {
     Init(historic: boolean, expandSources: boolean): void;
     Empty(): void;
     ReQueueAll(): void;
+    /**
+     * Supplies a lookup from Entity ID to world position, letting the queue resolve what the camera
+     * is nearest first. Sources that cannot answer should not call this, and are served in order.
+     */
+    SetPositionSource(positionOf: (entityId: string) => Cesium.Cartesian3 | null): void;
+    /**
+     * Supplies the view monitor, so the order follows the ground the camera is aimed at and prefers
+     * what is on screen. Without one the ordering falls back to distance from the camera itself.
+     */
+    SetViewMonitor(monitor: CesiumViewMonitor.Monitor): void;
+    /**
+     * Re-bands the pending queue so the nearest Entities are requested first.
+     */
+    private orderQueueByCamera;
+    private static boundsChanged;
+    private bandIds;
     Queue(entityIds: string[], topOfQueue?: boolean): void;
     Dispose(): void;
     private checkRange;

package/dist/types/rendering/render-managers/common/historic-utils.d.ts

@@ -1,5 +1,6 @@
 import * as Cesium from "cesium";
-import { BruceApi, Entity, EntityHistoricData, IDictionary } from "bruce-models";
+import { Bounds, BruceApi, Entity, EntityHistoricData, IDictionary } from "bruce-models";
+import { CesiumViewMonitor } from "../../../viewer/cesium-view-monitor";
 /**
  * How often a historic refresh is worth running, and which Entities it should ask about first.
  *
@@ -16,17 +17,40 @@ export declare namespace HistoricFetchOrder {
      * Returns how long to wait between historic refreshes for a set of this size.
      */
     function IntervalFor(entityCount: number, minMs?: number, maxMs?: number): number;
+    const DEFAULT_BANDS: number[];
     /**
-     * Returns the Entities grouped into bands by distance from the camera, nearest band first.
-     *
-     * Bands rather than a true sort, so a small camera move does not reshuffle the whole queue and
-     * restart it. What the user is looking at resolves first either way.
+     * Where the user is actually looking, which is not the same as where the camera is.
+     */
+    interface IViewFocus {
+        origin: Cesium.Cartesian3;
+        bounds?: Bounds.IReqBounds;
+    }
+    /**
+     * Resolves what to order by from the view monitor, falling back to the camera itself.
+     */
+    function FocusFrom(params: {
+        viewer: Cesium.Viewer;
+        monitor?: CesiumViewMonitor.Monitor;
+    }): IViewFocus | null;
+    /**
+     * Returns the Entities grouped nearest first, on screen ahead of off screen.
      */
     function ByCameraDistance(params: {
         viewer: Cesium.Viewer;
         entities: Entity.IEntity[];
+        monitor?: CesiumViewMonitor.Monitor;
         bands?: number[];
     }): Entity.IEntity[][];
+    /**
+     * Bands anything that can name its own world position, on the same bounds as the Entity form.
+     */
+    function ByCameraDistanceOf<T>(params: {
+        focus: IViewFocus | null;
+        items: T[];
+        posOf: (item: T) => Cesium.Cartesian3 | null;
+        bands?: number[];
+    }): T[][];
+    function InBounds(pos: Cesium.Cartesian3, bounds: Bounds.IReqBounds): boolean;
 }
 /**
  * Decides what slice of history is worth fetching for the clock as it is currently moving.
@@ -132,6 +156,7 @@ export declare class HistoricGatherer {
     private disposed;
     constructor(params: {
         viewer: Cesium.Viewer;
+        monitor?: CesiumViewMonitor.Monitor;
         getApi: () => BruceApi.Api;
         getAttrKey: () => string;
         sample?: number;

package/dist/types/rendering/render-managers/tilesets/tileset-entities-render-manager.d.ts

@@ -4,6 +4,7 @@ import { TilesetRenderEngine } from "../../tileset-render-engine";
 import { VisualsRegister } from "../../visuals-register";
 import { RenderManager } from "../render-manager";
 import { TilesetArbRenderManager } from "./tileset-arb-render-manager";
+import { CesiumViewMonitor } from "../../../viewer/cesium-view-monitor";
 export declare namespace TilesetEntitiesRenderManager {
     class Manager implements RenderManager.IManager, RenderManager.IHandoffCapableManager, RenderManager.IHandoffReceiver {
         private initCounter;
@@ -32,12 +33,14 @@ export declare namespace TilesetEntitiesRenderManager {
         private featurePropCache;
         private featurePropsChecked;
         private initQueue;
+        private monitor;
         constructor(params: {
             viewer: Cesium.Viewer;
             register: VisualsRegister.Register;
             getters: ApiGetters;
             item: MenuItem.Item.IEntitiesTileset;
             initQueue?: TilesetArbRenderManager.IInitQueue;
+            monitor?: CesiumViewMonitor.Monitor;
         });
         Init(params?: {
             item: MenuItem.Item.IEntitiesTileset;
@@ -69,6 +72,8 @@ export declare namespace TilesetEntitiesRenderManager {
         PrepareHandoff(): RenderManager.IHandoffPayload | null;
         AdoptHandoff(payload: RenderManager.IHandoffPayload): void;
         private queueHandoffRestyle;
+        private static readNumber;
+        private readBakedPos;
         private mapTilesetFeature;
         ReRender(params: {
             entityIds?: string[];

package/dist/types/rendering/texture-frame-series-animator.d.ts

@@ -377,6 +377,7 @@ export declare namespace TextureFrameSeriesAnimator {
         private nearestUncachedFrame;
         private pumpFetchQueue;
         private fetchAndTint;
+        private shouldPresent;
         protected composeTiles(tiles: ITileEntry[], idx: number, buffer: ArrayBuffer, spanStart: number): Promise<{
             pixels: Uint8ClampedArray;
             width: number;

package/dist/types/rendering/tileset-styler.d.ts

@@ -1,6 +1,7 @@
 import { BruceApi, BruceEvent, Entity, Style } from "bruce-models";
 import * as Cesium from "cesium";
 import { VisualsRegister } from "./visuals-register";
+import { CesiumViewMonitor } from "../viewer/cesium-view-monitor";
 /**
  * Returns if the outline metadata is different.
  * @param rego
@@ -31,6 +32,7 @@ export declare class TilesetStyler {
     private historic;
     private applyStyles;
     private entityGatherer;
+    private monitor;
     private reRenderState;
     private shouldUpdateRegoStates;
     private styledEntityIds;
@@ -54,6 +56,7 @@ export declare class TilesetStyler {
         scenario?: number | string;
         historic?: boolean;
         applyStyles?: boolean;
+        monitor?: CesiumViewMonitor.Monitor;
     }): void;
     /**
      * Updates style mapping and fallback style.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bruce-cesium",
-  "version": "7.2.4",
+  "version": "7.2.6",
   "description": "",
   "keywords": [],
   "main": "dist/bruce-cesium.umd.js",