bruce-cesium 4.9.3 → 4.9.5

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, JulianDate, Entity, DistanceDisplayCondition, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, ClassificationType, ArcType, CornerType, ShadowMode, ConstantProperty, ConstantPositionProperty, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, HorizontalOrigin, VerticalOrigin, ColorBlendMode, HeadingPitchRoll, Transforms, Model, SceneMode, GeoJsonDataSource, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, Ion, KmlDataSource, OrthographicFrustum, EasingFunction, NearFarScalar, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, UrlTemplateImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, PolygonPipeline, Matrix4, Matrix3, IonResource, Quaternion, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, PolylineDashMaterialProperty, BoundingSphere, GeometryInstance, 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, 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';
 
 const TIME_LAG = 300;
 const POSITION_CHECK_TIMER = 950;
@@ -7637,7 +7637,7 @@ var EntityRenderEngine;
     }
     EntityRenderEngine.GetRenderGroupId = GetRenderGroupId;
     async function Render(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const groupRenderParams = {
             apiGetter: params.apiGetter,
             viewer: params.viewer,
@@ -7735,8 +7735,9 @@ var EntityRenderEngine;
                         // 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.entityTypeId = entity.Bruce["EntityType.ID"];
-                        existingRego.scenario = (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.Scenario;
+                        existingRego.scenario = (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.Scenario;
                         updated.set(id, true);
                     }
                     if (displayType == ZoomControl.EDisplayType.Model3D) {
@@ -7749,7 +7750,7 @@ var EntityRenderEngine;
                             entity: entity,
                             path: ["Bruce", "VectorGeometry"]
                         });
-                        if ((_g = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _g === void 0 ? void 0 : _g.length) {
+                        if ((_h = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _h === void 0 ? void 0 : _h.length) {
                             multiGeometry.push(entity);
                         }
                         else {
@@ -7792,7 +7793,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 (!((_j = geometry === null || geometry === void 0 ? void 0 : geometry.MultiGeometry) === null || _j === void 0 ? void 0 : _j.length)) {
                     polygons.push(entity);
                     continue;
                 }
@@ -10755,7 +10756,9 @@ var VisualsRegister;
                 if (menuItemId) {
                     return entityRegos.find(r => r.menuItemId === menuItemId);
                 }
-                return entityRegos.find(x => x.best);
+                return entityRegos.sort((a, b) => {
+                    return b.priority - a.priority;
+                })[0];
             }
         }
         /**
@@ -12048,7 +12051,7 @@ var EntitiesRenderManager;
             }, 3000);
         }
         setGetter() {
-            var _a, _b;
+            var _a, _b, _c;
             this.unsetGetter();
             const isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
             let tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
@@ -12068,9 +12071,10 @@ var EntitiesRenderManager;
                 tagIds: (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [],
                 debugShowBounds: getShowDebugBounds(),
                 cdn: this.item.cdnEnabled,
+                historic: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.historic,
                 historicAttrKey: this.item.BruceEntity.historicAttrKey,
                 historicInterpolation: this.item.historicInterpolation,
-                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
             });
             const minMax = RenderManager.GetZoomMinMax({
@@ -12651,12 +12655,12 @@ var EntitiesRenderManager;
          * @returns
          */
         async renderAsIndividuals(entities, force = false) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
             // 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.
             let entitiesHistoric = {};
-            if (((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey) && entities.length) {
+            if ((((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historic) || ((_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.historicAttrKey)) && entities.length) {
                 // Interpolating.
                 // We will allow non-historic Entities as long as they have historic data in the range.
                 if (this.item.historicInterpolation) {
@@ -12682,14 +12686,14 @@ var EntitiesRenderManager;
                             menuItemId: this.item.id,
                             requestRender: false
                         });
-                        (_b = this.clustering) === null || _b === void 0 ? void 0 : _b.RemoveEntity(removeId, false);
+                        (_c = this.clustering) === null || _c === void 0 ? void 0 : _c.RemoveEntity(removeId, false);
                     }
                     entities = entities.filter(x => !toRemoveIds.includes(x.Bruce.ID));
                 }
                 // Not interpolating.
                 // So we'll see if the Entities have a historic key or not.
                 else {
-                    const toRemoveIds = entities.filter(x => { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricAttrKey); }).map(x => x.Bruce.ID);
+                    const toRemoveIds = entities.filter(x => { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.HistoricLayers); }).map(x => x.Bruce.ID);
                     for (let i = 0; i < toRemoveIds.length; i++) {
                         const removeId = toRemoveIds[i];
                         this.visualsManager.RemoveRegos({
@@ -12697,7 +12701,7 @@ var EntitiesRenderManager;
                             menuItemId: this.item.id,
                             requestRender: false
                         });
-                        (_c = this.clustering) === null || _c === void 0 ? void 0 : _c.RemoveEntity(removeId, false);
+                        (_d = this.clustering) === null || _d === void 0 ? void 0 : _d.RemoveEntity(removeId, false);
                     }
                     entities = entities.filter(x => !toRemoveIds.includes(x.Bruce.ID));
                 }
@@ -12737,10 +12741,10 @@ var EntitiesRenderManager;
                     const visual = rego === null || rego === void 0 ? void 0 : rego.visual;
                     if (!visual || visual != cEntity) {
                         const wasClustered = this.clustering ? this.clustering.AddEntity(id, cEntity, false) : false;
-                        const tagIds = (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d["Layer.ID"];
+                        const tagIds = (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e["Layer.ID"];
                         const rego = {
                             entityId: id,
-                            schemaId: (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.SchemaID,
+                            schemaId: (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.SchemaID,
                             menuItemId: this.item.id,
                             menuItemType: this.item.Type,
                             visual: cEntity,
@@ -12751,9 +12755,10 @@ var EntitiesRenderManager;
                             overrideShow: wasClustered ? false : null,
                             name: cEntity.name,
                             cdn: this.item.cdnEnabled,
-                            historicDateTime: (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.HistoricDateTime,
-                            historicAttrKey: (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.HistoricAttrKey,
-                            scenario: (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.Scenario
+                            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
                         };
                         this.visualsManager.AddRego({
                             rego,
@@ -12764,12 +12769,13 @@ var EntitiesRenderManager;
                         rego.name = cEntity.name;
                         rego.visual = cEntity;
                         rego.entityTypeId = entity.Bruce["EntityType.ID"];
-                        rego.tagIds = ((_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
-                        rego.historicDateTime = (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.HistoricDateTime;
-                        rego.historicAttrKey = (_l = entity.Bruce) === null || _l === void 0 ? void 0 : _l.HistoricAttrKey;
+                        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.cdn = this.item.cdnEnabled;
-                        rego.schemaId = (_m = entity.Bruce) === null || _m === void 0 ? void 0 : _m.SchemaID;
-                        rego.scenario = (_o = entity.Bruce) === null || _o === void 0 ? void 0 : _o.Scenario;
+                        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;
                         // 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) {
@@ -12799,7 +12805,7 @@ var EntitiesRenderManager;
                         menuItemId: this.item.id,
                         requestRender: false
                     });
-                    (_p = this.clustering) === null || _p === void 0 ? void 0 : _p.RemoveEntity(id, false);
+                    (_s = this.clustering) === null || _s === void 0 ? void 0 : _s.RemoveEntity(id, false);
                 }
             }
             this.viewer.scene.requestRender();
@@ -16276,10 +16282,11 @@ var EntityFilterGetter;
             // We use this for refreshing historic data without having to repeat geographic queries.
             this.gatheredIntegrity = null;
             this.gatheredEntityIds = [];
-            const { api, viewer, viewPort, typeId, schemaId, batchSize, attrFilter, historicAttrKey, historicInterpolation, viaCdn, scenario } = params;
+            const { api, viewer, viewPort, typeId, schemaId, batchSize, attrFilter, historicAttrKey, historicInterpolation, historic, viaCdn, scenario } = params;
             this.api = api;
             this.typeId = typeId;
             this.schemaId = schemaId;
+            this.historic = Boolean(historic);
             this.historicAttrKey = historicAttrKey;
             this.historicInterpolation = Boolean(historicInterpolation);
             this.viaCdn = Boolean(viaCdn);
@@ -16297,6 +16304,9 @@ var EntityFilterGetter;
          */
         getIntegrityId() {
             let integrity = this.tagIds == null ? "" : this.tagIds.join();
+            if (this.historic) {
+                integrity += "isHistoric";
+            }
             if (this.historicAttrKey) {
                 integrity += this.historicAttrKey;
             }
@@ -16329,7 +16339,7 @@ var EntityFilterGetter;
          * If there is no historic attr set, this will do nothing.
          */
         viewerDateTimeSub() {
-            if (!this.historicAttrKey || this.viewerDateTimeChangeRemoval) {
+            if ((!this.historicAttrKey && !this.historic) || this.viewerDateTimeChangeRemoval) {
                 return;
             }
             // This is multiplied by the speed of animation to figure
@@ -16372,7 +16382,7 @@ var EntityFilterGetter;
             };
         }
         updateHistoricDateTime() {
-            if (!this.historicAttrKey) {
+            if (!this.historicAttrKey && !this.historic) {
                 this.historicAttrDateTime = null;
                 return;
             }
@@ -16553,7 +16563,7 @@ var EntityFilterGetter;
                                 api: this.api,
                                 scenario: this.scenario,
                                 historicKey: this.historicAttrKey,
-                                historicPoint: this.historicAttrDateTime,
+                                historicPoint: (this.historicAttrKey || this.historic) ? this.historicAttrDateTime : null,
                                 schemaId: this.schemaId,
                                 filter: {
                                     pageSize: PAGE_SIZE,
@@ -16769,6 +16779,7 @@ function createFilterGetterCacheKey(params) {
     cacheKey += params.schemaId ? params.schemaId : "";
     cacheKey += JSON.stringify(params.tagIds ? params.tagIds : []);
     cacheKey += params.historicAttrKey ? params.historicAttrKey : "";
+    cacheKey += params.historic ? "true" : "false";
     cacheKey += params.scenario ? params.scenario : 0;
     if (params.historicAttrKey) {
         cacheKey += params.historicInterpolation ? "true" : "false";
@@ -16796,6 +16807,7 @@ var SharedGetters;
                     schemaId: params.schemaId,
                     batchSize: params.batchSize,
                     attrFilter: params.attrFilter,
+                    historic: params.historic,
                     historicAttrKey: params.historicAttrKey,
                     historicInterpolation: params.historicInterpolation,
                     viaCdn: params.cdn,
@@ -28345,7 +28357,7 @@ class WidgetViewBar extends Widget.AWidget {
     }
 }
 
-const VERSION = "4.9.3";
+const VERSION = "4.9.5";
 
 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