bruce-cesium 4.9.7 → 4.9.8

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Entity as Entity$1, Carto, Geometry, MathUtils, LRUCache, Api, Calculator, ClientFile, EntityTag, EntityType, ObjectUtils, Style, ProjectViewTile, DelayQueue, EntityLod, Bounds, ZoomControl, EntityRelationType, ENVIRONMENT, EntityHistoricData, Tileset, EntityCoords, DataLab, EntitySource, MenuItem, EntityRelation, ProgramKey, ProjectView, ProjectViewBookmark, Camera, ProjectViewLegacyTile, EntityAttachment, EntityAttachmentType, EntityAttribute, AbstractApi, Session } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, DistanceDisplayCondition, HorizontalOrigin, VerticalOrigin, ConstantProperty, ClassificationType, ConstantPositionProperty, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, Primitive, Cesium3DTileFeature, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, NearFarScalar, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, PolygonPipeline, Matrix4, Matrix3, IonResource, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, Quaternion, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Intersect, Fullscreen } from 'cesium';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -5625,6 +5625,7 @@ function shouldRecheck(viewer) {
  * @returns
  */
 function isCullingIgnored(viewer, rego) {
+    var _a;
     if (
     // No rego or visual.
     // This is a safety check to avoid crashes.
@@ -5640,7 +5641,7 @@ function isCullingIgnored(viewer, rego) {
         // Won't touch in case there is special logic.
         rego.collection ||
         // We won't cull historic records as they may be interpolating their locations.
-        Boolean(rego.historicAttrKey)) {
+        Boolean((_a = rego.historicLayers) === null || _a === void 0 ? void 0 : _a.length)) {
         return true;
     }
     const visual = rego.visual;
@@ -7627,6 +7628,36 @@ function getHeightRef$3(style, defaultStyle) {
     return heightRef;
 }
 
+/**
+ * Returns if the historic metadata is different.
+ * @param rego
+ * @param entity
+ */
+function isHistoricMetadataChanged(rego, entity) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    // Different overlay amount.
+    if (((_a = rego.historicLayers) === null || _a === void 0 ? void 0 : _a.length) != ((_c = (_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.HistoricLayers) === null || _c === void 0 ? void 0 : _c.length)) {
+        return true;
+    }
+    // Both missing. Nothing to compare.
+    else if (!rego.historicLayers && !((_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.HistoricLayers)) {
+        return false;
+    }
+    // One missing. Definitely different.
+    else if (!rego.historicLayers || !((_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.HistoricLayers)) {
+        return true;
+    }
+    // Compare each layer.
+    for (let i = 0; i < rego.historicLayers.length; i++) {
+        if (rego.historicLayers[i].attrKey != ((_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.HistoricLayers[i].attrKey)) {
+            return true;
+        }
+        if (rego.historicLayers[i].dateTime != ((_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.HistoricLayers[i].dateTime)) {
+            return true;
+        }
+    }
+    return false;
+}
 var EntityRenderEngine;
 (function (EntityRenderEngine) {
     function GetRenderGroupId(zoomItem) {
@@ -7637,7 +7668,7 @@ var EntityRenderEngine;
     }
     EntityRenderEngine.GetRenderGroupId = GetRenderGroupId;
     async function Render(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f;
         const groupRenderParams = {
             apiGetter: params.apiGetter,
             viewer: params.viewer,
@@ -7720,9 +7751,8 @@ var EntityRenderEngine;
                 if (!params.force &&
                     newRenderId == oldRenderId &&
                     !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale) &&
-                    // If historic/scenario metadata is different then it's also stale.
-                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.historicDateTime) == ((_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.HistoricDateTime)) &&
-                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.scenario) == ((_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.Scenario))) {
+                    !isHistoricMetadataChanged(existingRego, entity) &&
+                    ((existingRego === null || existingRego === void 0 ? void 0 : existingRego.scenario) == ((_b = entity.Bruce) === null || _b === void 0 ? void 0 : _b.Scenario))) {
                     // No sorting category needed. Already rendered the way we want.
                     cEntities.set(id, existingRego.visual);
                 }
@@ -7733,11 +7763,9 @@ var EntityRenderEngine;
                         // Flag as no longer stale as we're unlikely to recreate the rego if we're reusing the graphic.
                         existingRego.stale = false;
                         // Update metadata for the same reason.
-                        existingRego.historicDateTime = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.HistoricDateTime;
-                        existingRego.historicAttrKey = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.HistoricAttrKey;
-                        existingRego.historicLayers = (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.HistoricLayers;
+                        existingRego.historicLayers = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c.HistoricLayers;
                         existingRego.entityTypeId = entity.Bruce["EntityType.ID"];
-                        existingRego.scenario = (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.Scenario;
+                        existingRego.scenario = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.Scenario;
                         updated.set(id, true);
                     }
                     if (displayType == ZoomControl.EDisplayType.Model3D) {
@@ -7750,7 +7778,7 @@ var EntityRenderEngine;
                             entity: entity,
                             path: ["Bruce", "VectorGeometry"]
                         });
-                        if ((_h = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _h === void 0 ? void 0 : _h.length) {
+                        if ((_e = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _e === void 0 ? void 0 : _e.length) {
                             multiGeometry.push(entity);
                         }
                         else {
@@ -7793,7 +7821,7 @@ var EntityRenderEngine;
                     entity: entity,
                     path: ["Bruce", "VectorGeometry"]
                 });
-                if (!((_j = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _j === void 0 ? void 0 : _j.length)) {
+                if (!((_f = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _f === void 0 ? void 0 : _f.length)) {
                     polygons.push(entity);
                     continue;
                 }
@@ -12631,7 +12659,7 @@ var EntitiesRenderManager;
          * @returns
          */
         async renderAsIndividuals(entities, force = false) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             // Entity ID -> historic records array.
             // We load this as extra information when rendering historic records.
             // This way we know what to animate towards as time changes.
@@ -12654,7 +12682,7 @@ var EntitiesRenderManager;
                     });
                     entitiesHistoric = historicData.recordsByIds;
                     // Remove ones with no historicAttrKey and no historic data.
-                    const toRemoveIds = entities.filter(x => { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricAttrKey) && !entitiesHistoric[x.Bruce.ID]; }).map(x => x.Bruce.ID);
+                    const toRemoveIds = entities.filter(x => { var _a, _b; return !((_b = (_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricLayers) === null || _b === void 0 ? void 0 : _b.length) && !entitiesHistoric[x.Bruce.ID]; }).map(x => x.Bruce.ID);
                     for (let i = 0; i < toRemoveIds.length; i++) {
                         const removeId = toRemoveIds[i];
                         this.visualsManager.RemoveRegos({
@@ -12731,10 +12759,8 @@ var EntitiesRenderManager;
                             overrideShow: wasClustered ? false : null,
                             name: cEntity.name,
                             cdn: this.item.cdnEnabled,
-                            historicDateTime: (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.HistoricDateTime,
-                            historicAttrKey: (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.HistoricAttrKey,
-                            historicLayers: (_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j.HistoricLayers,
-                            scenario: (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.Scenario
+                            historicLayers: (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.HistoricLayers,
+                            scenario: (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.Scenario
                         };
                         this.visualsManager.AddRego({
                             rego,
@@ -12745,13 +12771,11 @@ var EntitiesRenderManager;
                         rego.name = cEntity.name;
                         rego.visual = cEntity;
                         rego.entityTypeId = entity.Bruce["EntityType.ID"];
-                        rego.tagIds = ((_l = entity.Bruce) === null || _l === void 0 ? void 0 : _l["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
-                        rego.historicDateTime = (_m = entity.Bruce) === null || _m === void 0 ? void 0 : _m.HistoricDateTime;
-                        rego.historicAttrKey = (_o = entity.Bruce) === null || _o === void 0 ? void 0 : _o.HistoricAttrKey;
-                        rego.historicLayers = (_p = entity.Bruce) === null || _p === void 0 ? void 0 : _p.HistoricLayers;
+                        rego.tagIds = ((_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
+                        rego.historicLayers = (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.HistoricLayers;
                         rego.cdn = this.item.cdnEnabled;
-                        rego.schemaId = (_q = entity.Bruce) === null || _q === void 0 ? void 0 : _q.SchemaID;
-                        rego.scenario = (_r = entity.Bruce) === null || _r === void 0 ? void 0 : _r.Scenario;
+                        rego.schemaId = (_l = entity.Bruce) === null || _l === void 0 ? void 0 : _l.SchemaID;
+                        rego.scenario = (_m = entity.Bruce) === null || _m === void 0 ? void 0 : _m.Scenario;
                         // Marked as stale meaning some change was performed that requires a refresh.
                         // This usually means a new sibling was added that we need to update.
                         if (rego.stale) {
@@ -12781,7 +12805,7 @@ var EntitiesRenderManager;
                         menuItemId: this.item.id,
                         requestRender: false
                     });
-                    (_s = this.clustering) === null || _s === void 0 ? void 0 : _s.RemoveEntity(id, false);
+                    (_o = this.clustering) === null || _o === void 0 ? void 0 : _o.RemoveEntity(id, false);
                 }
             }
             this.viewer.scene.requestRender();
@@ -28334,7 +28358,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "4.9.7";
+const VERSION = "4.9.8";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, ViewerEventTracker, MenuItemManager, EntityRenderEngine, EntityRenderEnginePoint, EntityRenderEnginePolyline, EntityRenderEnginePolygon, EntityRenderEngineModel3d, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, DataLabRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, GoogleSearchRenderManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, CesiumAnimatedProperty, CesiumAnimatedInOut, Draw3dPolygon, Draw3dPolyline, MeasureCreator, Widget, VIEWER_BOOKMARKS_WIDGET_KEY, WidgetBookmarks, WidgetBranding, WidgetCursorBar, WidgetEmbeddedInfoView, WidgetInfoView, WidgetNavCompass$$1 as WidgetNavCompass, VIEWER_VIEW_BAR_WIDGET_KEY, WidgetViewBar, WidgetControlViewBar, WidgetControlViewBarSearch, VIEWER_LEFT_PANEL_WIDGET_KEY, VIEWER_LEFT_PANEL_CSS_VAR_LEFT, WidgetLeftPanel, WidgetLeftPanelTab, WidgetLeftPanelTabBookmarks };
 //# sourceMappingURL=bruce-cesium.es5.js.map