bruce-cesium 7.4.2 → 7.4.3

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, HeightReference, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, ShaderSource, Ellipsoid, Matrix4, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian2, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, JulianDate, Quaternion, DistanceDisplayCondition, ArcType, CornerType, ConstantPositionProperty, HorizontalOrigin, VerticalOrigin, ImageMaterialProperty, SceneTransforms, PolygonHierarchy, PolylineGraphics, Rectangle, FeatureDetection, KmlDataSource, NearFarScalar, GeoJsonDataSource, Matrix3, SceneMode, Ion, IonResource, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Cesium3DTileset, Intersect, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, PolygonPipeline, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, CustomDataSource, Fullscreen, CzmlDataSource } from 'cesium';
-import { Cartes, LRUCache, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, Entity as Entity$1, EntityLod, EntityTag, EntityType, ObjectUtils, Style, Carto, Geometry as Geometry$1, Api, ClientFileValueMap, Color as Color$1, BruceEvent, EntityCoords, MenuItem, Tileset, ProjectView, ProjectViewBookmark, ZoomControl, Bounds, DataLab, DelayQueue, AccountConcept, BruceApi, EntityRelation, RecordChangeFeed, EntitySource, Camera, ProgramKey, ProjectViewLegacyTile, Account, AccountLimits, Session, UrlUtils, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, ProjectViewBookmarkGroup, EntityRelationType, EntityHistoricData } from 'bruce-models';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, ConstantPositionProperty, HeightReference, DistanceDisplayCondition, ColorBlendMode, HeadingPitchRoll, Math as Math$1, Transforms, ShadowMode, Cartesian3, ClassificationType, Model, JulianDate, Quaternion, Matrix4, ShaderSource, Ellipsoid, Geometry, GeometryAttribute, ComponentDatatype, PrimitiveType, BoundingSphere, GeometryPipeline, Cartesian2, Cartesian4, sampleTerrain, Texture, PixelFormat, Sampler, TextureWrap, TextureMinificationFilter, TextureMagnificationFilter, VertexArray, BufferUsage, ShaderProgram, RenderState, BlendingState, DrawCommand, Pass, ArcType, CornerType, HorizontalOrigin, VerticalOrigin, ImageMaterialProperty, PolygonHierarchy, PolylineGraphics, Rectangle, SceneTransforms, FeatureDetection, NearFarScalar, Matrix3, KmlDataSource, SceneMode, GeoJsonDataSource, Cesium3DTileStyle, HeadingPitchRange, Ion, IonResource, Cesium3DTileColorBlendMode, Cesium3DTileset, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, Intersect, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, CesiumInspector, ClockRange, DynamicEnvironmentMapManager, GeometryInstance, CustomDataSource, ScreenSpaceEventHandler, ScreenSpaceEventType, Fullscreen, CzmlDataSource } from 'cesium';
+import { Cartes, LRUCache, ProjectViewTile, ENVIRONMENT, Calculator, ClientFile, Entity as Entity$1, EntityLod, EntityTag, EntityType, ObjectUtils, Style, Carto, Geometry as Geometry$1, Api, Bounds, ClientFileValueMap, Color as Color$1, MenuItem, ProjectView, ProjectViewBookmark, Tileset, ZoomControl, DataLab, BruceEvent, EntityCoords, AccountConcept, DelayQueue, BruceApi, EntityRelation, RecordChangeFeed, EntitySource, ProgramKey, ProjectViewLegacyTile, Camera, Account, AccountLimits, Session, UrlUtils, ProjectViewBookmarkGroup, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, EntityRelationType, EntityHistoricData } from 'bruce-models';
 
 /**
  * Ensures a number is returned from a given value.
@@ -16796,9 +16796,6 @@ class EntityGatherer {
         // Last date-time range taken from the clock.
         this.lastDateTimeMin = null;
         this.lastDateTimeMax = null;
-        // Entity ID -> last resolved date time.
-        // Helps determine if a slow resolved request can still be applied while we wait for the next one.
-        this.lastFoundDateTimes = new Map();
         // ID of Entity IDs that need to be requested.
         this.eIdQueue = [];
         // Membership mirror of eIdQueue for quick checks.
@@ -16830,8 +16827,12 @@ class EntityGatherer {
         // Unsubscribes the view monitor listener that queues what the camera has moved onto.
         this.monitorRemoval = null;
         // Indicates a tick is active.
-        // When true, we won't bother calling onTick again.
+        // When true, a new tick is not started; it is noted in pendingTick and run once this one ends.
         this.runningTick = false;
+        // A tick was asked for while one was running, so another is owed once it finishes.
+        this.pendingTick = false;
+        // The debounce every clock change goes through, kept so a tick owed after a running one does too.
+        this.tickDelay = null;
         // Entity ID -> Entity blob.
         // This is a tool that lets developers set their own JSON blobs instead of requesting data from API.
         this.entityDataOverrides = new Map();
@@ -16895,11 +16896,13 @@ class EntityGatherer {
             let tickDelay = new DelayQueue(() => {
                 this.onTick(false);
             }, 250, true);
+            this.tickDelay = tickDelay;
             this.hDisposals.push(() => {
                 if (tickDelay) {
                     tickDelay.Dispose();
                 }
                 tickDelay = null;
+                this.tickDelay = null;
             });
             // React to clock changes and request new Entities.
             let prevTime = null;
@@ -16939,7 +16942,6 @@ class EntityGatherer {
         this.priorityCount = 0;
         this.lastOrderFocus = null;
         this.allEIds.clear();
-        this.lastFoundDateTimes.clear();
         this.everFound.clear();
         this.clearIndex();
         this.lastDateTime = null;
@@ -17301,7 +17303,6 @@ class EntityGatherer {
         this.eIdQueued.clear();
         this.priorityCount = 0;
         this.allEIds.clear();
-        this.lastFoundDateTimes.clear();
         this.everFound.clear();
         this.clearIndex();
         this.entityDataOverrides.clear();
@@ -17317,7 +17318,13 @@ class EntityGatherer {
         }
     }
     onTick(force) {
-        if (this.runningTick || this.disposed) {
+        if (this.disposed) {
+            return;
+        }
+        if (this.runningTick) {
+            if (this.historic) {
+                this.pendingTick = true;
+            }
             return;
         }
         const rTime = this.viewer.clock.currentTime.toString();
@@ -17325,10 +17332,16 @@ class EntityGatherer {
             return;
         }
         this.lastDateTime = rTime;
+        // Whether the clock has left the moment this tick is reading.
+        const movedOn = () => this.historic && this.viewer.clock.currentTime.toString() !== rTime;
         (async () => {
             this.runningTick = true;
+            this.pendingTick = false;
             this.placeStragglers();
             let rerun = false;
+            let interrupted = false;
+            // Batch's answer is applied while the next batch is being read.
+            const applying = [];
             try {
                 const handleResponse = async (requestedBatch, entities) => {
                     var _a, _b, _c, _d;
@@ -17392,45 +17405,7 @@ class EntityGatherer {
                             api: this.api
                         })).tags;
                     }
-                    // 0 = rTime is still the current time.
-                    // 1 = rTime is in the future.
-                    // -1 = rTime is in the past.
-                    let changeDir = 0;
-                    if (this.lastDateTime !== this.viewer.clock.currentTime.toString()) {
-                        changeDir = this.lastDateTime < this.viewer.clock.currentTime.toString() ? 1 : -1;
-                    }
-                    let toEmit;
-                    if (this.historic) {
-                        // We can emit Entities if the last resolved time (per Entity) isn't newer than rTime.
-                        // We compare using the changeDir to determine if we should emit or not.
-                        toEmit = resolvedEntities.filter((e) => {
-                            var _a;
-                            const entityId = ((_a = e === null || e === void 0 ? void 0 : e.Bruce) === null || _a === void 0 ? void 0 : _a.ID) || (e === null || e === void 0 ? void 0 : e.id);
-                            const lastFoundDateTime = this.lastFoundDateTimes.get(entityId);
-                            if (lastFoundDateTime) {
-                                if (changeDir === 1) {
-                                    return lastFoundDateTime <= rTime;
-                                }
-                                else if (changeDir === -1) {
-                                    return lastFoundDateTime >= rTime;
-                                }
-                            }
-                            return true;
-                        });
-                        // Update the last found date times for the filtered Entities.
-                        toEmit.forEach((e) => {
-                            var _a;
-                            const entityId = ((_a = e === null || e === void 0 ? void 0 : e.Bruce) === null || _a === void 0 ? void 0 : _a.ID) || (e === null || e === void 0 ? void 0 : e.id);
-                            if (entityId) {
-                                this.lastFoundDateTimes.set(entityId, rTime);
-                            }
-                        });
-                    }
-                    else {
-                        // If we're not historic, we can just emit everything.
-                        toEmit = resolvedEntities;
-                    }
-                    this.emitEntities(toEmit, tags);
+                    this.emitEntities(resolvedEntities, tags);
                 };
                 const QUEUE_BATCH_SIZE = 500;
                 const requestedIds = new Set();
@@ -17439,7 +17414,8 @@ class EntityGatherer {
                     const total = this.eIdQueue.length;
                     let done = 0;
                     while (this.eIdQueue.length && !this.disposed) {
-                        if (this.historic && this.lastDateTime !== rTime) {
+                        if (movedOn()) {
+                            interrupted = true;
                             break;
                         }
                         this.orderQueueByCamera();
@@ -17455,7 +17431,7 @@ class EntityGatherer {
                             api: this.api,
                             maxSearchTimeSec: 60 * 2
                         });
-                        handleResponse(batch, entities);
+                        applying.push(handleResponse(batch, entities));
                         for (let i = 0; i < batch.length; i++) {
                             requestedIds.add(batch[i]);
                         }
@@ -17487,7 +17463,8 @@ class EntityGatherer {
                     // The near ones are resolved first out of whatever the view still reaches.
                     allEIds = this.bandIds(allEIds);
                     while (allEIds.length && !this.disposed && !this.eIdQueue.length) {
-                        if (this.historic && this.lastDateTime !== rTime) {
+                        if (movedOn()) {
+                            interrupted = true;
                             break;
                         }
                         const batch = allEIds.splice(0, QUEUE_BATCH_SIZE);
@@ -17498,7 +17475,7 @@ class EntityGatherer {
                             api: this.api,
                             maxSearchTimeSec: 60 * 2
                         });
-                        handleResponse(batch, entities);
+                        applying.push(handleResponse(batch, entities));
                         for (let i = 0; i < batch.length; i++) {
                             requestedIds.add(batch[i]);
                         }
@@ -17513,10 +17490,32 @@ class EntityGatherer {
                 console.error(e);
             }
             finally {
+                // Only a historic answer can be overtaken by a newer moment, so nothing else waits.
+                if (this.historic && applying.length) {
+                    await Promise.all(applying.map((pending) => pending.catch((e) => console.error(e))));
+                }
                 this.runningTick = false;
             }
-            if (rerun) {
+            // A moment read only in part is forgotten, so coming back to it reads it again in full.
+            if (interrupted && this.lastDateTime === rTime) {
+                this.lastDateTime = null;
+            }
+            if (this.disposed) {
+                return;
+            }
+            // Leftovers at the same moment carry straight on, as they always have.
+            if (rerun && !interrupted) {
                 this.onTick(true);
+                return;
+            }
+            if (interrupted || this.pendingTick || movedOn()) {
+                this.pendingTick = false;
+                if (this.tickDelay) {
+                    this.tickDelay.Call();
+                }
+                else {
+                    this.onTick(false);
+                }
             }
         })();
     }
@@ -49206,7 +49205,7 @@ var EntityRenderEngine;
     }
     EntityRenderEngine.GetGraphicShapeId = GetGraphicShapeId;
     async function Render(params) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const groupRenderParams = {
             apiGetter: params.apiGetter,
             viewer: params.viewer,
@@ -49383,10 +49382,20 @@ var EntityRenderEngine;
                     polygons.push(entity);
                     continue;
                 }
+                // Present when the gate above chose to reuse this entity's graphic.
+                const existingRoot = cEntities.get(entity.Bruce.ID);
+                const existingParts = new Map();
+                (_d = existingRoot === null || existingRoot === void 0 ? void 0 : existingRoot._siblingGraphics) === null || _d === void 0 ? void 0 : _d.forEach((part) => {
+                    if (part._multiPartIndex != null) {
+                        existingParts.set(part._multiPartIndex, part);
+                    }
+                });
+                const partRendered = new Map();
+                const partIndexes = new Map();
                 const pParams = {
                     ...groupRenderParams,
                     entities: [],
-                    rendered: cEntities
+                    rendered: partRendered
                 };
                 pParams.entitiesHistoric = params.entitiesHistoric;
                 const zoomItem = pParams.zoomItems[entity.Bruce.ID];
@@ -49402,39 +49411,59 @@ var EntityRenderEngine;
                     };
                     pParams.zoomItems[subEntity.Bruce.ID] = zoomItem;
                     pParams.entities.push(subEntity);
-                }
-                const cPoly = await Polygon.RenderGroup(pParams);
-                Array.from(cPoly.keys()).forEach((key) => {
-                    if (cPoly.get(key)) {
-                        pParams.entities = pParams.entities.filter((e) => e.Bruce.ID != key);
-                    }
-                });
-                let rendered = Array.from(cPoly.values());
-                const cLines = await Polyline.RenderGroup(pParams);
-                Array.from(cLines.keys()).forEach((key) => {
-                    if (cLines.get(key)) {
+                    partIndexes.set(subEntity.Bruce.ID, j);
+                    const existingPart = existingParts.get(j);
+                    if (existingPart) {
+                        // An engine preparing a reused graphic gathers everything connected to it, so a part still
+                        // attached to its root would have every other part evicted from the scene.
+                        existingPart._parentEntity = null;
+                        partRendered.set(subEntity.Bruce.ID, existingPart);
+                    }
+                }
+                const rendered = [];
+                const collect = (results) => {
+                    results.forEach((cEntity, key) => {
+                        if (!cEntity) {
+                            return;
+                        }
+                        cEntity._multiPartIndex = partIndexes.get(key);
+                        rendered.push(cEntity);
                         pParams.entities = pParams.entities.filter((e) => e.Bruce.ID != key);
-                    }
-                });
-                rendered = rendered.concat(Array.from(cLines.values()));
+                    });
+                };
+                collect(await Polygon.RenderGroup(pParams));
+                collect(await Polyline.RenderGroup(pParams));
                 // We'll only render points when there's no other geometry.
                 // Generally speaking when polygons/polylines are drawn, points are only drawn because of invalid data.
                 if (!rendered.length) {
-                    const cPoints = await Point.RenderGroup(pParams);
-                    rendered = rendered.concat(Array.from(cPoints.values()));
+                    collect(await Point.RenderGroup(pParams));
                 }
-                rendered = rendered.filter(x => x != null);
                 if (rendered.length) {
-                    const rootEntity = new Entity({
-                        id: ObjectUtils.UId(15)
-                    });
-                    rootEntity._siblingGraphics = [];
+                    const sameParts = ((_e = existingRoot === null || existingRoot === void 0 ? void 0 : existingRoot._siblingGraphics) === null || _e === void 0 ? void 0 : _e.length) == rendered.length &&
+                        rendered.every((part) => existingRoot._siblingGraphics.includes(part));
+                    let rootEntity;
+                    if (sameParts) {
+                        rootEntity = existingRoot;
+                    }
+                    else {
+                        if (existingRoot === null || existingRoot === void 0 ? void 0 : existingRoot._siblingGraphics) {
+                            // Retiring the old root removes its parts, and the ones carried over belong to the new root now.
+                            existingRoot._siblingGraphics = existingRoot._siblingGraphics.filter((part) => !rendered.includes(part));
+                        }
+                        rootEntity = new Entity({
+                            id: ObjectUtils.UId(15)
+                        });
+                    }
+                    rootEntity._siblingGraphics = rendered;
                     rootEntity._renderGroup = GetRenderGroupId(zoomItem);
-                    rootEntity._siblingGraphics = rootEntity._siblingGraphics.concat(rendered);
+                    // The skip gate compares the rego's style against the zoom item's, and the rego takes it from here.
+                    rootEntity.styleId = (zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) == -1 ? -1 : (+(zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.StyleID) || null);
+                    rootEntity.styleEffective = rendered[0].styleEffective;
                     cEntities.set(entity.Bruce.ID, rootEntity);
-                    const firstEntity = rendered[0];
-                    if (firstEntity) {
-                        rootEntity.position = GetCValue(params.viewer, firstEntity.position);
+                    const newPosition = GetCValue(params.viewer, rendered[0].position);
+                    const oldPosition = GetCValue(params.viewer, rootEntity.position);
+                    if (newPosition && (!oldPosition || !Cartes.IsEqualCartes3(oldPosition, newPosition))) {
+                        rootEntity.position = new ConstantPositionProperty(newPosition);
                     }
                     rendered.forEach((child) => {
                         child._parentEntity = rootEntity;
@@ -50371,7 +50400,7 @@ var StyleUtils;
     StyleUtils.ApplyTypeStyle = ApplyTypeStyle;
 })(StyleUtils || (StyleUtils = {}));
 
-const VERSION = "7.4.2";
+const VERSION = "7.4.3";
 /**
  * Updates the environment instance used by bruce-cesium to one specified.
  * This can be used to ensure that the instance a parent is referencing is shared between bruce-cesium, bruce-models, and the parent app.