bruce-cesium 3.7.7 → 3.7.9

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ProjectViewTile, DelayQueue, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, Api, EntityRelationType, ENVIRONMENT, EntityCoords, EntitySource, MenuItem, EntityRelation, ProgramKey, AbstractApi, ProjectViewBookmark, EntityAttachment, EntityAttachmentType, EntityAttribute, ProjectView, ProjectViewLegacyTile, Camera } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, DistanceDisplayCondition, NearFarScalar, Model, Entity, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, Cesium3DTileColorBlendMode, HeadingPitchRange, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, CzmlDataSource, Quaternion, Intersect } from 'cesium';
+import { Cartographic, Cartesian2, Math as Math$1, Cartesian3, CallbackProperty, Color, HeightReference, Rectangle, JulianDate, Entity, Primitive, Cesium3DTileFeature, DistanceDisplayCondition, NearFarScalar, Model, HorizontalOrigin, VerticalOrigin, ConstantProperty, ConstantPositionProperty, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, ColorMaterialProperty, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, GeoJsonDataSource, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, CesiumInspector, defined, ClockRange, EllipsoidGeodesic, sampleTerrainMostDetailed, PolygonPipeline, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -9828,10 +9828,11 @@ var EntitiesRenderManager;
             this.sources = [];
         };
         Manager.prototype.ReRender = function (params) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var entityIds, force, entities, data, e_1;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             entityIds = params.entityIds, force = params.force, entities = params.entities;
                             if (entities && !entityIds) {
@@ -9852,17 +9853,19 @@ var EntitiesRenderManager;
                             this.renderEntities(entities, true);
                             return [3 /*break*/, 4];
                         case 1:
-                            _a.trys.push([1, 3, , 4]);
+                            _b.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Entity$1.GetListByIds({
                                     api: this.apiGetter.getApi(),
-                                    entityIds: entityIds
+                                    entityIds: entityIds,
+                                    historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
+                                    historicPoint: this.viewer.clock.currentTime.toString()
                                 })];
                         case 2:
-                            data = _a.sent();
+                            data = _b.sent();
                             this.renderEntities(data.entities, true);
                             return [3 /*break*/, 4];
                         case 3:
-                            e_1 = _a.sent();
+                            e_1 = _b.sent();
                             console.error(e_1);
                             return [3 /*break*/, 4];
                         case 4: return [3 /*break*/, 8];
@@ -9872,8 +9875,8 @@ var EntitiesRenderManager;
                             return [3 /*break*/, 8];
                         case 6: return [4 /*yield*/, this.doEntityCheck(entityIds)];
                         case 7:
-                            _a.sent();
-                            _a.label = 8;
+                            _b.sent();
+                            _b.label = 8;
                         case 8: return [2 /*return*/];
                     }
                 });
