bruce-cesium 3.8.5 → 3.8.7

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, EntityHistoricData, 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, ColorBlendMode, HeadingPitchRoll, Transforms, 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, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } 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, ColorBlendMode, HeadingPitchRoll, Transforms, Primitive, Cesium3DTileFeature, SceneMode, GeoJsonDataSource, HeadingPitchRange, Cesium3DTileColorBlendMode, Ion, Cesium3DTileStyle, KmlDataSource, SceneTransforms, OrthographicFrustum, EasingFunction, EllipsoidTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumTerrainProvider, Cesium3DTileset, Matrix4, Matrix3, IonResource, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, defined, CesiumInspector, ClockRange, BoundingSphere, GeometryInstance, ModelGraphics, PolygonGraphics, CorridorGraphics, PointGraphics, BillboardGraphics, EllipseGraphics, ScreenSpaceEventHandler, ScreenSpaceEventType, CzmlDataSource, Quaternion, Intersect } from 'cesium';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3604,6 +3604,13 @@ var RenderManager;
     RenderManager.GetZoomMinMax = GetZoomMinMax;
 })(RenderManager || (RenderManager = {}));
 
+function OnNextRender(viewer, callback) {
+    var removal = viewer.scene.postRender.addEventListener(function () {
+        removal();
+        callback();
+    });
+}
+
 var CESIUM_INSPECTOR_KEY = "_nextspace_inspector";
 var CESIUM_TIMELINE_KEY = "_nextspace_timeline";
 var ViewUtils;
@@ -3728,13 +3735,17 @@ var ViewUtils;
         var viewer = params.viewer, is2d = params.status, moveCamera = params.moveCamera;
         var curLens2d = viewer.camera.frustum instanceof OrthographicFrustum;
         if (curLens2d && !is2d) {
-            viewer.camera.switchToPerspectiveFrustum();
-            viewer.scene.screenSpaceCameraController.enableTilt = true;
+            OnNextRender(viewer, function () {
+                viewer.camera.switchToPerspectiveFrustum();
+                viewer.scene.screenSpaceCameraController.enableTilt = true;
+            });
             viewer.scene.requestRender();
         }
         else if (!curLens2d && is2d) {
-            viewer.camera.switchToOrthographicFrustum();
-            viewer.scene.screenSpaceCameraController.enableTilt = false;
+            OnNextRender(viewer, function () {
+                viewer.camera.switchToOrthographicFrustum();
+                viewer.scene.screenSpaceCameraController.enableTilt = false;
+            });
             if (moveCamera != false) {
                 try {
                     // Face camera downwards to make it look 2d.
@@ -10301,7 +10312,7 @@ var EntitiesRenderManager;
         };
         Manager.prototype.setGetter = function () {
             var _this = this;
-            var _a;
+            var _a, _b;
             this.unsetGetter();
             var isTagItem = Boolean(this.item.BruceEntity.ExpandLayers);
             var tagsToRender = isTagItem ? this.item.BruceEntity.SelectedExpandLayers : null;
@@ -10321,7 +10332,8 @@ var EntitiesRenderManager;
                 tagIds: (tagsToRender === null || tagsToRender === void 0 ? void 0 : tagsToRender.length) ? tagsToRender : [],
                 debugShowBounds: Boolean(window === null || window === void 0 ? void 0 : window.ENTITIES_RENDER_MANAGER_SHOW_BOUNDS),
                 cdn: this.item.cdnEnabled,
-                historicAttrKey: this.item.BruceEntity.historicAttrKey
+                historicAttrKey: this.item.BruceEntity.historicAttrKey,
+                schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId
             });
             var minMax = RenderManager.GetZoomMinMax({
                 zoomControl: this.item.CameraZoomSettings
@@ -10377,11 +10389,11 @@ var EntitiesRenderManager;
             this.sources = [];
         };
         Manager.prototype.ReRender = function (params) {
-            var _a;
+            var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
                 var entityIds, force, entities, data, e_1;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             entityIds = params.entityIds, force = params.force, entities = params.entities;
                             if (entities && !entityIds) {
@@ -10402,19 +10414,20 @@ var EntitiesRenderManager;
                             this.renderEntities(entities, true);
                             return [3 /*break*/, 4];
                         case 1:
-                            _b.trys.push([1, 3, , 4]);
+                            _c.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, Entity$1.GetListByIds({
                                     api: this.apiGetter.getApi(),
                                     entityIds: entityIds,
                                     historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
-                                    historicPoint: this.viewer.clock.currentTime.toString()
+                                    historicPoint: this.viewer.clock.currentTime.toString(),
+                                    schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId
                                 })];
                         case 2:
-                            data = _b.sent();
+                            data = _c.sent();
                             this.renderEntities(data.entities, true);
                             return [3 /*break*/, 4];
                         case 3:
-                            e_1 = _b.sent();
+                            e_1 = _c.sent();
                             console.error(e_1);
                             return [3 /*break*/, 4];
                         case 4: return [3 /*break*/, 8];
@@ -10424,8 +10437,8 @@ var EntitiesRenderManager;
                             return [3 /*break*/, 8];
                         case 6: return [4 /*yield*/, this.doEntityCheck(entityIds)];
                         case 7:
-                            _b.sent();
-                            _b.label = 8;
+                            _c.sent();
+                            _c.label = 8;
                         case 8: return [2 /*return*/];
                     }
                 });
