bruce-cesium 2.8.9 → 2.9.1

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, SceneMode, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, createOsmBuildings, SceneTransforms, KmlDataSource, OrthographicFrustum, EasingFunction, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidTerrainProvider, CesiumInspector, defined, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, GeometryInstance, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, GeometryInstance, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -6834,6 +6834,12 @@ var EntitiesLoadedRenderManager;
                                 })];
                         case 1:
                             cEntities = _b.sent();
+                            if (this.disposed) {
+                                this.visualsManager.RemoveRegos({
+                                    menuItemId: this.item.id
+                                });
+                                return [2 /*return*/];
+                            }
                             for (i = 0; i < entities.length; i++) {
                                 entity = entities[i];
                                 id = entity.Bruce.ID;
@@ -10011,17 +10017,8 @@ var RelationsRenderManager;
          * @param relation
          */
         Manager.prototype.shouldRenderRelation = function (relation) {
-            var _a, _b, _c, _d;
-            if ((_a = this.item.relations) === null || _a === void 0 ? void 0 : _a.length) {
-                // Find group for the same relationship type.
-                var typeRelations = this.item.relations.find(function (x) { return x.relationTypeId == relation["Relation.Type.ID"]; });
-                // See if group contains the parent entity ID.
-                if ((_b = typeRelations === null || typeRelations === void 0 ? void 0 : typeRelations.entityIds) === null || _b === void 0 ? void 0 : _b.find(function (x) { return x == relation["Principal.Entity.ID"]; })) {
-                    return true;
-                }
-            }
-            // Backwards compatability.
-            var renderedIds = (_d = (_c = this.item) === null || _c === void 0 ? void 0 : _c.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
+            var _a, _b;
+            var renderedIds = (_b = (_a = this.item) === null || _a === void 0 ? void 0 : _a.BruceEntity) === null || _b === void 0 ? void 0 : _b.EntityIds;
             if (!renderedIds) {
                 return false;
             }
@@ -12806,7 +12803,6 @@ function assertIteration$1(viewer, iteration) {
 }
 /**
  * Renders DATA_VERSION = 1 navigator.
- * param iteration
  * @param params
  * @param bookmark
  * @param view
@@ -12930,32 +12926,33 @@ function renderLegacyNavigator(iteration, params, bookmark, view) {
                     }
                     _f.label = 3;
                 case 3:
-                    if ((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length) {
-                        menuItem = {
-                            id: RELATION_MENU_ITEM_ID,
-                            Caption: "Entity relations",
-                            BruceEntity: {
-                                EntityIds: bSettings.drawnRelationEntityIDs
-                            },
-                            Type: MenuItem.EType.Relations
-                        };
-                        params.manager.RenderItem({
+                    if (!((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 5];
+                    menuItem = {
+                        id: RELATION_MENU_ITEM_ID,
+                        Caption: "Entity relations",
+                        BruceEntity: {
+                            EntityIds: bSettings.drawnRelationEntityIDs
+                        },
+                        Type: MenuItem.EType.Relations
+                    };
+                    return [4 /*yield*/, params.manager.RenderItem({
                             apiGetter: params.apiGetter,
                             getters: params.getters,
                             item: menuItem
-                        });
-                        if (!assertIteration$1(params.viewer, iteration)) {
-                            return [2 /*return*/];
-                        }
+                        })];
+                case 4:
+                    _f.sent();
+                    if (!assertIteration$1(params.viewer, iteration)) {
+                        return [2 /*return*/];
                     }
-                    return [2 /*return*/];
+                    _f.label = 5;
+                case 5: return [2 /*return*/];
             }
         });
     });
 }
 /**
  * Renders DATA_VERSION > 1 navigator.
- * @param iteration
  * @param params
  * @param bookmark
  * @param view
@@ -12963,7 +12960,7 @@ function renderLegacyNavigator(iteration, params, bookmark, view) {
 function renderNavigator(iteration, params, bookmark, view) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
     return __awaiter(this, void 0, void 0, function () {
-        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, curLabelledIds, toUnLabel, entityOpacityMap, entityId, opacity, imagery, legacyRelationIds, relations, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
+        var viewer, scene, vSettings, bSettings, defaults, camera, newLens, shouldBe2d, curIs2d, transition, pos, terrain, hillShades, baseColor, globeHidden, terrainWireframe, globeAlpha, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, selectedIds, hiddenIds, isolatedIds, labelledIds, curLabelledIds, toUnLabel, entityOpacityMap, entityId, opacity, imagery, renderedRelationEntityIds, curEnabled, newItemIds, _i, curEnabled_1, id, menuItem, gOcclusion;
         return __generator(this, function (_7) {
             switch (_7.label) {
                 case 0:
@@ -13249,20 +13246,16 @@ function renderNavigator(iteration, params, bookmark, view) {
                         tiles: imagery,
                         viewer: params.manager.Viewer,
                     });
-                    legacyRelationIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
-                    if (!legacyRelationIds) {
-                        legacyRelationIds = [];
-                    }
-                    relations = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedRelations;
-                    if (!relations) {
-                        relations = [];
+                    renderedRelationEntityIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
+                    if (!renderedRelationEntityIds) {
+                        renderedRelationEntityIds = [];
                     }
                     curEnabled = params.manager.GetEnabledItemIds();
                     newItemIds = (_5 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _5 !== void 0 ? _5 : [];
                     for (_i = 0, curEnabled_1 = curEnabled; _i < curEnabled_1.length; _i++) {
                         id = curEnabled_1[_i];
-                        if ((newItemIds.indexOf(id) === -1 && id != RELATION_MENU_ITEM_ID) ||
-                            (id == RELATION_MENU_ITEM_ID && !legacyRelationIds.length && !relations.length)) {
+                        if (newItemIds.indexOf(id) === -1 ||
+                            (id == RELATION_MENU_ITEM_ID && !renderedRelationEntityIds.length)) {
                             params.manager.RemoveItemById({
                                 menuItemId: id
                             });
@@ -13282,24 +13275,26 @@ function renderNavigator(iteration, params, bookmark, view) {
                     }
                     _7.label = 4;
                 case 4:
-                    if (legacyRelationIds.length || relations.length) {
-                        menuItem = {
-                            id: RELATION_MENU_ITEM_ID,
-                            Caption: "Entity relations",
-                            BruceEntity: {
-                                EntityIds: legacyRelationIds
-                            },
-                            relations: relations,
-                            Type: MenuItem.EType.Relations
-                        };
-                        params.manager.RenderItem({
+                    if (!renderedRelationEntityIds.length) return [3 /*break*/, 6];
+                    menuItem = {
+                        id: RELATION_MENU_ITEM_ID,
+                        Caption: "Entity relations",
+                        BruceEntity: {
+                            EntityIds: renderedRelationEntityIds
+                        },
+                        Type: MenuItem.EType.Relations
+                    };
+                    return [4 /*yield*/, params.manager.RenderItem({
                             getters: params.getters,
                             item: menuItem
-                        });
-                        if (!assertIteration$1(params.viewer, iteration)) {
-                            return [2 /*return*/];
-                        }
+                        })];
+                case 5:
+                    _7.sent();
+                    if (!assertIteration$1(params.viewer, iteration)) {
+                        return [2 /*return*/];
                     }
+                    _7.label = 6;
+                case 6:
                     gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                     if (gOcclusion == null) {
                         gOcclusion = (_6 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _6 === void 0 ? void 0 : _6.groundOcclusion;
@@ -16213,7 +16208,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.8.9";
+var VERSION$1 = "2.9.1";
 
 export { VERSION$1 as 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, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map