bruce-cesium 2.7.7 → 2.7.9

package/dist/bruce-cesium.umd.js

@@ -3157,15 +3157,15 @@
             var siblings = [p1Entity, p2Entity];
             this.parabola = parabola;
             this.siblings = siblings;
+            this.viewer.entities.add(this.parabola);
+            this.viewer.entities.add(p1Entity);
+            this.viewer.entities.add(p2Entity);
         };
         CesiumParabola.prototype.Animate = function () {
             var _this = this;
             if (this.disposed) {
                 return null;
             }
-            if (this.parabola && !this.viewer.entities.contains(this.parabola)) {
-                this.viewer.entities.add(this.parabola);
-            }
             var retry = false;
             if (!this.curPos1 || !this.curPos2 || !bruceModels.Cartes.ValidateCartes3(this.curPos1) || !bruceModels.Cartes.ValidateCartes3(this.curPos2)) {
                 retry = true;
@@ -3183,14 +3183,6 @@
                     siblings: this.siblings
                 };
             }
-            var cEntities = [
-                this.parabola
-            ].concat(this.siblings);
-            cEntities.forEach(function (e) {
-                if (e && !_this.viewer.entities.contains(e)) {
-                    _this.viewer.entities.add(e);
-                }
-            });
             var RATE_PER_SECOND = 1000 / 40;
             var SEC_DURATION = this.duration;
             var HEIGHT_DISTANCE_RATIO = this.heightDistanceRatio;
@@ -3443,6 +3435,67 @@
     function colorToCColor$1(color) {
         return new Cesium.Color(color.red ? color.red / 255 : 0, color.green ? color.green / 255 : 0, color.blue ? color.blue / 255 : 0, color.alpha);
     }
