bruce-cesium 6.5.0 → 6.5.2

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { Cartes, Entity as Entity$1, Calculator, EntityRelationType, EntityType, Style, ENVIRONMENT, ProjectViewTile, DelayQueue, LRUCache, BruceEvent, ObjectUtils, Geometry, EntityHistoricData, EntityLod, ZoomControl, EntityTag, Tileset, Api, EntityCoords, DataLab, EntitySource, ClientFile, MenuItem, EntityRelation, ProgramKey, Bounds, Carto, ProjectView, ProjectViewBookmark, ProjectViewLegacyTile, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute, MathUtils, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, Rectangle, NearFarScalar, Matrix3, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, Cesium3DTileset, IonResource, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
+import { Cartographic, ColorMaterialProperty, Entity, Color, ConstantProperty, CallbackProperty, Primitive, Cesium3DTileFeature, Math as Math$1, Cartesian3, JulianDate, Quaternion, Transforms, HeadingPitchRoll, Matrix4, DistanceDisplayCondition, HeightReference, ColorBlendMode, ShadowMode, ClassificationType, Model, HorizontalOrigin, VerticalOrigin, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ArcType, CornerType, Cartesian2, SceneTransforms, NearFarScalar, Matrix3, Rectangle, KmlDataSource, GeoJsonDataSource, SceneMode, Cesium3DTileStyle, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, EllipsoidTerrainProvider, IonImageryProvider, createWorldImagery, createWorldImageryAsync, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, CesiumTerrainProvider, IonResource, Cesium3DTileset, OrthographicFrustum, EasingFunction, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, BoundingSphere, GeometryInstance, PolygonPipeline, CesiumInspector, ClockRange, ScreenSpaceEventHandler, ScreenSpaceEventType, Intersect, CzmlDataSource, Fullscreen } from 'cesium';
 
 /**
  * Ensures a number is returned from a given value.
@@ -8582,7 +8582,7 @@ var EntitiesRenderManager;
             this.sources = [];
         }
         async ReRender(params) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             let { entityIds, force, entities, maintain } = params;
             if (entities && !entityIds) {
                 entityIds = entities.map(x => { var _a; return (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.ID; });
@@ -8635,9 +8635,10 @@ var EntitiesRenderManager;
                             const data = await Entity$1.GetListByIds({
                                 api: this.apiGetter.getApi(),
                                 entityIds: apiIds,
-                                historicKey: (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.historicAttrKey,
+                                entityTypeId: (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c["EntityType.ID"],
+                                historicKey: (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.historicAttrKey,
                                 historicPoint: this.viewer.clock.currentTime.toString(),
-                                schemaId: (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.schemaId,
+                                schemaId: (_e = this.item.BruceEntity) === null || _e === void 0 ? void 0 : _e.schemaId,
                                 expandSources: true,
                                 scenario: this.scenario,
                                 migrated: true,
@@ -8731,7 +8732,7 @@ var EntitiesRenderManager;
                         return !maintainedLookup[id] && !this.reRenderState.shouldSkipInRun(id, runId);
                     });
                     const checkBatch = async () => {
-                        var _a, _b;
+                        var _a, _b, _c;
                         apiIds = this.reRenderState.filterNonSkippedIds(apiIds, runId);
                         const entityIds = apiIds.splice(0, CHECK_BATCH_SIZE);
                         if (!entityIds.length) {
@@ -8741,9 +8742,10 @@ var EntitiesRenderManager;
                         const { entities } = await Entity$1.GetListByIds({
                             api,
                             entityIds,
-                            historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
+                            entityTypeId: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a["EntityType.ID"],
+                            historicKey: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.historicAttrKey,
                             historicPoint: this.viewer.clock.currentTime.toString(),
-                            schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId,
+                            schemaId: (_c = this.item.BruceEntity) === null || _c === void 0 ? void 0 : _c.schemaId,
                             scenario: this.scenario,
                             expandSources: true,
                             migrated: true,
@@ -10938,6 +10940,14 @@ class EntityGatherer {
         this.viewer = viewer;
         this.emitEntities = emitEntities;
     }
+    createFallbackEntity(entityId) {
+        return {
+            id: entityId,
+            Bruce: {
+                ID: entityId
+            }
+        };
+    }
     SetEntityDataOverride(eId, entity) {
         if (this.disposed) {
             return;
@@ -11082,26 +11092,44 @@ class EntityGatherer {
             this.runningTick = true;
             let rerun = false;
             try {
-                const handleResponse = async (entities) => {
-                    var _a, _b;
-                    if (!(entities === null || entities === void 0 ? void 0 : entities.length)) {
-                        return;
+                const handleResponse = async (requestedBatch, entities) => {
+                    var _a, _b, _c, _d;
+                    const resolvedEntities = [];
+                    const foundById = new Map();
+                    for (const entity of entities || []) {
+                        const entityId = ((_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a.ID) || (entity === null || entity === void 0 ? void 0 : entity.id);
+                        if (entityId) {
+                            foundById.set(entityId, entity);
+                        }
+                    }
+                    for (const entityId of requestedBatch || []) {
+                        const override = this.entityDataOverrides.get(entityId);
+                        if (override) {
+                            resolvedEntities.push(override);
+                            continue;
+                        }
+                        const found = foundById.get(entityId);
+                        if (found) {
+                            resolvedEntities.push(found);
+                            continue;
+                        }
+                        resolvedEntities.push(this.createFallbackEntity(entityId));
                     }
-                    // Lazy substitution of the entity data overrides.
-                    if (this.entityDataOverrides.size) {
-                        for (let i = 0; i < entities.length; i++) {
-                            const entity = entities[i];
-                            const eId = entity.Bruce.ID;
-                            if (this.entityDataOverrides.has(eId)) {
-                                entities[i] = this.entityDataOverrides.get(eId);
-                            }
+                    for (const entity of entities || []) {
+                        const entityId = ((_b = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _b === void 0 ? void 0 : _b.ID) || (entity === null || entity === void 0 ? void 0 : entity.id);
+                        if (!entityId || foundById.get(entityId) !== entity || (requestedBatch === null || requestedBatch === void 0 ? void 0 : requestedBatch.includes(entityId))) {
+                            continue;
                         }
+                        resolvedEntities.push(entity);
+                    }
+                    if (!resolvedEntities.length) {
+                        return;
                     }
                     // Gather all Tag IDs from found Entities.
                     let tagIds = new Set();
-                    for (let i = 0; i < entities.length; i++) {
-                        const entity = entities[i];
-                        if ((_b = (_a = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _a === void 0 ? void 0 : _a["Layer.ID"]) === null || _b === void 0 ? void 0 : _b.length) {
+                    for (let i = 0; i < resolvedEntities.length; i++) {
+                        const entity = resolvedEntities[i];
+                        if ((_d = (_c = entity === null || entity === void 0 ? void 0 : entity.Bruce) === null || _c === void 0 ? void 0 : _c["Layer.ID"]) === null || _d === void 0 ? void 0 : _d.length) {
                             const eTagIds = entity.Bruce["Layer.ID"];
                             for (let j = 0; j < eTagIds.length; j++) {
                                 const tagId = eTagIds[j];
@@ -11130,8 +11158,10 @@ class EntityGatherer {
                     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 = entities.filter((e) => {
-                            const lastFoundDateTime = this.lastFoundDateTimes.get(e.id);
+                        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;
@@ -11144,12 +11174,16 @@ class EntityGatherer {
                         });
                         // Update the last found date times for the filtered Entities.
                         toEmit.forEach((e) => {
-                            this.lastFoundDateTimes.set(e.id, rTime);
+                            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 = entities;
+                        toEmit = resolvedEntities;
                     }
                     this.emitEntities(toEmit, tags);
                 };
@@ -11171,7 +11205,7 @@ class EntityGatherer {
                             api: this.api,
                             maxSearchTimeSec: 60 * 2
                         });
-                        handleResponse(entities);
+                        handleResponse(batch, entities);
                         requestedIds.push(...batch);
                         done += batch.length;
                         if (this._onQueueProgress) {
@@ -11208,7 +11242,7 @@ class EntityGatherer {
                             api: this.api,
                             maxSearchTimeSec: 60 * 2
                         });
-                        handleResponse(entities);
+                        handleResponse(batch, entities);
                         requestedIds.push(...batch);
                     }
                 }
@@ -35295,7 +35329,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "6.5.0";
+const VERSION = "6.5.2";
 /**
  * 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.