bruce-cesium 2.9.2 → 2.9.4

package/dist/bruce-cesium.umd.js

@@ -7435,6 +7435,18 @@
                     }
                     if (!pos3d) {
                         pos3d = getCurPos3d();
+                        if (pos3d === null || pos3d === void 0 ? void 0 : pos3d.x) {
+                            var carto = Cesium.Cartographic.fromCartesian(pos3d);
+                            if (!isNaN(carto === null || carto === void 0 ? void 0 : carto.latitude)) {
+                                // We reapply back to the tileset so we can reference this location later.
+                                // For example we can reference within editing tools in navigator.
+                                position.location = {
+                                    altitude: carto.height,
+                                    latitude: Cesium.Math.toDegrees(carto.latitude),
+                                    longitude: Cesium.Math.toDegrees(carto.longitude)
+                                };
+                            }
+                        }
                     }
                     var offset = getOffset(pos3d, transform.x, transform.y, transform.z);
                     if (bruceModels.Cartes.ValidateCartes3(offset)) {
@@ -9826,6 +9838,41 @@
                     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;
@@ -9840,22 +9887,162 @@
              * @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*/, bruceModels.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];
@@ -9865,9 +10052,8 @@
                                 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];
@@ -9880,50 +10066,37 @@
                                         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*/];
                         }
@@ -9951,7 +10124,7 @@
             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) {
@@ -9986,6 +10159,19 @@
                                 }
                                 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)) {
@@ -10020,8 +10206,8 @@
                                 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*/];
                         }
@@ -13188,7 +13374,7 @@
     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:
@@ -13486,8 +13672,26 @@
                         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) != bruceModels.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) != bruceModels.MenuItem.EType.Relationships) {
+                                    shouldRemove = true;
+                                }
+                            }
+                            else {
+                                shouldRemove = newItemIds.indexOf(id) === -1;
+                            }
+                            if (shouldRemove) {
                                 params.manager.RemoveItemById({
                                     menuItemId: id
                                 });
@@ -13508,19 +13712,32 @@
                         _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: bruceModels.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: bruceModels.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: bruceModels.MenuItem.EType.Relations
+                                };
+                                params.manager.RenderItem({
+                                    getters: params.getters,
+                                    item: menuItem
+                                });
+                            }
                             if (!assertIteration$1(params.viewer, iteration)) {
                                 return [2 /*return*/];
                             }
@@ -16436,7 +16653,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.9.2";
+    var VERSION$1 = "2.9.4";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;