bruce-cesium 2.9.2 → 2.9.3

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, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, Cesium3DTileColorBlendMode, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, EllipsoidGeodesic, EllipsoidTerrainProvider, sampleTerrainMostDetailed, defined, Cesium3DTileset, Model, CesiumInspector, PolygonPipeline, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Matrix3, IonResource, Ion, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, Cesium3DTileStyle, createOsmBuildings, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, EllipsoidTerrainProvider, CesiumInspector, defined, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, PolygonPipeline, Matrix4, Matrix3, IonResource, Ion, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -9871,6 +9871,41 @@ var RelationsRenderManager;
                 relations: this.item.relations
             });
         };
+        /**
+         * Constructs the rendered state of the menu item from the visuals register.
+         * This will let us see the difference between what the menu item should render vs has rendered.
+         */
+        Manager.prototype.getRenderedState = function () {
+            var items = [];
+            var regos = this.register.GetRegos({
+                menuItemId: this.item.id
+            });
+            var _loop_1 = function (i) {
+                var rego = regos[i];
+                if (!(rego === null || rego === void 0 ? void 0 : rego.relation)) {
+                    return "continue";
+                }
+                var relationTypeId = rego.relation["Relation.Type.ID"];
+                if (!relationTypeId) {
+                    return "continue";
+                }
+                var group = items.find(function (x) { return x.relationTypeId == relationTypeId; });
+                var entityId = rego.relation["Principal.Entity.ID"];
+                if (!group) {
+                    items.push({
+                        relationTypeId: relationTypeId,
+                        entityIds: [entityId]
+                    });
+                }
+                else if (!group.entityIds.includes(entityId)) {
+                    group.entityIds.push(entityId);
+                }
+            };
+            for (var i = 0; i < regos.length; i++) {
+                _loop_1(i);
+            }
+            return items;
+        };
         Manager.prototype.Dispose = function () {
             if (this.disposed) {
                 return;
@@ -9885,22 +9920,162 @@ var RelationsRenderManager;
          * @param params
          */
         Manager.prototype.ReRender = function (params) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var entityIds, force;
-                return __generator(this, function (_a) {
-                    entityIds = params.entityIds, force = params.force;
-                    return [2 /*return*/];
+                var entityIds, force, toReRender, toReRenderDataIds, regos, groups, _loop_2, i;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            entityIds = params.entityIds, force = params.force;
+                            toReRenderDataIds = [];
+                            if (entityIds == null) {
+                                toReRender = this.item.relations;
+                            }
+                            else {
+                                toReRender = [];
+                                regos = this.register.GetRegos({
+                                    menuItemId: this.item.id
+                                });
+                                groups = this.item.relations;
+                                _loop_2 = function (i) {
+                                    var group = groups[i];
+                                    var toRenderEntityIds = [];
+                                    if ((_a = group.entityIds) === null || _a === void 0 ? void 0 : _a.length) {
+                                        for (var i_1 = 0; i_1 < group.entityIds.length; i_1++) {
+                                            var groupEntityId = group.entityIds[i_1];
+                                            // Primary ID matches a re-render entity ID.
+                                            if (entityIds.includes(groupEntityId)) {
+                                                toRenderEntityIds.push(groupEntityId);
+                                            }
+                                        }
+                                    }
+                                    var groupRegos = regos.filter(function (x) { var _a; return ((_a = x.relation) === null || _a === void 0 ? void 0 : _a["Relation.Type.ID"]) == group.relationTypeId; });
+                                    if (groupRegos.length) {
+                                        for (var i_2 = 0; i_2 < groupRegos.length; i_2++) {
+                                            var rego = groupRegos[i_2];
+                                            var dataEntityId = rego.entityId;
+                                            // Data ID matches a re-render entity ID.
+                                            if (dataEntityId && entityIds.includes(dataEntityId) && rego.relation) {
+                                                // toRenderEntityIds.push(rego.relation["Principal.Entity.ID"]);
+                                                toReRenderDataIds.push(dataEntityId);
+                                            }
+                                        }
+                                    }
+                                    if (toRenderEntityIds.length) {
+                                        toReRender.push({
+                                            relationTypeId: group.relationTypeId,
+                                            entityIds: toRenderEntityIds
+                                        });
+                                    }
+                                };
+                                for (i = 0; i < groups.length; i++) {
+                                    _loop_2(i);
+                                }
+                            }
+                            if (!toReRenderDataIds.length) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.queueRenderDataIds({
+                                    dataEntityIds: toReRenderDataIds
+                                })];
+                        case 1:
+                            _b.sent();
+                            _b.label = 2;
+                        case 2:
+                            if (!toReRender.length) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.queueRenderRelations({
+                                    relations: toReRender,
+                                    force: true
+                                })];
+                        case 3:
+                            _b.sent();
+                            _b.label = 4;
+                        case 4: return [2 /*return*/];
+                    }
                 });
             });
         };