+    function getStyle$1(api, typeId, styleId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var style, e_1, type, e_2, hideError, error, code;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        style = null;
+                        if (!styleId) return [3 /*break*/, 4];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, bruceModels.Style.Get({
+                                api: api,
+                                styleId: styleId
+                            })];
+                    case 2:
+                        style = (_a.sent()).style;
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_1 = _a.sent();
+                        console.error(e_1);
+                        return [3 /*break*/, 4];
+                    case 4:
+                        if (!(!style && typeId)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, bruceModels.EntityType.Get({
+                                api: api,
+                                entityTypeId: typeId
+                            })];
+                    case 5:
+                        type = (_a.sent()).entityType;
+                        if (!type["DisplaySetting.ID"]) return [3 /*break*/, 9];
+                        _a.label = 6;
+                    case 6:
+                        _a.trys.push([6, 8, , 9]);
+                        return [4 /*yield*/, bruceModels.Style.Get({
+                                api: api,
+                                styleId: type["DisplaySetting.ID"]
+                            })];
+                    case 7:
+                        style = (_a.sent()).style;
+                        return [3 /*break*/, 9];
+                    case 8:
+                        e_2 = _a.sent();
+                        hideError = false;
+                        // TODO: we need a util for extracting code + message rather than writing all this every time.
+                        if (e_2 && typeof e_2 == "object" && e_2.ERROR) {
+                            error = e_2.ERROR;
+                            code = error && typeof error == "object" ? error.Code : "";
+                            // Avoiding logging a common error.
+                            // This happens when rendering entities that don't have records.
+                            hideError = String(code).toLowerCase() == "notfound";
+                        }
+                        if (!hideError) {
+                            console.error(e_2);
+                        }
+                        return [3 /*break*/, 9];
+                    case 9: return [2 /*return*/, style];
+                }
+            });
+        });
+    }
     var RelationRenderEngine;
     (function (RelationRenderEngine) {
         function GetRenderGroupId(relation) {
@@ -3451,81 +3504,55 @@
         RelationRenderEngine.GetRenderGroupId = GetRenderGroupId;
         function Render(params) {
             return __awaiter(this, void 0, void 0, function () {
-                var apiGetter, viewer, visualRegister, menuItemId, relations, api, rendered, i, relation, fromEntity, toEntity, dataEntity, _a, relationType, styleId, typeId, entityType, _b, style, _c, cEntity;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var apiGetter, viewer, visualRegister, menuItemId, relations, api, rendered, i, relation, fromEntity, toEntity, dataEntity, _a, relationType, style, cEntity, e_3;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
                         case 0:
                             apiGetter = params.apiGetter, viewer = params.viewer, visualRegister = params.visualRegister, menuItemId = params.menuItemId, relations = params.relations;
                             api = apiGetter.getApi(apiGetter.accountId);
                             rendered = {};
                             i = 0;
-                            _d.label = 1;
+                            _b.label = 1;
                         case 1:
-                            if (!(i < relations.length)) return [3 /*break*/, 17];
+                            if (!(i < relations.length)) return [3 /*break*/, 13];
+                            _b.label = 2;
+                        case 2:
+                            _b.trys.push([2, 11, , 12]);
                             relation = relations[i];
                             return [4 /*yield*/, bruceModels.Entity.Get({
                                     api: api,
                                     entityId: relation["Principal.Entity.ID"],
                                 })];
-                        case 2:
-                            fromEntity = (_d.sent()).entity;
+                        case 3:
+                            fromEntity = (_b.sent()).entity;
                             return [4 /*yield*/, bruceModels.Entity.Get({
                                     api: api,
                                     entityId: relation["Related.Entity.ID"],
                                 })];
-                        case 3:
-                            toEntity = (_d.sent()).entity;
-                            if (!relation["Data.Entity.ID"]) return [3 /*break*/, 5];
+                        case 4:
+                            toEntity = (_b.sent()).entity;
+                            if (!relation["Data.Entity.ID"]) return [3 /*break*/, 6];
                             return [4 /*yield*/, bruceModels.Entity.Get({
                                     api: api,
                                     entityId: relation["Data.Entity.ID"]
                                 })];
-                        case 4:
-                            _a = (_d.sent()).entity;
-                            return [3 /*break*/, 6];
                         case 5:
-                            _a = null;
-                            _d.label = 6;
+                            _a = (_b.sent()).entity;
+                            return [3 /*break*/, 7];
                         case 6:
+                            _a = null;
+                            _b.label = 7;
+                        case 7:
                             dataEntity = _a;
                             return [4 /*yield*/, bruceModels.EntityRelationType.Get({
                                     api: api,
                                     relationTypeId: relation["Relation.Type.ID"]
                                 })];
-                        case 7:
-                            relationType = (_d.sent()).relationType;
-                            styleId = Number(relationType === null || relationType === void 0 ? void 0 : relationType.EntityDisplaySettingID);
-                            if (!!styleId) return [3 /*break*/, 11];
-                            typeId = relationType === null || relationType === void 0 ? void 0 : relationType["Relation.EntityType.ID"];
-                            if (!typeId) return [3 /*break*/, 9];
-                            return [4 /*yield*/, bruceModels.EntityType.Get({
-                                    api: api,
-                                    entityTypeId: typeId
-                                })];
                         case 8:
-                            _b = (_d.sent()).entityType;
-                            return [3 /*break*/, 10];
+                            relationType = (_b.sent()).relationType;
+                            return [4 /*yield*/, getStyle$1(api, relationType === null || relationType === void 0 ? void 0 : relationType["Relation.EntityType.ID"], Number(relationType === null || relationType === void 0 ? void 0 : relationType.EntityDisplaySettingID))];
                         case 9:
-                            _b = null;
-                            _d.label = 10;
-                        case 10:
-                            entityType = _b;
-                            styleId = entityType === null || entityType === void 0 ? void 0 : entityType["DisplaySetting.ID"];
-                            _d.label = 11;
-                        case 11:
-                            if (!styleId) return [3 /*break*/, 13];
-                            return [4 /*yield*/, bruceModels.Style.Get({
-                                    api: api,
-                                    styleId: styleId
-                                })];
-                        case 12:
-                            _c = (_d.sent()).style;
-                            return [3 /*break*/, 14];
-                        case 13:
-                            _c = null;
-                            _d.label = 14;
-                        case 14:
-                            style = _c;
+                            style = _b.sent();
                             return [4 /*yield*/, Parabola.Render({
                                     dataEntity: dataEntity,
                                     fromEntity: fromEntity,
@@ -3536,15 +3563,19 @@
                                     visualRegister: visualRegister,
                                     apiGetter: apiGetter
                                 })];
-                        case 15:
-                            cEntity = _d.sent();
+                        case 10:
+                            cEntity = _b.sent();
                             cEntity._renderGroup = GetRenderGroupId(relation);
                             rendered[GetRenderGroupId(relation)] = cEntity;
-                            _d.label = 16;
-                        case 16:
+                            return [3 /*break*/, 12];
+                        case 11:
+                            e_3 = _b.sent();
+                            console.error(e_3);
+                            return [3 /*break*/, 12];
+                        case 12:
                             i++;
                             return [3 /*break*/, 1];
-                        case 17: return [2 /*return*/, rendered];
+                        case 13: return [2 /*return*/, rendered];
                     }
                 });
             });
@@ -3572,7 +3603,7 @@
                         toPos = null;
                         updatingPosses = false;
                         updatePosses = function () { return __awaiter(_this, void 0, void 0, function () {
-                            var e_1;
+                            var e_4;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
@@ -3609,8 +3640,8 @@
                                         toPos = _a.sent();
                                         return [3 /*break*/, 5];
                                     case 4:
-                                        e_1 = _a.sent();
-                                        console.error(e_1);
+                                        e_4 = _a.sent();
+                                        console.error(e_4);
                                         return [3 /*break*/, 5];
                                     case 5:
                                         updatingPosses = false;
@@ -6902,7 +6933,9 @@
                             etc = settings.etc;
                             etc = __assign({}, etc);
                             if (!ionId) return [3 /*break*/, 2];
-                            return [4 /*yield*/, Cesium.IonResource.fromAssetId(EnsureNumber(ionId))];
+                            return [4 /*yield*/, Cesium.IonResource.fromAssetId(EnsureNumber(ionId), {
+                                    accessToken: params.ionAccessToken ? params.ionAccessToken : Cesium.Ion.defaultAccessToken
+                                })];
                         case 1:
                             loadUrl = (_a.sent());
                             return [3 /*break*/, 3];
@@ -8247,135 +8280,129 @@
                 configurable: true
             });
             Manager.prototype.Init = function (params) {
+                var _this = this;
                 var _a;
-                return __awaiter(this, void 0, void 0, function () {
-                    var counter, tilesetId;
+                this.initCounter += 1;
+                var counter = this.initCounter;
+                if (this.disposed) {
+                    return;
+                }
+                if (params === null || params === void 0 ? void 0 : params.item) {
+                    this.item = params.item;
+                }
+                var tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
+                if (!tilesetId) {
+                    return;
+                }
+                (function () { return __awaiter(_this, void 0, void 0, function () {
+                    var canAccess, e_1, accountId, api, tileset, cTileset, _a, attenuation, attenuationMax;
                     var _this = this;
-                    return __generator(this, function (_b) {
-                        this.initCounter += 1;
-                        counter = this.initCounter;
-                        if (this.disposed) {
-                            return [2 /*return*/];
-                        }
-                        if (params === null || params === void 0 ? void 0 : params.item) {
-                            this.item = params.item;
-                        }
-                        tilesetId = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID;
-                        if (!tilesetId) {
-                            return [2 /*return*/];
-                        }
-                        (function () { return __awaiter(_this, void 0, void 0, function () {
-                            var canAccess, e_1, accountId, api, tileset, cTileset, _a, attenuation, attenuationMax;
-                            var _this = this;
-                            var _b, _c, _d;
-                            return __generator(this, function (_e) {
-                                switch (_e.label) {
-                                    case 0:
-                                        if (!!this.cTileset) return [3 /*break*/, 9];
-                                        if (!tilesetId) return [3 /*break*/, 5];
-                                        canAccess = false;
-                                        _e.label = 1;
-                                    case 1:
-                                        _e.trys.push([1, 3, , 4]);
-                                        return [4 /*yield*/, bruceModels.Tileset.Publish.IsAccessAllowed({
-                                                sourceAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
-                                                tilesetId: tilesetId,
-                                                forAccountId: this.getters.GetAccountId(),
-                                                api: this.getters.GetGlobalApi()
-                                            })];
-                                    case 2:
-                                        canAccess = _e.sent();
-                                        return [3 /*break*/, 4];
-                                    case 3:
-                                        e_1 = _e.sent();
-                                        console.error(e_1);
-                                        return [3 /*break*/, 4];
-                                    case 4:
-                                        if (!canAccess) {
-                                            console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID, "."));
-                                            return [2 /*return*/];
-                                        }
-                                        return [3 /*break*/, 6];
-                                    case 5:
-                                        console.warn("No tileset id found. Skipping access check.");
-                                        _e.label = 6;
-                                    case 6:
-                                        if (this.disposed || counter !== this.initCounter) {
-                                            return [2 /*return*/];
-                                        }
-                                        accountId = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID;
-                                        if (!accountId) {
-                                            accountId = this.getters.GetAccountId();
-                                        }
-                                        api = this.getters.GetBruceApi({
-                                            accountId: accountId
-                                        });
-                                        return [4 /*yield*/, bruceModels.Tileset.Get({
-                                                api: api,
-                                                tilesetId: tilesetId
-                                            })];
-                                    case 7:
-                                        tileset = (_e.sent()).tileset;
-                                        if (!tileset || this.disposed || counter !== this.initCounter) {
-                                            return [2 /*return*/];
-                                        }
-                                        this.typeId = tileset.settings.entityTypeId;
-                                        _a = this;
-                                        return [4 /*yield*/, exports.TilesetRenderEngine.Render({
-                                                apiGetter: this.getters.GetBruceGetter(),
-                                                tileset: tileset,
-                                                viewer: this.viewer,
-                                                accountId: accountId,
-                                                viaCdn: this.item.cdnEnabled
-                                            })];
-                                    case 8:
-                                        cTileset = _a.cTileset = _e.sent();
-                                        if (this.disposed) {
-                                            this.doDispose();
-                                            return [2 /*return*/];
-                                        }
-                                        this.viewer.scene.requestRender();
-                                        cTileset.readyPromise.then(function () {
-                                            try {
-                                                if (_this.disposed || _this.viewer.isDestroyed()) {
-                                                    return;
-                                                }
-                                                _this.onCTilesetLoad();
-                                                _this.viewer.scene.requestRender();
-                                            }
-                                            catch (e) {
-                                                console.error(e);
-                                            }
-                                        });
-                                        cTileset.tileLoad.addEventListener(function (tile) {
-                                            _this.mapCTile(tile);
-                                        });
-                                        _e.label = 9;
-                                    case 9:
-                                        attenuation = this.item.attenuation;
-                                        if (!attenuation && attenuation != false) {
-                                            attenuation = true;
-                                        }
-                                        attenuationMax = this.item.attenuationMax;
-                                        if (isNaN(attenuationMax)) {
-                                            attenuationMax = 20;
+                    var _b, _c, _d;
+                    return __generator(this, function (_e) {
+                        switch (_e.label) {
+                            case 0:
+                                if (!!this.cTileset) return [3 /*break*/, 9];
+                                if (!tilesetId) return [3 /*break*/, 5];
+                                canAccess = false;
+                                _e.label = 1;
+                            case 1:
+                                _e.trys.push([1, 3, , 4]);
+                                return [4 /*yield*/, bruceModels.Tileset.Publish.IsAccessAllowed({
+                                        sourceAccountId: (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID,
+                                        tilesetId: tilesetId,
+                                        forAccountId: this.getters.GetAccountId(),
+                                        api: this.getters.GetGlobalApi()
+                                    })];
+                            case 2:
+                                canAccess = _e.sent();
+                                return [3 /*break*/, 4];
+                            case 3:
+                                e_1 = _e.sent();
+                                console.error(e_1);
+                                return [3 /*break*/, 4];
+                            case 4:
+                                if (!canAccess) {
+                                    console.warn("Cannot access tileset: ".concat(tilesetId, ", from account: ").concat((_c = this.item.tileset) === null || _c === void 0 ? void 0 : _c.ClientAccountID, "."));
+                                    return [2 /*return*/];
+                                }
+                                return [3 /*break*/, 6];
+                            case 5:
+                                console.warn("No tileset id found. Skipping access check.");
+                                _e.label = 6;
+                            case 6:
+                                if (this.disposed || counter !== this.initCounter) {
+                                    return [2 /*return*/];
+                                }
+                                accountId = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID;
+                                if (!accountId) {
+                                    accountId = this.getters.GetAccountId();
+                                }
+                                api = this.getters.GetBruceApi({
+                                    accountId: accountId
+                                });
+                                return [4 /*yield*/, bruceModels.Tileset.Get({
+                                        api: api,
+                                        tilesetId: tilesetId
+                                    })];
+                            case 7:
+                                tileset = (_e.sent()).tileset;
+                                if (!tileset || this.disposed || counter !== this.initCounter) {
+                                    return [2 /*return*/];
+                                }
+                                this.typeId = tileset.settings.entityTypeId;
+                                _a = this;
+                                return [4 /*yield*/, exports.TilesetRenderEngine.Render({
+                                        apiGetter: this.getters.GetBruceGetter(),
+                                        tileset: tileset,
+                                        viewer: this.viewer,
+                                        accountId: accountId,
+                                        viaCdn: this.item.cdnEnabled
+                                    })];
+                            case 8:
+                                cTileset = _a.cTileset = _e.sent();
+                                if (this.disposed) {
+                                    this.doDispose();
+                                    return [2 /*return*/];
+                                }
+                                this.viewer.scene.requestRender();
+                                cTileset.readyPromise.then(function () {
+                                    try {
+                                        if (_this.disposed || _this.viewer.isDestroyed()) {
+                                            return;
                                         }
-                                        this.cTileset.readyPromise.then(function () {
-                                            exports.TilesetRenderEngine.ApplySettings({
-                                                cTileset: _this.cTileset,
-                                                settings: {
-                                                    attenuation: attenuation,
-                                                    maximumAttenuation: attenuationMax
-                                                }
-                                            });
-                                        });
-                                        return [2 /*return*/];
+                                        _this.onCTilesetLoad();
+                                        _this.viewer.scene.requestRender();
+                                    }
+                                    catch (e) {
+                                        console.error(e);
+                                    }
+                                });
+                                cTileset.tileLoad.addEventListener(function (tile) {
+                                    _this.mapCTile(tile);
+                                });
+                                _e.label = 9;
+                            case 9:
+                                attenuation = this.item.attenuation;
+                                if (!attenuation && attenuation != false) {
+                                    attenuation = true;
                                 }
-                            });
-                        }); })();
-                        return [2 /*return*/];
+                                attenuationMax = this.item.attenuationMax;
+                                if (isNaN(attenuationMax)) {
+                                    attenuationMax = 20;
+                                }
+                                this.cTileset.readyPromise.then(function () {
+                                    exports.TilesetRenderEngine.ApplySettings({
+                                        cTileset: _this.cTileset,
+                                        settings: {
+                                            attenuation: attenuation,
+                                            maximumAttenuation: attenuationMax
+                                        }
+                                    });
+                                });
+                                return [2 /*return*/];
+                        }
                     });
-                });
+                }); })();
             };
             Manager.prototype.Dispose = function () {
                 if (this.disposed) {
@@ -8807,15 +8834,15 @@
                 (function () { return __awaiter(_this, void 0, void 0, function () {
                     var canAccess, e_3, _a, tileset, type, _b, LEGACY_TYPES, legacyTileset, _c, accountId, _d, _e;
                     var _this = this;
-                    var _f, _g, _h, _j, _k, _l, _m;
-                    return __generator(this, function (_o) {
-                        switch (_o.label) {
+                    var _f, _g, _h, _j, _k, _l, _m, _o;
+                    return __generator(this, function (_p) {
+                        switch (_p.label) {
                             case 0:
                                 if (!tilesetId) return [3 /*break*/, 5];
                                 canAccess = false;
-                                _o.label = 1;
+                                _p.label = 1;
                             case 1:
-                                _o.trys.push([1, 3, , 4]);
+                                _p.trys.push([1, 3, , 4]);
                                 return [4 /*yield*/, bruceModels.Tileset.Publish.IsAccessAllowed({
                                         sourceAccountId: (_f = this.item.tileset) === null || _f === void 0 ? void 0 : _f.ClientAccountID,
                                         tilesetId: tilesetId,
@@ -8823,10 +8850,10 @@
                                         api: this.getters.GetGlobalApi()
                                     })];
                             case 2:
-                                canAccess = _o.sent();
+                                canAccess = _p.sent();
                                 return [3 /*break*/, 4];
                             case 3:
-                                e_3 = _o.sent();
+                                e_3 = _p.sent();
                                 console.error(e_3);
                                 return [3 /*break*/, 4];
                             case 4:
@@ -8837,7 +8864,7 @@
                                 return [3 /*break*/, 6];
                             case 5:
                                 console.warn("No tileset id found. Skipping access check.");
-                                _o.label = 6;
+                                _p.label = 6;
                             case 6:
                                 if (!tilesetId) return [3 /*break*/, 8];
                                 return [4 /*yield*/, getTileset({
@@ -8845,11 +8872,11 @@
                                         menuItem: this.item
                                     })];
                             case 7:
-                                _b = _o.sent();
+                                _b = _p.sent();
                                 return [3 /*break*/, 9];
                             case 8:
                                 _b = { tileset: null, type: null };
-                                _o.label = 9;
+                                _p.label = 9;
                             case 9:
                                 _a = _b, tileset = _a.tileset, type = _a.type;
                                 if (this.disposed) {
@@ -8872,11 +8899,11 @@
                                         tileset: tileset
                                     })];
                             case 10:
-                                _c = _o.sent();
+                                _c = _p.sent();
                                 return [3 /*break*/, 12];
                             case 11:
                                 _c = null;
-                                _o.label = 12;
+                                _p.label = 12;
                             case 12:
                                 legacyTileset = _c;
                                 if (this.disposed) {
@@ -8892,12 +8919,13 @@
                                         tileset: legacyTileset,
                                         viewer: this.viewer,
                                         ionId: (_k = this.item.IonResource) === null || _k === void 0 ? void 0 : _k.AssetID,
+                                        ionAccessToken: (_l = this.item.IonResource) === null || _l === void 0 ? void 0 : _l.AccessToken,
                                         loadUrl: loadUrlOverride,
                                         accountId: accountId,
                                         viaCdn: true
                                     })];
                             case 13:
-                                _d.cTileset = _o.sent();
+                                _d.cTileset = _p.sent();
                                 return [3 /*break*/, 16];
                             case 14:
                                 if (!tileset) return [3 /*break*/, 16];
@@ -8907,13 +8935,13 @@
                                         tileset: tileset,
                                         viewer: this.viewer,
                                         coords: null,
-                                        accountId: (_m = (_l = this.item.tileset) === null || _l === void 0 ? void 0 : _l.ClientAccountID) !== null && _m !== void 0 ? _m : this.getters.GetAccountId(),
+                                        accountId: (_o = (_m = this.item.tileset) === null || _m === void 0 ? void 0 : _m.ClientAccountID) !== null && _o !== void 0 ? _o : this.getters.GetAccountId(),
                                         // Not doing viaCDN here because I fear it'll break something since this is a legacy menu item type.
                                         viaCdn: false
                                     })];
                             case 15:
-                                _e.cTileset = _o.sent();
-                                _o.label = 16;
+                                _e.cTileset = _p.sent();
+                                _p.label = 16;
                             case 16:
                                 if (this.disposed) {
                                     this.doDispose();
@@ -9061,6 +9089,8 @@
     (function (RelationsRenderManager) {
         var Manager = /** @class */ (function () {
             function Manager(params) {
+                // If true, this menu item is disposed and should not be used.
+                // Any rendering will be ignored.
                 this.disposed = false;
                 var apiGetter = params.apiGetter, item = params.item, register = params.register, viewer = params.viewer;
                 this.apiGetter = apiGetter;
@@ -9075,56 +9105,62 @@
                 enumerable: false,
                 configurable: true
             });
-            Manager.prototype.Init = function () {
-                var _this = this;
-                var drawn = [];
-                var api = this.apiGetter.getApi(this.apiGetter.accountId);
-                var BATCH_SIZE = 5;
-                var drawBatch = [];
-                var pending = this.item.BruceEntity.EntityIds.length;
-                var onResolve = function () {
-                    pending -= 1;
-                    if (pending <= 0) {
-                        if (drawBatch === null || drawBatch === void 0 ? void 0 : drawBatch.length) {
-                            _this.onGetterUpdate(drawBatch);
+            /**
+             * Starts rendering the menu item.
+             * Re-call with an updated menu item to re-render. It will auto-cleanup old relations.
+             * @param params
+             * @returns
+             */
+            Manager.prototype.Init = function (params) {
+                var _a;
+                if (this.disposed) {
+                    return;
+                }
+                if (params === null || params === void 0 ? void 0 : params.item) {
+                    this.item = params.item;
+                }
+                // Remove relationships we no longer want to render.
+                // We'll have to get regos by the menu item ID then run a check on the related rego relationship.
+                var regos = this.register.GetRegos({
+                    menuItemId: this.item.id
+                });
+                var drawnIds = [];
+                var toDrawIds = [];
+                var entityIds = (_a = this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.EntityIds;
+                if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
+                    entityIds = [];
+                }
+                for (var i = 0; i < regos.length; i++) {
+                    var rego = regos[i];
+                    if (!this.shouldRenderRelation(rego.relation)) {
+                        this.register.RemoveRegos({
+                            relation: rego.relation,
+                            entityId: rego.entityId,
+                            menuItemId: this.item.id,
+                            requestRender: false
+                        });
+                    }
+                    else {
+                        drawnIds.push(rego.entityId);
+                        if (rego.relation) {
+                            drawnIds.push(rego.relation["Principal.Entity.ID"]);
+                            drawnIds.push(rego.relation["Related.Entity.ID"]);
                         }
                     }
+                }
+                this.viewer.scene.requestRender();
+                var _loop_1 = function (i) {
+                    if (!drawnIds.find(function (x) { return x == entityIds[i]; })) {
+                        toDrawIds.push(entityIds[i]);
+                    }
                 };
-                for (var i = 0; i < this.item.BruceEntity.EntityIds.length; i++) {
-                    var entityId = this.item.BruceEntity.EntityIds[i];
-                    bruceModels.EntityRelation.GetList({
-                        api: api,
-                        entityId: entityId,
-                        filter: {
-                            oneWayOnly: false,
-                            loadEntityData: false
-                        }
-                    }).then(function (data) {
-                        var _a;
-                        var relations = data.relations;
-                        var _loop_1 = function (j) {
-                            var relation = relations[j];
-                            if (((_a = _this.item.relationTypeIds) === null || _a === void 0 ? void 0 : _a.length) && !_this.item.relationTypeIds.includes(relation["Relation.Type.ID"])) {
-                                return "continue";
-                            }
-                            var key = RelationRenderEngine.GetRenderGroupId(relation);
-                            if (!drawn.find(function (x) { return x == key; })) {
-                                drawn.push(key);
-                                drawBatch.push(relation);
-                                if (drawBatch.length >= BATCH_SIZE) {
-                                    _this.onGetterUpdate(drawBatch);
-                                    drawBatch = [];
-                                }
-                            }
-                        };
-                        for (var j = 0; j < relations.length; j++) {
-                            _loop_1(j);
-                        }
-                        onResolve();
-                    }).catch(function (e) {
-                        onResolve();
-                    });
+                // We'll call a re-render on entity ids that are not drawn.
+                for (var i = 0; i < entityIds.length; i++) {
+                    _loop_1(i);
                 }
+                this.renderEntityIds({
+                    entityIds: toDrawIds
+                });
             };
             Manager.prototype.Dispose = function () {
                 if (this.disposed) {
@@ -9135,19 +9171,154 @@
                     menuItemId: this.item.id
                 });
             };
+            /**
+             * Re-renders specific entity relationships.
+             * @TODO: This should re-render all relationships when entityIds=null.
+             * @param params
+             */
             Manager.prototype.ReRender = function (params) {
                 return __awaiter(this, void 0, void 0, function () {
                     var entityIds, force;
                     return __generator(this, function (_a) {
                         entityIds = params.entityIds, force = params.force;
+                        if (entityIds == null) ;
+                        else {
+                            this.renderEntityIds({
+                                dataEntityIds: entityIds
+                            });
+                        }
                         return [2 /*return*/];
                     });
                 });
             };
+            /**
+             * Gets relationship records corresponding to provided IDs and requests a render for them.
+             */
+            Manager.prototype.renderEntityIds = function (params) {
+                return __awaiter(this, void 0, void 0, function () {
+                    var entityIds, dataEntityIds, drawn, api, BATCH_SIZE, drawBatch, pending, onResolve, i, entityId, i, entityId;
+                    var _this = this;
+                    return __generator(this, function (_a) {
+                        if (this.disposed || this.viewer.isDestroyed()) {
+                            return [2 /*return*/];
+                        }
+                        entityIds = params.entityIds, dataEntityIds = params.dataEntityIds;
+                        if (!(entityIds === null || entityIds === void 0 ? void 0 : entityIds.length)) {
+                            entityIds = [];
+                        }
+                        if (!(dataEntityIds === null || dataEntityIds === void 0 ? void 0 : dataEntityIds.length)) {
+                            dataEntityIds = [];
+                        }
+                        drawn = [];
+                        api = this.apiGetter.getApi(this.apiGetter.accountId);
+                        BATCH_SIZE = 5;
+                        drawBatch = [];
+                        pending = entityIds.length + dataEntityIds.length;
+                        onResolve = function () {
+                            if (_this.disposed || _this.viewer.isDestroyed()) {
+                                return;
+                            }
+                            pending -= 1;
+                            if (pending <= 0) {
+                                if (drawBatch === null || drawBatch === void 0 ? void 0 : drawBatch.length) {
+                                    _this.onGetterUpdate(drawBatch);
+                                }
+                            }
+                        };
+                        // Get relationships by their data entity ID.
+                        for (i = 0; i < dataEntityIds.length; i++) {
+                            entityId = dataEntityIds[i];
+                            bruceModels.EntityRelation.GetByDataEntityId({
+                                entityId: entityId,
+                                api: api
+                            }).then(function (data) {
+                                if (data.relation) {
+                                    var relation = data.relation;
+                                    var key_1 = RelationRenderEngine.GetRenderGroupId(relation);
+                                    if (!drawn.find(function (x) { return x == key_1; })) {
+                                        drawn.push(key_1);
+                                        drawBatch.push(relation);
+                                        if (drawBatch.length >= BATCH_SIZE) {
+                                            _this.onGetterUpdate(drawBatch);
+                                            drawBatch = [];
+                                        }
+                                    }
+                                }
+                                onResolve();
+                            }).catch(function (e) {
+                                onResolve();
+                            });
+                        }
+                        // Get relationships by either the parent or child ID.
+                        for (i = 0; i < entityIds.length; i++) {
+                            entityId = entityIds[i];
+                            bruceModels.EntityRelation.GetList({
+                                api: api,
+                                entityId: entityId,
+                                filter: {
+                                    oneWayOnly: false,
+                                    loadEntityData: false
+                                }
+                            }).then(function (data) {
+                                var relations = data.relations;
+                                var _loop_2 = function (j) {
+                                    var relation = relations[j];
+                                    var key = RelationRenderEngine.GetRenderGroupId(relation);
+                                    if (!drawn.find(function (x) { return x == key; })) {
+                                        drawn.push(key);
+                                        drawBatch.push(relation);
+                                        if (drawBatch.length >= BATCH_SIZE) {
+                                            _this.onGetterUpdate(drawBatch);
+                                            drawBatch = [];
+                                        }
+                                    }
+                                };
+                                for (var j = 0; j < relations.length; j++) {
+                                    _loop_2(j);
+                                }
+                                onResolve();
+                            }).catch(function (e) {
+                                onResolve();
+                            });
+                        }
+                        return [2 /*return*/];
+                    });
+                });
+            };
+            /**
+             * Returns if a relation should be rendered.
+             * This is in case the menu item was updated and the relation is no longer relevant.
+             * @param relation
+             */
+            Manager.prototype.shouldRenderRelation = function (relation) {
+                var _a, _b, _c;
+                if (((_a = this.item.relationTypeIds) === null || _a === void 0 ? void 0 : _a.length) && !this.item.relationTypeIds.includes(relation["Relation.Type.ID"])) {
+                    return false;
+                }
+                var renderedIds = (_c = (_b = this.item) === null || _b === void 0 ? void 0 : _b.BruceEntity) === null || _c === void 0 ? void 0 : _c.EntityIds;
+                if (!renderedIds) {
+                    return false;
+                }
+                var ids = [
+                    relation["Principal.Entity.ID"],
+                    relation["Related.Entity.ID"]
+                ];
+                if (relation["Data.Entity.ID"]) {
+                    ids.push(relation["Data.Entity.ID"]);
+                }
+                return ids.some(function (x) { return renderedIds.includes(x); });
+            };
+            /**
+             * Renders batch of entity relationships.
+             * This will check if a relationship SHOULD be rendered before rendering it.
+             * It will also handle already rendered relations to avoid re-rendering them.
+             * @param relations
+             */
             Manager.prototype.onGetterUpdate = function (relations) {
                 var _a, _b;
                 return __awaiter(this, void 0, void 0, function () {
-                    var cEntities, i, relation, key, cEntity, visual, e_1;
+                    var killCEntity, cEntities, key, i, relation, key, cEntity, visual, e_1;
+                    var _this = this;
                     return __generator(this, function (_c) {
                         switch (_c.label) {
                             case 0:
@@ -9155,6 +9326,12 @@
                                 if (this.disposed || this.viewer.isDestroyed()) {
                                     return [2 /*return*/];
                                 }
+                                relations = relations.filter(function (x) { return _this.shouldRenderRelation(x); });
+                                killCEntity = function (cEntity) {
+                                    if (cEntity && !_this.viewer.isDestroyed() && _this.viewer.entities.contains(cEntity)) {
+                                        _this.viewer.entities.remove(cEntity);
+                                    }
+                                };
                                 return [4 /*yield*/, RelationRenderEngine.Render({
                                         apiGetter: this.apiGetter,
                                         menuItemId: this.item.id,
@@ -9168,13 +9345,16 @@
                                     this.register.RemoveRegos({
                                         menuItemId: this.item.id
                                     });
+                                    for (key in cEntities) {
+                                        killCEntity(cEntities[key]);
+                                    }
                                     return [2 /*return*/];
                                 }
                                 for (i = 0; i < relations.length; i++) {
                                     relation = relations[i];
                                     key = RelationRenderEngine.GetRenderGroupId(relation);
                                     cEntity = cEntities[key];
-                                    if (cEntity) {
+                                    if (cEntity && this.shouldRenderRelation(relation)) {
                                         visual = (_a = this.register.GetRego({
                                             entityId: key,
                                             menuItemId: this.item.id
@@ -9200,6 +9380,7 @@
                                             menuItemId: this.item.id,
                                             requestRender: false
                                         });
+                                        killCEntity(cEntity);
                                     }
                                 }
                                 this.viewer.scene.requestRender();
@@ -9394,6 +9575,14 @@
                         });
                         rItem.item = params.item;
                     }
+                    // This means we're updating a rendered relationships menu item.
+                    // Eg: different entities need to be rendered, or one of the relationship data entities changed.
+                    else if (rItem.type == bruceModels.MenuItem.EType.Relations && params.item.Type == bruceModels.MenuItem.EType.Relations) {
+                        rItem.renderManager.Init({
+                            item: params.item,
+                        });
+                        rItem.item = params.item;
+                    }
                 }
                 else {
                     rItem = {
@@ -12295,7 +12484,7 @@
                         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 && !renderedRelationEntityIds.length)) {
                                 params.manager.RemoveItemById({
                                     menuItemId: id
                                 });
@@ -12315,7 +12504,7 @@
                         }
                         _6.label = 4;
                     case 4:
-                        if (!(renderedRelationEntityIds.length > 0)) return [3 /*break*/, 6];
+                        if (!renderedRelationEntityIds.length) return [3 /*break*/, 6];
                         menuItem = {
                             id: RELATION_MENU_ITEM_ID,
                             Caption: "Entity relations",
@@ -15239,7 +15428,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.7.7";
+    var VERSION$1 = "2.7.9";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;