bruce-cesium 2.9.1 → 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, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, HeadingPitchRange, Cesium3DTileColorBlendMode, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, GeometryInstance, BoundingSphere } from 'cesium';
+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;
@@ -9819,6 +9819,535 @@ var TilesetArbRenderManager;
 
 var RelationsRenderManager;
 (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;
+            this.item = item;
+            this.register = register;
+            this.viewer = viewer;
+        }
+        Object.defineProperty(Manager.prototype, "Disposed", {
+            get: function () {
+                return this.disposed;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        /**
+         * 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) {
+            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
+            });
+            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
+                    });
+                }
+            }
+            this.viewer.scene.requestRender();
+            this.queueRenderRelations({
+                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;
+            }
+            this.disposed = true;
+            this.register.RemoveRegos({
+                menuItemId: this.item.id
+            });
+        };
+        /**
+         * Re-renders specific entity relationships.
+         * @param params
+         */
+        Manager.prototype.ReRender = function (params) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function () {
+                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.queueRenderDataIds = function (params) {
+            return __awaiter(this, void 0, void 0, function () {
+                var dataEntityIds, i, data, e_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            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];
+                                entityIds = relation.entityIds;
+                                allIds_1.push.apply(allIds_1, entityIds);
+                            }
+                            allIds_1 = allIds_1.filter(function (id, index) {
+                                return allIds_1.indexOf(id) === index;
+                            });
+                            i = 0;
+                            _b.label = 1;
+                        case 1:
+                            if (!(i < allIds_1.length)) return [3 /*break*/, 4];
+                            entityId = allIds_1[i];
+                            return [4 /*yield*/, EntityRelation.GetList({
+                                    entityId: entityId,
+                                    filter: {
+                                        oneWayOnly: true,
+                                        loadEntityData: false
+                                    },
+                                    api: this.apiGetter.getApi()
+                                })];
+                        case 2:
+                            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);
+                                }
+                            }
+                            if (toRender.length) {
+                                this.onGetterUpdate(toRender);
+                            }
+                            _b.label = 3;
+                        case 3:
+                            i++;
+                            return [3 /*break*/, 1];
+                        case 4: return [3 /*break*/, 6];
+                        case 5:
+                            e_2 = _b.sent();
+                            console.error(e_2);
+                            return [3 /*break*/, 6];
+                        case 6: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Manager.prototype.shouldRenderRelation = function (relation) {
+            var _a, _b;
+            var typeId = relation === null || relation === void 0 ? void 0 : relation["Relation.Type.ID"];
+            if (!typeId || !((_b = (_a = this.item) === null || _a === void 0 ? void 0 : _a.relations) === null || _b === void 0 ? void 0 : _b.length)) {
+                return false;
+            }
+            var group = this.item.relations.find(function (x) { return x.relationTypeId == typeId; });
+            if (!(group === null || group === void 0 ? void 0 : group.entityIds)) {
+                return false;
+            }
+            return group.entityIds.includes(relation["Principal.Entity.ID"]);
+        };
+        /**
+         * 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 killCEntity, cEntities, key, i, relation, rego, key, cEntity, visual, e_3;
+                var _this = this;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            _c.trys.push([0, 2, , 3]);
+                            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,
+                                    relations: relations,
+                                    viewer: this.viewer,
+                                    visualRegister: this.register
+                                })];
+                        case 1:
+                            cEntities = _c.sent();
+                            if (this.disposed) {
+                                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];
+                                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)) {
+                                    visual = (_a = this.register.GetRego({
+                                        relation: relation,
+                                        menuItemId: this.item.id
+                                    })) === null || _a === void 0 ? void 0 : _a.visual;
+                                    if (!visual || visual != cEntity) {
+                                        this.register.AddRego({
+                                            rego: {
+                                                entityId: (_b = relation["Data.Entity.ID"]) !== null && _b !== void 0 ? _b : ObjectUtils.UId(),
+                                                menuItemId: this.item.id,
+                                                relation: relation,
+                                                visual: cEntity,
+                                                priority: 0,
+                                                accountId: this.apiGetter.accountId
+                                            },
+                                            requestRender: false
+                                        });
+                                    }
+                                }
+                                else {
+                                    this.register.RemoveRegos({
+                                        entityId: relation["Data.Entity.ID"],
+                                        relation: relation,
+                                        menuItemId: this.item.id,
+                                        requestRender: false
+                                    });
+                                    killCEntity(cEntity);
+                                }
+                            }
+                            this.viewer.scene.requestRender();
+                            return [3 /*break*/, 3];
+                        case 2:
+                            e_3 = _c.sent();
+                            console.error(e_3);
+                            return [3 /*break*/, 3];
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        return Manager;
+    }());
+    RelationsRenderManager.Manager = Manager;
+})(RelationsRenderManager || (RelationsRenderManager = {}));
+
+var TilesetGooglePhotosRenderManager;
+(function (TilesetGooglePhotosRenderManager) {
+    var Manager = /** @class */ (function () {
+        function Manager(params) {
+            this.disposed = false;
+            this.cTileset = null;
+            var viewer = params.viewer, item = params.item;
+            this.viewer = viewer;
+            this.item = item;
+        }
+        Object.defineProperty(Manager.prototype, "Disposed", {
+            get: function () {
+                return this.disposed;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(Manager.prototype, "Tileset", {
+            get: function () {
+                return this.cTileset;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Manager.prototype.Dispose = function () {
+            if (this.disposed) {
+                return;
+            }
+            this.doDispose();
+        };
+        Manager.prototype.doDispose = function () {
+            if (this.cTileset) {
+                var viewer = this.viewer;
+                if (!(viewer === null || viewer === void 0 ? void 0 : viewer.isDestroyed()) && this.viewer.scene.primitives.contains(this.cTileset)) {
+                    this.cTileset.show = false;
+                    this.viewer.scene.primitives.remove(this.cTileset);
+                    this.viewer.scene.requestRender();
+                }
+                this.cTileset = null;
+            }
+        };
+        Manager.prototype.Init = function () {
+            var _this = this;
+            (function () { return __awaiter(_this, void 0, void 0, function () {
+                var _a, colorCss;
+                var _b, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            // Using as any to be OK with older versions.
+                            _a = this;
+                            return [4 /*yield*/, ((_c = (_b = Cesium).createGooglePhotorealistic3DTileset) === null || _c === void 0 ? void 0 : _c.call(_b))];
+                        case 1:
+                            // Using as any to be OK with older versions.
+                            _a.cTileset = _d.sent();
+                            if (this.disposed) {
+                                this.doDispose();
+                                return [2 /*return*/];
+                            }
+                            this.viewer.scene.primitives.add(this.cTileset);
+                            colorCss = this.item.colorMask;
+                            if (colorCss) {
+                                this.cTileset.style = new Cesium3DTileStyle({
+                                    color: {
+                                        conditions: [
+                                            ["true", "color(\"".concat(colorCss, "\")")]
+                                        ]
+                                    }
+                                });
+                            }
+                            this.viewer.scene.requestRender();
+                            return [2 /*return*/];
+                    }
+                });
+            }); })();
+        };
+        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;
+                    return [2 /*return*/];
+                });
+            });
+        };
+        return Manager;
+    }());
+    TilesetGooglePhotosRenderManager.Manager = Manager;
+})(TilesetGooglePhotosRenderManager || (TilesetGooglePhotosRenderManager = {}));
+
+/**
+ * Deprecated relations render manager.
+ * This follows original navigator logic that renders both up/downstream relationships and ALL relationship types.
+ */
+var OldRelationsRenderManager;
+(function (OldRelationsRenderManager) {
     var Manager = /** @class */ (function () {
         function Manager(params) {
             // If true, this menu item is disposed and should not be used.
@@ -10119,98 +10648,8 @@ var RelationsRenderManager;
         };
         return Manager;
     }());
-    RelationsRenderManager.Manager = Manager;
-})(RelationsRenderManager || (RelationsRenderManager = {}));
-
-var TilesetGooglePhotosRenderManager;
-(function (TilesetGooglePhotosRenderManager) {
-    var Manager = /** @class */ (function () {
-        function Manager(params) {
-            this.disposed = false;
-            this.cTileset = null;
-            var viewer = params.viewer, item = params.item;
-            this.viewer = viewer;
-            this.item = item;
-        }
-        Object.defineProperty(Manager.prototype, "Disposed", {
-            get: function () {
-                return this.disposed;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(Manager.prototype, "Tileset", {
-            get: function () {
-                return this.cTileset;
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Manager.prototype.Dispose = function () {
-            if (this.disposed) {
-                return;
-            }
-            this.doDispose();
-        };
-        Manager.prototype.doDispose = function () {
-            if (this.cTileset) {
-                var viewer = this.viewer;
-                if (!(viewer === null || viewer === void 0 ? void 0 : viewer.isDestroyed()) && this.viewer.scene.primitives.contains(this.cTileset)) {
-                    this.cTileset.show = false;
-                    this.viewer.scene.primitives.remove(this.cTileset);
-                    this.viewer.scene.requestRender();
-                }
-                this.cTileset = null;
-            }
-        };
-        Manager.prototype.Init = function () {
-            var _this = this;
-            (function () { return __awaiter(_this, void 0, void 0, function () {
-                var _a, colorCss;
-                var _b, _c;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
-                        case 0:
-                            // Using as any to be OK with older versions.
-                            _a = this;
-                            return [4 /*yield*/, ((_c = (_b = Cesium).createGooglePhotorealistic3DTileset) === null || _c === void 0 ? void 0 : _c.call(_b))];
-                        case 1:
-                            // Using as any to be OK with older versions.
-                            _a.cTileset = _d.sent();
-                            if (this.disposed) {
-                                this.doDispose();
-                                return [2 /*return*/];
-                            }
-                            this.viewer.scene.primitives.add(this.cTileset);
-                            colorCss = this.item.colorMask;
-                            if (colorCss) {
-                                this.cTileset.style = new Cesium3DTileStyle({
-                                    color: {
-                                        conditions: [
-                                            ["true", "color(\"".concat(colorCss, "\")")]
-                                        ]
-                                    }
-                                });
-                            }
-                            this.viewer.scene.requestRender();
-                            return [2 /*return*/];
-                    }
-                });
-            }); })();
-        };
-        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;
-                    return [2 /*return*/];
-                });
-            });
-        };
-        return Manager;
-    }());
-    TilesetGooglePhotosRenderManager.Manager = Manager;
-})(TilesetGooglePhotosRenderManager || (TilesetGooglePhotosRenderManager = {}));
+    OldRelationsRenderManager.Manager = Manager;
+})(OldRelationsRenderManager || (OldRelationsRenderManager = {}));
 
 /**
  * Utility to keep track of enabled menu items within a Cesium viewer.
@@ -10323,12 +10762,21 @@ var MenuItemManager;
                 }
                 // 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.
+                // Deprecated: this relationships item is dead and being phased out. Use 'relationships' one instead.
                 else if (rItem.type == MenuItem.EType.Relations && params.item.Type == MenuItem.EType.Relations) {
                     rItem.renderManager.Init({
                         item: params.item,
                     });
                     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 == MenuItem.EType.Relationships && params.item.Type == MenuItem.EType.Relationships) {
+                    rItem.renderManager.Init({
+                        item: params.item,
+                    });
+                    rItem.item = params.item;
+                }
             }
             else {
                 rItem = {
@@ -10429,7 +10877,17 @@ var MenuItemManager;
                             register: this.visualsRegister
                         });
                         break;
+                    // Deprecated to support a few demos until new one is phased in.
+                    // Use Relationships instead.
                     case MenuItem.EType.Relations:
+                        rItem.renderManager = new OldRelationsRenderManager.Manager({
+                            apiGetter: params.apiGetter,
+                            item: params.item,
+                            register: this.visualsRegister,
+                            viewer: this.viewer
+                        });
+                        break;
+                    case MenuItem.EType.Relationships:
                         rItem.renderManager = new RelationsRenderManager.Manager({
                             apiGetter: params.apiGetter,
                             item: params.item,
@@ -12803,6 +13261,7 @@ function assertIteration$1(viewer, iteration) {
 }
 /**
  * Renders DATA_VERSION = 1 navigator.
+ * param iteration
  * @param params
  * @param bookmark
  * @param view
@@ -12926,33 +13385,32 @@ function renderLegacyNavigator(iteration, params, bookmark, view) {
                     }
                     _f.label = 3;
                 case 3:
-                    if (!((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length)) return [3 /*break*/, 5];
-                    menuItem = {
-                        id: RELATION_MENU_ITEM_ID,
-                        Caption: "Entity relations",
-                        BruceEntity: {
-                            EntityIds: bSettings.drawnRelationEntityIDs
-                        },
-                        Type: MenuItem.EType.Relations
-                    };
-                    return [4 /*yield*/, params.manager.RenderItem({
+                    if ((_e = bSettings === null || bSettings === void 0 ? void 0 : bSettings.drawnRelationEntityIDs) === null || _e === void 0 ? void 0 : _e.length) {
+                        menuItem = {
+                            id: RELATION_MENU_ITEM_ID,
+                            Caption: "Entity relations",
+                            BruceEntity: {
+                                EntityIds: bSettings.drawnRelationEntityIDs
+                            },
+                            Type: MenuItem.EType.Relations
+                        };
+                        params.manager.RenderItem({
                             apiGetter: params.apiGetter,
                             getters: params.getters,
                             item: menuItem
-                        })];
-                case 4:
-                    _f.sent();
-                    if (!assertIteration$1(params.viewer, iteration)) {
-                        return [2 /*return*/];
+                        });
+                        if (!assertIteration$1(params.viewer, iteration)) {
+                            return [2 /*return*/];
+                        }
                     }
-                    _f.label = 5;
-                case 5: return [2 /*return*/];
+                    return [2 /*return*/];
             }
         });
     });
 }
 /**
  * Renders DATA_VERSION > 1 navigator.
+ * @param iteration
  * @param params
  * @param bookmark
  * @param view
@@ -12960,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, renderedRelationEntityIds, 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:
@@ -13246,16 +13704,38 @@ function renderNavigator(iteration, params, bookmark, view) {
                         tiles: imagery,
                         viewer: params.manager.Viewer,
                     });
-                    renderedRelationEntityIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
-                    if (!renderedRelationEntityIds) {
-                        renderedRelationEntityIds = [];
+                    legacyRelationIds = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedEntityRelations;
+                    if (!legacyRelationIds) {
+                        legacyRelationIds = [];
+                    }
+                    relations = bSettings === null || bSettings === void 0 ? void 0 : bSettings.renderedRelations;
+                    if (!relations) {
+                        relations = [];
                     }
                     curEnabled = params.manager.GetEnabledItemIds();
                     newItemIds = (_5 = bSettings === null || bSettings === void 0 ? void 0 : bSettings.menuItemIds) !== null && _5 !== void 0 ? _5 : [];
                     for (_i = 0, curEnabled_1 = curEnabled; _i < curEnabled_1.length; _i++) {
                         id = curEnabled_1[_i];
-                        if (newItemIds.indexOf(id) === -1 ||
-                            (id == RELATION_MENU_ITEM_ID && !renderedRelationEntityIds.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
                             });
@@ -13275,26 +13755,37 @@ function renderNavigator(iteration, params, bookmark, view) {
                     }
                     _7.label = 4;
                 case 4:
-                    if (!renderedRelationEntityIds.length) return [3 /*break*/, 6];
-                    menuItem = {
-                        id: RELATION_MENU_ITEM_ID,
-                        Caption: "Entity relations",
-                        BruceEntity: {
-                            EntityIds: renderedRelationEntityIds
-                        },
-                        Type: MenuItem.EType.Relations
-                    };
-                    return [4 /*yield*/, params.manager.RenderItem({
-                            getters: params.getters,
-                            item: menuItem
-                        })];
-                case 5:
-                    _7.sent();
-                    if (!assertIteration$1(params.viewer, iteration)) {
-                        return [2 /*return*/];
+                    if (legacyRelationIds.length || relations.length) {
+                        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*/];
+                        }
                     }
-                    _7.label = 6;
-                case 6:
                     gOcclusion = bSettings === null || bSettings === void 0 ? void 0 : bSettings.groundOcclusion;
                     if (gOcclusion == null) {
                         gOcclusion = (_6 = defaults === null || defaults === void 0 ? void 0 : defaults.settings) === null || _6 === void 0 ? void 0 : _6.groundOcclusion;
@@ -16208,7 +16699,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.9.1";
+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