@@ -10481,19 +10494,20 @@ var EntitiesRenderManager;
                             if (!(ids.length > 0)) return [3 /*break*/, 4];
                             checkBatch = function () { return __awaiter(_this, void 0, void 0, function () {
                                 var entityIds, entities;
-                                var _a;
-                                return __generator(this, function (_b) {
-                                    switch (_b.label) {
+                                var _a, _b;
+                                return __generator(this, function (_c) {
+                                    switch (_c.label) {
                                         case 0:
                                             entityIds = ids.splice(0, CHECK_BATCH_SIZE);
                                             return [4 /*yield*/, Entity$1.GetListByIds({
                                                     api: api,
                                                     entityIds: entityIds,
                                                     historicKey: (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey,
-                                                    historicPoint: this.viewer.clock.currentTime.toString()
+                                                    historicPoint: this.viewer.clock.currentTime.toString(),
+                                                    schemaId: (_b = this.item.BruceEntity) === null || _b === void 0 ? void 0 : _b.schemaId
                                                 })];
                                         case 1:
-                                            entities = (_b.sent()).entities;
+                                            entities = (_c.sent()).entities;
                                             if (this.disposed) {
                                                 return [2 /*return*/];
                                             }
@@ -10889,12 +10903,12 @@ var EntitiesRenderManager;
          * @returns
          */
         Manager.prototype.renderAsIndividuals = function (entities, force) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             if (force === void 0) { force = false; }
             return __awaiter(this, void 0, void 0, function () {
-                var entitiesHistoric, toRemove, i, entity, startTmp, stopTmp, startStr, stopStr, historicData, _k, updated, cEntities, i, entity, id, cEntity, rego, visual, wasClustered, tagIds, rego_1;
-                return __generator(this, function (_l) {
-                    switch (_l.label) {
+                var entitiesHistoric, toRemove, i, entity, startTmp, stopTmp, startStr, stopStr, historicData, _m, updated, cEntities, i, entity, id, cEntity, rego, visual, wasClustered, tagIds, rego_1;
+                return __generator(this, function (_o) {
+                    switch (_o.label) {
                         case 0:
                             entitiesHistoric = {};
                             if (!((_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.historicAttrKey)) return [3 /*break*/, 2];
@@ -10923,13 +10937,13 @@ var EntitiesRenderManager;
                                     api: this.apiGetter.getApi()
                                 })];
                         case 1:
-                            historicData = _l.sent();
+                            historicData = _o.sent();
                             if (this.disposed) {
                                 this.doDispose();
                                 return [2 /*return*/];
                             }
                             entitiesHistoric = historicData.recordsByIds;
-                            _l.label = 2;
+                            _o.label = 2;
                         case 2: return [4 /*yield*/, EntityRenderEngine.Render({
                                 viewer: this.viewer,
                                 apiGetter: this.apiGetter,
@@ -10941,7 +10955,7 @@ var EntitiesRenderManager;
                                 force: force
                             })];
                         case 3:
-                            _k = _l.sent(), updated = _k.updated, cEntities = _k.entities;
+                            _m = _o.sent(), updated = _m.updated, cEntities = _m.entities;
                             if (this.disposed) {
                                 this.doDispose();
                                 return [2 /*return*/];
@@ -10962,6 +10976,7 @@ var EntitiesRenderManager;
                                         tagIds = (_c = entity.Bruce) === null || _c === void 0 ? void 0 : _c["Layer.ID"];
                                         rego_1 = {
                                             entityId: id,
+                                            schemaId: (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.schemaId,
                                             menuItemId: this.item.id,
                                             visual: cEntity,
                                             priority: 0,
@@ -10971,8 +10986,8 @@ var EntitiesRenderManager;
                                             overrideShow: wasClustered ? false : null,
                                             name: cEntity.name,
                                             cdn: this.item.cdnEnabled,
-                                            historicDateTime: (_d = entity.Bruce) === null || _d === void 0 ? void 0 : _d.historicDateTime,
-                                            historicAttrKey: (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.historicAttrKey
+                                            historicDateTime: (_e = entity.Bruce) === null || _e === void 0 ? void 0 : _e.historicDateTime,
+                                            historicAttrKey: (_f = entity.Bruce) === null || _f === void 0 ? void 0 : _f.historicAttrKey
                                         };
                                         this.visualsManager.AddRego({
                                             rego: rego_1,
@@ -10983,10 +10998,11 @@ var EntitiesRenderManager;
                                         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.tagIds = ((_g = entity.Bruce) === null || _g === void 0 ? void 0 : _g["Layer.ID"]) ? [].concat(entity.Bruce["Layer.ID"]) : [];
+                                        rego.historicDateTime = (_h = entity.Bruce) === null || _h === void 0 ? void 0 : _h.historicDateTime;
+                                        rego.historicAttrKey = (_j = entity.Bruce) === null || _j === void 0 ? void 0 : _j.historicAttrKey;
                                         rego.cdn = this.item.cdnEnabled;
+                                        rego.schemaId = (_k = entity.Bruce) === null || _k === void 0 ? void 0 : _k.schemaId;
                                         // We manually trigger an update event since the graphic was updated but not recreated.
                                         this.visualsManager.OnUpdate.Trigger({
                                             type: VisualsRegister.EVisualUpdateType.Update,
@@ -11001,7 +11017,7 @@ var EntitiesRenderManager;
                                         menuItemId: this.item.id,
                                         requestRender: false
                                     });
-                                    (_j = this.clustering) === null || _j === void 0 ? void 0 : _j.RemoveEntity(id, false);
+                                    (_l = this.clustering) === null || _l === void 0 ? void 0 : _l.RemoveEntity(id, false);
                                 }
                             }
                             this.viewer.scene.requestRender();
@@ -14257,7 +14273,7 @@ var EntityFilterGetter;
         EStatus["Loading"] = "LOADING";
     })(EStatus = EntityFilterGetter.EStatus || (EntityFilterGetter.EStatus = {}));
     var Getter = /** @class */ (function () {
-        function Getter(api, viewer, viewPort, typeId, batchSize, attrFilter, historicAttrKey, viaCdn) {
+        function Getter(params) {
             this.onUpdate = null;
             this.LastStateUpdates = {};
             this.onStateUpdate = null;
@@ -14272,6 +14288,7 @@ var EntityFilterGetter;
             this.maxHeight = 100000;
             this.viewRect = null;
             this.viewCenter = null;
+            var api = params.api, viewer = params.viewer, viewPort = params.viewPort, typeId = params.typeId, batchSize = params.batchSize, attrFilter = params.attrFilter, historicAttrKey = params.historicAttrKey, viaCdn = params.viaCdn;
             this.api = api;
             this.typeId = typeId;
             this.historicAttrKey = historicAttrKey;
@@ -14663,6 +14680,7 @@ function createFilterGetterCacheKey(params) {
     cacheKey += params.typeId;
     cacheKey += params.batchSize;
     cacheKey += String(params.cdn);
+    cacheKey += params.schemaId ? params.schemaId : "";
     cacheKey += JSON.stringify(params.tagIds ? params.tagIds : []);
     cacheKey += params.historicAttrKey ? params.historicAttrKey : "";
     // This could potentially crash, but if it crashes here then it would crash during API request anyways.
@@ -14680,7 +14698,16 @@ var SharedGetters;
             var cacheKey = createFilterGetterCacheKey(params);
             var getter = this.data[cacheKey];
             if (!getter) {
-                getter = new EntityFilterGetter.Getter(params.api, params.viewer, params.monitor, params.typeId, params.batchSize, params.attrFilter, params.historicAttrKey, params.cdn);
+                getter = new EntityFilterGetter.Getter({
+                    api: params.api,
+                    viewer: params.viewer,
+                    viewPort: params.monitor,
+                    typeId: params.typeId,
+                    batchSize: params.batchSize,
+                    attrFilter: params.attrFilter,
+                    historicAttrKey: params.historicAttrKey,
+                    viaCdn: params.cdn
+                });
                 this.data[cacheKey] = getter;
                 /**
                  * Debug option.
@@ -24090,7 +24117,7 @@ var ViewRenderEngine;
     ViewRenderEngine.Render = Render;
 })(ViewRenderEngine || (ViewRenderEngine = {}));
 
-var VERSION = "3.8.5";
+var VERSION = "3.8.7";
 
 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