@@ -10334,12 +10337,12 @@ var EntitiesRenderManager;
          * @returns
          */
         Manager.prototype.renderAsIndividuals = function (entities, force) {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             if (force === void 0) { force = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var toRemove, i, entity, _g, updated, cEntities, i, entity, id, cEntity, rego, visual, wasClustered, tagIds, rego_1;
-                return __generator(this, function (_h) {
-                    switch (_h.label) {
+                var toRemove, i, entity, _k, updated, cEntities, i, entity, id, cEntity, rego, visual, wasClustered, tagIds, rego_1;
+                return __generator(this, function (_l) {
+                    switch (_l.label) {
                         case 0:
                             if ((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey) {
                                 toRemove = entities.filter(function (x) { var _a; return !((_a = x.Bruce) === null || _a === void 0 ? void 0 : _a.historicAttrKey); });
@@ -10364,7 +10367,7 @@ var EntitiesRenderManager;
                                     force: force
                                 })];
                         case 1:
-                            _g = _h.sent(), updated = _g.updated, cEntities = _g.entities;
+                            _k = _l.sent(), updated = _k.updated, cEntities = _k.entities;
                             if (this.disposed) {
                                 this.doDispose();
                                 return [2 /*return*/];
@@ -10402,7 +10405,14 @@ var EntitiesRenderManager;
                                             requestRender: false
                                         });
                                     }
-                                    else if (updated.get(id)) {
+                                    else if (updated.get(id) && rego) {
+                                        rego.name = cEntity.name;
+                                        rego.visual = cEntity;
+                                        rego.entityTypeId = entity.Bruce["EntityType.ID"];
+                                        rego.tagIds = ((_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
+                                        rego.historicDateTime = (_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g.historicDateTime;
+                                        rego.historicAttrKey = (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.historicAttrKey;
+                                        rego.cdn = this.item.cdnEnabled;
                                         // We manually trigger an update event since the graphic was updated but not recreated.
                                         this.visualsManager.OnUpdate.Trigger({
                                             type: VisualsRegister.EVisualUpdateType.Update,
@@ -10417,7 +10427,7 @@ var EntitiesRenderManager;
                                         menuItemId: this.item.id,
                                         requestRender: false
                                     });
-                                    (_f = this.clustering) === null || _f === void 0 ? void 0 : _f.RemoveEntity(id, false);
+                                    (_j = this.clustering) === null || _j === void 0 ? void 0 : _j.RemoveEntity(id, false);
                                 }
                             }
                             this.viewer.scene.requestRender();
@@ -11228,7 +11238,10 @@ var EntitiesLoadedRenderManager;
                                             requestRender: false
                                         });
                                     }
-                                    else if (updated.get(id)) {
+                                    else if (updated.get(id) && rego) {
+                                        rego.visual = cEntity;
+                                        rego.entityTypeId = entity.Bruce["EntityType.ID"];
+                                        rego.name = cEntity.name;
                                         // We manually trigger an update event since the graphic was updated but not recreated.
                                         this.visualsManager.OnUpdate.Trigger({
                                             type: VisualsRegister.EVisualUpdateType.Update,
@@ -11837,7 +11850,10 @@ var EntitiesIdsRenderManager;
                                             requestRender: false
                                         });
                                     }
-                                    else if (updated.get(id)) {
+                                    else if (updated.get(id) && rego) {
+                                        rego.visual = cEntity;
+                                        rego.entityTypeId = entity.Bruce["EntityType.ID"];
+                                        rego.name = cEntity.name;
                                         // We manually trigger an update event since the graphic was updated but not recreated.
                                         this.visualsManager.OnUpdate.Trigger({
                                             type: VisualsRegister.EVisualUpdateType.Update,
@@ -12051,7 +12067,10 @@ var EntityRenderManager;
                                         requestRender: false
                                     });
                                 }
-                                else if (updated.get(id)) {
+                                else if (updated.get(id) && rego) {
+                                    rego.visual = cEntity;
+                                    rego.entityTypeId = entity.Bruce["EntityType.ID"];
+                                    rego.name = cEntity.name;
                                     // We manually trigger an update event since the graphic was updated but not recreated.
                                     this.visualsManager.OnUpdate.Trigger({
                                         type: VisualsRegister.EVisualUpdateType.Update,
@@ -13728,9 +13747,6 @@ var EntityFilterGetter;
             var integrity = this.tagIds == null ? "" : this.tagIds.join();
             if (this.historicAttrKey) {
                 integrity += this.historicAttrKey;
-                if (this.historicAttrDateTime) {
-                    integrity += this.historicAttrDateTime;
-                }
             }
             return integrity;
         };
@@ -13758,9 +13774,9 @@ var EntityFilterGetter;
                 return;
             }
             var delayQueue = new DelayQueue(function () {
-                var current = _this.getIntegrityId();
+                var current = _this.historicAttrDateTime;
                 _this.updateHistoricDateTime();
-                if (current != _this.getIntegrityId()) {
+                if (current != _this.historicAttrDateTime) {
                     _this.updateState();
                 }
             }, 250);
@@ -13779,8 +13795,6 @@ var EntityFilterGetter;
         Getter.prototype.updateHistoricDateTime = function () {
             if (!this.historicAttrKey) {
                 this.historicAttrDateTime = null;
-                this.historicAttrDateTimeMin = null;
-                this.historicAttrDateTimeMax = null;
                 return;
             }
             var isChanged = function (before, after) {
@@ -13795,16 +13809,8 @@ var EntityFilterGetter;
             };
             var oldDateTime = this.historicAttrDateTime ? new Date(this.historicAttrDateTime) : null;
             var newDateTime = JulianDate.toDate(this.viewer.clock.currentTime);
-            var oldDateMin = this.historicAttrDateTimeMin ? new Date(this.historicAttrDateTimeMin) : null;
-            var newDateMin = this.viewer.clock.startTime ? JulianDate.toDate(this.viewer.clock.startTime) : null;
-            var oldDateMax = this.historicAttrDateTimeMax ? new Date(this.historicAttrDateTimeMax) : null;
-            var newDateMax = this.viewer.clock.stopTime ? JulianDate.toDate(this.viewer.clock.stopTime) : null;
-            if (isChanged(oldDateTime, newDateTime) ||
-                isChanged(oldDateMin, newDateMin) ||
-                isChanged(oldDateMax, newDateMax)) {
+            if (isChanged(oldDateTime, newDateTime)) {
                 this.historicAttrDateTime = newDateTime.toISOString();
-                this.historicAttrDateTimeMin = newDateMin === null || newDateMin === void 0 ? void 0 : newDateMin.toISOString();
-                this.historicAttrDateTimeMax = newDateMax === null || newDateMax === void 0 ? void 0 : newDateMax.toISOString();
             }
         };
         Getter.prototype.viewerDateTimeDispose = function () {
@@ -13971,8 +13977,6 @@ var EntityFilterGetter;
                                     api: this.api,
                                     historicKey: this.historicAttrKey,
                                     historicPoint: this.historicAttrDateTime,
-                                    historicFrom: this.historicAttrKey ? this.historicAttrDateTimeMin : null,
-                                    historicTo: this.historicAttrKey ? this.historicAttrDateTimeMax : null,
                                     filter: {
                                         pageSize: PAGE_SIZE,
                                         pageIndex: curCell.FetchPageIndex,
@@ -23496,7 +23500,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "3.7.7";
+var VERSION = "3.7.9";
 
 export { VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, CESIUM_TIMELINE_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, CesiumEntityStyler, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map