-        Manager.prototype.queueRenderRelations = function (params) {
+        Manager.prototype.queueRenderDataIds = function (params) {
             return __awaiter(this, void 0, void 0, function () {
-                var relations, allIds_1, _i, relations_1, relation, entityIds, toRender, i, entityId, data, j, relation, e_1;
+                var dataEntityIds, i, data, e_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            _a.trys.push([0, 5, , 6]);
-                            relations = params.relations;
+                            dataEntityIds = params.dataEntityIds;
+                            i = 0;
+                            _a.label = 1;
+                        case 1:
+                            if (!(i < dataEntityIds.length)) return [3 /*break*/, 6];
+                            _a.label = 2;
+                        case 2:
+                            _a.trys.push([2, 4, , 5]);
+                            return [4 /*yield*/, EntityRelation.GetByDataEntityId({
+                                    entityId: dataEntityIds[i],
+                                    api: this.apiGetter.getApi()
+                                })];
+                        case 3:
+                            data = _a.sent();
+                            if (data.relation) {
+                                if (this.shouldRenderRelation(data.relation)) {
+                                    this.onGetterUpdate([data.relation]);
+                                }
+                            }
+                            return [3 /*break*/, 5];
+                        case 4:
+                            e_1 = _a.sent();
+                            console.error(e_1);
+                            return [3 /*break*/, 5];
+                        case 5:
+                            i++;
+                            return [3 /*break*/, 1];
+                        case 6: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Manager.prototype.queueRenderRelations = function (params) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function () {
+                var relations, force, renderedState, toRender, _loop_3, i, allIds_1, _i, relations_1, relation, entityIds, i, entityId, data, toRender, j, relation, rego, e_2;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            _b.trys.push([0, 5, , 6]);
+                            relations = params.relations, force = params.force;
+                            if (force != true) {
+                                renderedState = this.getRenderedState();
+                                toRender = [];
+                                _loop_3 = function (i) {
+                                    var typeId = relations[i].relationTypeId;
+                                    var group = renderedState.find(function (x) { return x.relationTypeId == typeId; });
+                                    if (!group || !((_a = group.entityIds) === null || _a === void 0 ? void 0 : _a.length)) {
+                                        toRender.push(relations[i]);
+                                        return "continue";
+                                    }
+                                    var entityIds = relations[i].entityIds;
+                                    if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
+                                        return "continue";
+                                    }
+                                    var toRenderEntityIds = [];
+                                    for (var j = 0; j < entityIds.length; j++) {
+                                        var entityId = entityIds[j];
+                                        if (!group.entityIds.includes(entityId) && !toRenderEntityIds.includes(entityId)) {
+                                            toRenderEntityIds.push(entityId);
+                                        }
+                                    }
+                                    if (toRenderEntityIds.length) {
+                                        toRender.push({
+                                            relationTypeId: typeId,
+                                            entityIds: toRenderEntityIds
+                                        });
+                                    }
+                                };
+                                for (i = 0; i < relations.length; i++) {
+                                    _loop_3(i);
+                                }
+                                if (!toRender.length) {
+                                    return [2 /*return*/];
+                                }
+                                relations = toRender;
+                            }
                             allIds_1 = [];
                             for (_i = 0, relations_1 = relations; _i < relations_1.length; _i++) {
                                 relation = relations_1[_i];
@@ -9910,9 +10085,8 @@ var RelationsRenderManager;
                             allIds_1 = allIds_1.filter(function (id, index) {
                                 return allIds_1.indexOf(id) === index;
                             });
-                            toRender = [];
                             i = 0;
-                            _a.label = 1;
+                            _b.label = 1;
                         case 1:
                             if (!(i < allIds_1.length)) return [3 /*break*/, 4];
                             entityId = allIds_1[i];
@@ -9925,50 +10099,37 @@ var RelationsRenderManager;
                                     api: this.apiGetter.getApi()
                                 })];
                         case 2:
-                            data = _a.sent();
-                            console.log("get relations", data);
+                            data = _b.sent();
+                            if (this.disposed || this.viewer.isDestroyed()) {
+                                return [2 /*return*/];
+                            }
+                            toRender = [];
                             for (j = 0; j < data.relations.length; j++) {
                                 relation = data.relations[j];
                                 if (this.shouldRenderRelation(relation)) {
+                                    if (force != true) {
+                                        rego = this.register.GetRego({
+                                            relation: relation,
+                                            menuItemId: this.item.id
+                                        });
+                                        if (rego === null || rego === void 0 ? void 0 : rego.visual) {
+                                            continue;
+                                        }
+                                    }
                                     toRender.push(relation);
                                 }
                             }
-                            _a.label = 3;
-                        case 3:
-                            i++;
-                            return [3 /*break*/, 1];
-                        case 4:
-                            console.log("all render", toRender);
-                            // Relations are not being returned??
-                            // const data = await Entity.GetListByIds({
-                            //     entityIds: allIds,
-                            //     expandRelations: true,
-                            //     api: this.apiGetter.getApi()
-                            // });
-                            // for (let i = 0; i < data.entities.length; i++) {
-                            //     const entity = data.entities[i];
-                            //     if (entity?.Bruce?.relations?.length) {
-                            //         const eRelations = entity.Bruce.relations;
-                            //         for (let j = 0; j < eRelations.length; j++) {
-                            //             const eRelation = eRelations[j];
-                            //             const relation: EntityRelation.IRelation = {
-                            //                 "Principal.Entity.ID": entity.Bruce.ID,
-                            //                 "Related.Entity.ID": eRelation["Other.Entity.ID"],
-                            //                 "Relation.Type.ID": eRelation["Relation.Type.ID"]
-                            //             };
-                            //             if (this.shouldRenderRelation(relation)) {
-                            //                 toRender.push(relation);
-                            //             }
-                            //         }
-                            //     }
-                            // }
                             if (toRender.length) {
                                 this.onGetterUpdate(toRender);
                             }
-                            return [3 /*break*/, 6];
+                            _b.label = 3;
+                        case 3:
+                            i++;
+                            return [3 /*break*/, 1];
+                        case 4: return [3 /*break*/, 6];
                         case 5:
-                            e_1 = _a.sent();
-                            console.error(e_1);
+                            e_2 = _b.sent();
+                            console.error(e_2);
                             return [3 /*break*/, 6];
                         case 6: return [2 /*return*/];
                     }
@@ -9996,7 +10157,7 @@ var RelationsRenderManager;
         Manager.prototype.onGetterUpdate = function (relations) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var killCEntity, cEntities, key, i, relation, key, cEntity, visual, e_2;
+                var killCEntity, cEntities, key, i, relation, rego, key, cEntity, visual, e_3;
                 var _this = this;
                 return __generator(this, function (_c) {
                     switch (_c.label) {
@@ -10031,6 +10192,19 @@ var RelationsRenderManager;
                             }
                             for (i = 0; i < relations.length; i++) {
                                 relation = relations[i];
+                                rego = this.register.GetRego({
+                                    menuItemId: this.item.id,
+                                    relation: relation
+                                });
+                                if (rego) {
+                                    this.register.RemoveRegos({
+                                        entityId: rego.entityId,
+                                        menuItemId: this.item.id,
+                                        relation: relation,
+                                        requestRender: false,
+                                        doUpdate: true
+                                    });
+                                }
                                 key = RelationRenderEngine.GetRenderGroupId(relation);
                                 cEntity = cEntities[key];
                                 if (cEntity && this.shouldRenderRelation(relation)) {
@@ -10065,8 +10239,8 @@ var RelationsRenderManager;
                             this.viewer.scene.requestRender();
                             return [3 /*break*/, 3];
                         case 2:
-                            e_2 = _c.sent();
-                            console.error(e_2);
+                            e_3 = _c.sent();
+                            console.error(e_3);
                             return [3 /*break*/, 3];
                         case 3: return [2 /*return*/];
                     }
@@ -13244,7 +13418,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, legacyRelationIds, relations, curEnabled, newItemIds, _i, curEnabled_1, id, shouldRemove, rendered, menuItem, menuItem, gOcclusion;
         return __generator(this, function (_7) {
             switch (_7.label) {
                 case 0:
@@ -13542,8 +13716,26 @@ function renderNavigator(iteration, params, bookmark, view) {
                     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)) {
+                        shouldRemove = void 0;
+                        if (id == RELATION_MENU_ITEM_ID) {
+                            rendered = params.manager.GetEnabledItem(id);
+                            shouldRemove = false;
+                            if (!legacyRelationIds.length && !relations.length) {
+                                shouldRemove = true;
+                            }
+                            // If we're about to render legacy relationships but a non-legacy item is currently enabled then we remove it.
+                            else if (legacyRelationIds.length && (rendered === null || rendered === void 0 ? void 0 : rendered.type) != MenuItem.EType.Relations) {
+                                shouldRemove = true;
+                            }
+                            // If we're about to render non-legacy relationships but a legacy item is currently enabled then we remove it.
+                            else if (relations.length && (rendered === null || rendered === void 0 ? void 0 : rendered.type) != MenuItem.EType.Relationships) {
+                                shouldRemove = true;
+                            }
+                        }
+                        else {
+                            shouldRemove = newItemIds.indexOf(id) === -1;
+                        }
+                        if (shouldRemove) {
                             params.manager.RemoveItemById({
                                 menuItemId: id
                             });
@@ -13564,19 +13756,32 @@ 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({
-                            getters: params.getters,
-                            item: menuItem
-                        });
+                        if (relations.length) {
+                            menuItem = {
+                                id: RELATION_MENU_ITEM_ID,
+                                Caption: "Entity relations",
+                                relations: relations,
+                                Type: MenuItem.EType.Relationships
+                            };
+                            params.manager.RenderItem({
+                                getters: params.getters,
+                                item: menuItem
+                            });
+                        }
+                        else if (legacyRelationIds.length) {
+                            menuItem = {
+                                id: RELATION_MENU_ITEM_ID,
+                                Caption: "Entity relations",
+                                BruceEntity: {
+                                    EntityIds: legacyRelationIds
+                                },
+                                Type: MenuItem.EType.Relations
+                            };
+                            params.manager.RenderItem({
+                                getters: params.getters,
+                                item: menuItem
+                            });
+                        }
                         if (!assertIteration$1(params.viewer, iteration)) {
                             return [2 /*return*/];
                         }
@@ -16494,7 +16699,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.9.2";
+var VERSION$1 = "2.9.3";
 
 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