bruce-cesium 0.9.4 → 0.9.6

package/dist/bruce-cesium.es5.js

@@ -1,5 +1,5 @@
 import { BruceEvent, Cartes, Carto, Geometry, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, DelayQueue, Entity as Entity$1, BatchedDataGetter, ObjectUtils, Tileset, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera } from 'bruce-models';
-import { Color, HeightReference, Cartographic, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Math as Math$1, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cartesian2, Cesium3DTileColorBlendMode, HeadingPitchRange, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Cesium3DTileset, OrthographicFrustum, JulianDate, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, EllipsoidGeodesic, createOsmBuildings, Cesium3DTileStyle, KmlDataSource } from 'cesium';
+import { Cartesian2, Cartographic, Math as Math$1, Color, HeightReference, Cartesian3, Entity, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, PolygonHierarchy, ShadowMode, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Primitive, Cesium3DTileFeature, Cesium3DTileColorBlendMode, HeadingPitchRange, OrthographicFrustum, JulianDate, Matrix4, Cesium3DTileset, Cesium3DTileStyle, IonResource, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, EllipsoidGeodesic, PolygonPipeline, ColorMaterialProperty, Rectangle, Matrix3, EasingFunction, GeometryInstance, createOsmBuildings, KmlDataSource } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -233,14 +233,15 @@ var ViewerUtils;
      * Destroys all the junk that cesium viewer ships with.
      * @param viewer
      */
-    function InitViewer(viewer) {
+    function InitViewer(params) {
+        var viewer = params.viewer;
         ViewerUtils.DestroyWidget(viewer.timeline);
         ViewerUtils.DestroyWidget(viewer.vrButton);
         ViewerUtils.DestroyWidget(viewer.sceneModePicker);
         ViewerUtils.DestroyWidget(viewer.homeButton);
         ViewerUtils.DestroyWidget(viewer.fullscreenButton);
         ViewerUtils.DestroyWidget(viewer.baseLayerPicker);
-        ViewerUtils.StyleContainer(viewer);
+        ViewerUtils.StyleContainer({ viewer: viewer });
     }
     ViewerUtils.InitViewer = InitViewer;
     function DestroyWidget(widget) {
@@ -253,8 +254,9 @@ var ViewerUtils;
      * Hides all unnecessary elements from the Cesium viewer container.
      * @param viewer
      */
-    function StyleContainer(viewer) {
+    function StyleContainer(params) {
         var _a;
+        var viewer = params.viewer;
         var container = viewer.container;
         var genContainer = (_a = container.getElementsByClassName("cesium-viewer")) === null || _a === void 0 ? void 0 : _a[0];
         if (genContainer) {
@@ -363,7 +365,8 @@ var DrawingUtils;
      * @param distance
      * @returns
      */
-    function PointAcrossPolyline(viewer, positions, distance) {
+    function PointAcrossPolyline(params) {
+        var viewer = params.viewer, positions = params.posses, distance = params.distance;
         if (positions.length > 1) {
             var currentDistance = 0;
             for (var i = 0; i < positions.length - 1; i++) {
@@ -374,7 +377,9 @@ var DrawingUtils;
                     var geodesic = new EllipsoidGeodesic(carto1, carto2, viewer.scene.globe.ellipsoid);
                     var position = geodesic.interpolateUsingSurfaceDistance(distance - currentDistance);
                     var height = (carto1.height + carto2.height) / 2;
-                    return Cartesian3.fromRadians(position.longitude, position.latitude, height);
+                    return {
+                        point: Cartesian3.fromRadians(position.longitude, position.latitude, height)
+                    };
                 }
                 else {
                     currentDistance += length_1;
@@ -382,12 +387,18 @@ var DrawingUtils;
             }
         }
         else if (positions.length > 0) {
-            return positions[0];
+            return {
+                point: positions[0]
+            };
         }
         else {
-            return null;
+            return {
+                point: null
+            };
         }
-        return positions[positions.length - 1];
+        return {
+            point: positions[positions.length - 1]
+        };
     }
     DrawingUtils.PointAcrossPolyline = PointAcrossPolyline;
 })(DrawingUtils || (DrawingUtils = {}));
@@ -400,9 +411,12 @@ var MeasureUtils;
      * @param posses
      * @returns
      */
-    function MeasurePolyline(posses) {
+    function MeasurePolyline(params) {
+        var posses = params.posses;
         if (posses.length < 2) {
-            return 0;
+            return {
+                totalLength: 0
+            };
         }
         var totalLength = 0;
         var pos1 = null;
@@ -418,9 +432,43 @@ var MeasureUtils;
                 pos2 = null;
             }
         }
-        return totalLength;
+        return {
+            totalLength: totalLength
+        };
     }
     MeasureUtils.MeasurePolyline = MeasurePolyline;
+    function MeasurePolygon(params) {
+        var posses = params.posses;
+        posses = [].concat(posses);
+        if (!Cartes.IsRing3Closed(posses)) {
+            posses.push(posses[0].clone());
+        }
+        if (posses.length < 3) {
+            return {
+                area: 0,
+                perimeter: 0
+            };
+        }
+        var area = 0;
+        var indices = PolygonPipeline.triangulate(posses, []);
+        for (var i = 0; i < indices.length; i += 3) {
+            var vector1 = posses[indices[i]];
+            var vector2 = posses[indices[i + 1]];
+            var vector3 = posses[indices[i + 2]];
+            var vectorC = Cartesian3.subtract(vector2, vector1, new Cartesian3());
+            var vectorD = Cartesian3.subtract(vector3, vector1, new Cartesian3());
+            var areaVector = Cartesian3.cross(vectorC, vectorD, new Cartesian3());
+            area += Cartesian3.magnitude(areaVector) / 2.0;
+        }
+        var perimeter = MeasurePolyline({
+            posses: posses
+        }).totalLength;
+        return {
+            area: area,
+            perimeter: perimeter
+        };
+    }
+    MeasureUtils.MeasurePolygon = MeasurePolygon;
 })(MeasureUtils || (MeasureUtils = {}));
 
 /**
@@ -569,7 +617,8 @@ var EntityUtils;
      * @param entity
      * @returns
      */
-    function GetPos(viewer, entity) {
+    function GetPos(params) {
+        var viewer = params.viewer, entity = params.entity;
         function evaluate() {
             if (entity.location && Carto.ValidateCarto(entity.location)) {
                 var location_1 = entity.location;
@@ -589,9 +638,15 @@ var EntityUtils;
                     var points = Geometry.ParsePoints(lineStr);
                     if (points.length > 0) {
                         var posses = points.map(function (x) { return Cartesian3.fromDegrees(EnsureNumber(x.longitude), EnsureNumber(x.latitude), EnsureNumber(x.altitude)); });
-                        var length_1 = MeasureUtils.MeasurePolyline(posses);
+                        var length_1 = MeasureUtils.MeasurePolyline({
+                            posses: posses
+                        }).totalLength;
                         if (length_1 > 0) {
-                            var point = DrawingUtils.PointAcrossPolyline(viewer, posses, length_1 / 2);
+                            var point = DrawingUtils.PointAcrossPolyline({
+                                viewer: viewer,
+                                posses: posses,
+                                distance: length_1 / 2
+                            }).point;
                             if (point && Cartes.ValidateCartes3(point)) {
                                 return point;
                             }
@@ -632,7 +687,8 @@ var EntityUtils;
      * Returns entity and any associated parent/sibling entities as a flat array.
      * @param entity
      */
-    function GatherEntity(entity) {
+    function GatherEntity(params) {
+        var entity = params.entity;
         if (entity instanceof Entity) {
             var cEntity = entity;
             var items = [];
@@ -647,7 +703,8 @@ var EntityUtils;
      * @param viewer
      * @param entities
      */
-    function LookAtEntities(viewer, entities) {
+    function LookAtEntities(params) {
+        var viewer = params.viewer, entities = params.entities;
         var _a = [Rectangle, Cartographic, Cartesian3, Matrix3, Matrix4, EasingFunction], C3 = _a[2], M4 = _a[4];
         var cutoffDistance = 2000;
         var hoverHeight = 2000;
@@ -737,7 +794,8 @@ var EntityUtils;
      * @param entity
      * @param opacity
      */
-    function SetOpacity(viewer, entity, opacity) {
+    function SetOpacity(params) {
+        var viewer = params.viewer, entity = params.entity, opacity = params.opacity;
         applyOpacityToEntity(viewer, opacity, entity);
     }
     EntityUtils.SetOpacity = SetOpacity;
@@ -747,7 +805,8 @@ var EntityUtils;
      * @param viewer
      * @param entity
      */
-    function RevertOpacity(viewer, entity) {
+    function RevertOpacity(params) {
+        var viewer = params.viewer, entity = params.entity;
         revertAppliedEntityOpacity(viewer, entity);
     }
     EntityUtils.RevertOpacity = RevertOpacity;
@@ -758,7 +817,8 @@ var EntityUtils;
      * @param viewer
      * @param entity
      */
-    function GetOpacity(entity) {
+    function GetOpacity(params) {
+        var entity = params.entity;
         return findOpacity(entity);
     }
     EntityUtils.GetOpacity = GetOpacity;
@@ -766,53 +826,59 @@ var EntityUtils;
 
 var RenderManager;
 (function (RenderManager) {
-    var Utils;
-    (function (Utils) {
-        function DetermineZoomItem(viewer, entity, zoomControl) {
-            var pos = EntityUtils.GetPos(viewer, entity);
-            if (!pos) {
-                return null;
-            }
-            var cameraPos = viewer.camera.position;
-            if (!Cartes.ValidateCartes3(cameraPos)) {
-                return null;
-            }
-            var distance = Cartesian3.distance(pos, cameraPos);
-            return (!distance && distance != 0) ? null : GetZoomControlFromDistance(zoomControl, distance);
+    function DetermineZoomItem(params) {
+        var viewer = params.viewer, entity = params.entity, zoomControl = params.zoomControl;
+        var pos = EntityUtils.GetPos({
+            viewer: viewer,
+            entity: entity
+        });
+        if (!pos) {
+            return null;
         }
-        Utils.DetermineZoomItem = DetermineZoomItem;
-        function GetZoomControlFromDistance(zoomControl, distance) {
-            for (var i = 0; i < zoomControl.length; i++) {
-                var zoomItem = zoomControl[i];
-                if ((distance >= EnsureNumber(zoomItem.MinZoom)) && (distance <= EnsureNumber(zoomItem.MaxZoom))) {
-                    return zoomItem;
-                }
-            }
+        var cameraPos = viewer.camera.position;
+        if (!Cartes.ValidateCartes3(cameraPos)) {
             return null;
         }
-        Utils.GetZoomControlFromDistance = GetZoomControlFromDistance;
-        function GetZoomMinMax(zoomControl) {
-            var min = 0;
-            var max = 100;
-            for (var i = 0; i < zoomControl.length; i++) {
-                var zoomItem = zoomControl[i];
-                zoomItem.MinZoom = EnsureNumber(zoomItem.MinZoom);
-                zoomItem.MaxZoom = EnsureNumber(zoomItem.MaxZoom);
-                if (zoomItem.MinZoom != null) {
-                    if (zoomItem.MinZoom < min) {
-                        min = zoomItem.MinZoom;
-                    }
+        var distance = Cartesian3.distance(pos, cameraPos);
+        return (!distance && distance != 0) ? null : GetZoomControlFromDistance({
+            zoomControl: zoomControl,
+            distance: distance
+        });
+    }
+    RenderManager.DetermineZoomItem = DetermineZoomItem;
+    function GetZoomControlFromDistance(params) {
+        var zoomControl = params.zoomControl, distance = params.distance;
+        for (var i = 0; i < zoomControl.length; i++) {
+            var zoomItem = zoomControl[i];
+            if ((distance >= EnsureNumber(zoomItem.MinZoom)) && (distance <= EnsureNumber(zoomItem.MaxZoom))) {
+                return zoomItem;
+            }
+        }
+        return null;
+    }
+    RenderManager.GetZoomControlFromDistance = GetZoomControlFromDistance;
+    function GetZoomMinMax(params) {
+        var zoomControl = params.zoomControl;
+        var min = 0;
+        var max = 100;
+        for (var i = 0; i < zoomControl.length; i++) {
+            var zoomItem = zoomControl[i];
+            zoomItem.MinZoom = EnsureNumber(zoomItem.MinZoom);
+            zoomItem.MaxZoom = EnsureNumber(zoomItem.MaxZoom);
+            if (zoomItem.MinZoom != null) {
+                if (zoomItem.MinZoom < min) {
+                    min = zoomItem.MinZoom;
                 }
-                if (zoomItem.MaxZoom != null) {
-                    if (zoomItem.MaxZoom > max) {
-                        max = zoomItem.MaxZoom;
-                    }
+            }
+            if (zoomItem.MaxZoom != null) {
+                if (zoomItem.MaxZoom > max) {
+                    max = zoomItem.MaxZoom;
                 }
             }
-            return [min, max];
         }
-        Utils.GetZoomMinMax = GetZoomMinMax;
-    })(Utils = RenderManager.Utils || (RenderManager.Utils = {}));
+        return [min, max];
+    }
+    RenderManager.GetZoomMinMax = GetZoomMinMax;
 })(RenderManager || (RenderManager = {}));
 
 function colorToCColor(color) {
@@ -981,7 +1047,11 @@ var EntityRenderEngine;
                         for (i = 0; i < params.entities.length; i++) {
                             entity = params.entities[i];
                             id = entity.Bruce.ID;
-                            zoomItem = RenderManager.Utils.DetermineZoomItem(params.viewer, entity, params.zoomControl);
+                            zoomItem = RenderManager.DetermineZoomItem({
+                                viewer: params.viewer,
+                                entity: entity,
+                                zoomControl: params.zoomControl
+                            });
                             displayType = zoomItem === null || zoomItem === void 0 ? void 0 : zoomItem.DisplayType;
                             if (!displayType) {
                                 displayType = ZoomControl.EDisplayType.Hidden;
@@ -992,7 +1062,10 @@ var EntityRenderEngine;
                             }
                             if (displayType != ZoomControl.EDisplayType.Hidden) {
                                 newRenderId = getRenderGroupId(zoomItem);
-                                existingRego = params.visualRegister.GetRego(id, params.menuItemId);
+                                existingRego = params.visualRegister.GetRego({
+                                    entityId: id,
+                                    menuItemId: params.menuItemId
+                                });
                                 oldRenderId = (_a = existingRego === null || existingRego === void 0 ? void 0 : existingRego.visual) === null || _a === void 0 ? void 0 : _a._renderGroup;
                                 if (newRenderId == oldRenderId && !(existingRego === null || existingRego === void 0 ? void 0 : existingRego.stale)) {
                                     cEntities[id] = existingRego.visual;
@@ -1082,17 +1155,24 @@ var EntityRenderEngine;
         });
     }
     EntityRenderEngine.Render = Render;
-    function Remove(viewer, entity) {
+    function Remove(params) {
+        var viewer = params.viewer, entity = params.entity;
         if (viewer.isDestroyed()) {
             return;
         }
         if (entity._parentEntity) {
-            Remove(viewer, entity._parentEntity);
+            Remove({
+                viewer: viewer,
+                entity: entity._parentEntity
+            });
         }
         if (entity._siblingGraphics) {
             for (var i = 0; i < entity._siblingGraphics.length; i++) {
                 var sibling = entity._siblingGraphics[i];
-                Remove(viewer, sibling);
+                Remove({
+                    viewer: viewer,
+                    entity: sibling
+                });
             }
         }
         if (viewer.entities.contains(entity)) {
@@ -1146,7 +1226,10 @@ var EntityRenderEngine;
                                 heightReference: getHeightRef(style),
                                 scale: iconScale
                             },
-                            position: EntityUtils.GetPos(params.viewer, entity),
+                            position: EntityUtils.GetPos({
+                                viewer: params.viewer,
+                                entity: entity
+                            }),
                             show: false
                         });
                     }
@@ -1170,7 +1253,10 @@ var EntityRenderEngine;
                         color: cColor,
                         heightReference: getHeightRef(style)
                     },
-                    position: EntityUtils.GetPos(params.viewer, entity),
+                    position: EntityUtils.GetPos({
+                        viewer: params.viewer,
+                        entity: entity
+                    }),
                     show: false
                 });
             }
@@ -1288,7 +1374,10 @@ var EntityRenderEngine;
                     zIndex: getZIndex(style, entity, params.tags),
                     clampToGround: heightRef == HeightReference.CLAMP_TO_GROUND
                 },
-                position: EntityUtils.GetPos(params.viewer, entity),
+                position: EntityUtils.GetPos({
+                    viewer: params.viewer,
+                    entity: entity
+                }),
                 show: false
             });
             params.viewer.entities.add(cEntity);
@@ -1392,7 +1481,10 @@ var EntityRenderEngine;
                     perPositionHeight: heightRef == HeightReference.CLAMP_TO_GROUND ? false : true,
                     zIndex: zIndex
                 },
-                position: EntityUtils.GetPos(params.viewer, entity),
+                position: EntityUtils.GetPos({
+                    viewer: params.viewer,
+                    entity: entity
+                }),
                 show: false
             });
             cEntity._siblingGraphics = [];
@@ -1491,7 +1583,10 @@ var EntityRenderEngine;
             scale *= styleScale;
             var hpr = new HeadingPitchRoll(Math$1.toRadians(heading), Math$1.toRadians(pitch), Math$1.toRadians(roll));
             var heightRef = getHeightRef(style);
-            var pos = EntityUtils.GetPos(params.viewer, entity);
+            var pos = EntityUtils.GetPos({
+                viewer: params.viewer,
+                entity: entity
+            });
             if (heightRef == HeightReference.CLAMP_TO_GROUND) {
                 var carto = Cartographic.fromCartesian(pos);
                 pos = Cartesian3.fromRadians(EnsureNumber(carto.longitude), EnsureNumber(carto.latitude), 0);
@@ -1672,7 +1767,7 @@ var EntityRenderEngine;
 var EntitiesRenderManager;
 (function (EntitiesRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsManager, apiGetter, monitor, item, sharedGetters) {
+        function Manager(params) {
             this.getter = null;
             this.getterSub = null;
             this.disposed = false;
@@ -1682,6 +1777,7 @@ var EntitiesRenderManager;
             this.entityCheckRemoval = null;
             this.isRunningCheck = false;
             this.viewMonitorRemoval = null;
+            var viewer = params.viewer, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item, visualsManager = params.register, sharedGetters = params.sharedGetters;
             this.viewer = viewer;
             this.sharedGetters = sharedGetters;
             this.monitor = monitor;
@@ -1713,7 +1809,9 @@ var EntitiesRenderManager;
                         typeId: this.item.BruceEntity["EntityType.ID"],
                         monitor: this.monitor
                     });
-                    minMax = RenderManager.Utils.GetZoomMinMax(this.item.CameraZoomSettings);
+                    minMax = RenderManager.GetZoomMinMax({
+                        zoomControl: this.item.CameraZoomSettings
+                    });
                     this.getter.IncludeMenuItem(this.item.id, [], minMax[0], minMax[1]);
                     this.getterSub = this.getter.OnUpdate.Subscribe(function (entities) {
                         _this.onGetterUpdate(entities);
@@ -1739,7 +1837,9 @@ var EntitiesRenderManager;
                 this.getter.ExcludeMenuItem(this.item.id);
             }
             this.disposed = true;
-            this.visualsManager.RemoveByMenuItemId(this.item.id);
+            this.visualsManager.RemoveRegos({
+                menuItemId: this.item.id
+            });
             (_b = this.entityCheckRemoval) === null || _b === void 0 ? void 0 : _b.call(this);
             (_c = this.viewMonitorRemoval) === null || _c === void 0 ? void 0 : _c.call(this);
         };
@@ -1751,7 +1851,10 @@ var EntitiesRenderManager;
                             if (entityIds == null) {
                                 entityIds = Object.keys(this.renderedEntities);
                             }
-                            this.visualsManager.MarkStale(entityIds, [this.item.id]);
+                            this.visualsManager.MarkStale({
+                                entityIds: entityIds,
+                                menuItemIds: [this.item.id]
+                            });
                             return [4 /*yield*/, this.doEntityCheck(entityIds)];
                         case 1:
                             _a.sent();
@@ -1864,19 +1967,28 @@ var EntitiesRenderManager;
                                 cEntity = cEntities[id];
                                 this.renderedEntities[id] = !!cEntity;
                                 if (cEntity) {
-                                    visual = (_b = this.visualsManager.GetRego(id, this.item.id)) === null || _b === void 0 ? void 0 : _b.visual;
+                                    visual = (_b = this.visualsManager.GetRego({
+                                        entityId: id,
+                                        menuItemId: this.item.id
+                                    })) === null || _b === void 0 ? void 0 : _b.visual;
                                     if (!visual || visual != cEntity) {
-                                        this.visualsManager.Add({
-                                            entityId: id,
-                                            menuItemId: this.item.id,
-                                            visual: cEntity,
-                                            priority: 0,
-                                            entityTypeId: entity.Bruce["EntityType.ID"]
+                                        this.visualsManager.AddRego({
+                                            rego: {
+                                                entityId: id,
+                                                menuItemId: this.item.id,
+                                                visual: cEntity,
+                                                priority: 0,
+                                                entityTypeId: entity.Bruce["EntityType.ID"],
+                                                accountId: this.apiGetter.accountId
+                                            }
                                         });
                                     }
                                 }
                                 else {
-                                    this.visualsManager.Remove(id, this.item.id);
+                                    this.visualsManager.RemoveRegos({
+                                        entityId: id,
+                                        menuItemId: this.item.id
+                                    });
                                 }
                             }
                             return [3 /*break*/, 3];
@@ -1902,11 +2014,12 @@ var EntitiesRenderManager;
 var EntitiesLoadedRenderManager;
 (function (EntitiesLoadedRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsManager, apiGetter, monitor, item) {
+        function Manager(params) {
             this.getter = null;
             this.getterSub = null;
             this.disposed = false;
             this.renderedEntities = {};
+            var viewer = params.viewer, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item, visualsManager = params.register;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
             this.monitor = monitor;
@@ -1944,7 +2057,9 @@ var EntitiesLoadedRenderManager;
             (_a = this.getterSub) === null || _a === void 0 ? void 0 : _a.call(this);
             this.getterSub = null;
             this.disposed = true;
-            this.visualsManager.RemoveByMenuItemId(this.item.id);
+            this.visualsManager.RemoveRegos({
+                menuItemId: this.item.id
+            });
         };
         Manager.prototype.ReRender = function (entityIds) {
             return __awaiter(this, void 0, void 0, function () {
@@ -1960,7 +2075,10 @@ var EntitiesLoadedRenderManager;
                             return (_b = (_a = _this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.Entities) === null || _b === void 0 ? void 0 : _b.find(function (y) { var _a; return ((_a = y === null || y === void 0 ? void 0 : y.Bruce) === null || _a === void 0 ? void 0 : _a.ID) == x; });
                         });
                     }
-                    this.visualsManager.MarkStale(entityIds, [this.item.id]);
+                    this.visualsManager.MarkStale({
+                        entityIds: entityIds,
+                        menuItemIds: [this.item.id]
+                    });
                     this.doEntityCheck(entityIds);
                     return [2 /*return*/];
                 });
@@ -2046,19 +2164,28 @@ var EntitiesLoadedRenderManager;
                                 cEntity = cEntities[id];
                                 this.renderedEntities[id] = !!cEntity;
                                 if (cEntity) {
-                                    visual = (_a = this.visualsManager.GetRego(id, this.item.id)) === null || _a === void 0 ? void 0 : _a.visual;
+                                    visual = (_a = this.visualsManager.GetRego({
+                                        entityId: id,
+                                        menuItemId: this.item.id
+                                    })) === null || _a === void 0 ? void 0 : _a.visual;
                                     if (!visual || visual != cEntity) {
-                                        this.visualsManager.Add({
-                                            entityId: id,
-                                            menuItemId: this.item.id,
-                                            visual: cEntity,
-                                            priority: 0,
-                                            entityTypeId: entity.Bruce["EntityType.ID"]
+                                        this.visualsManager.AddRego({
+                                            rego: {
+                                                entityId: id,
+                                                menuItemId: this.item.id,
+                                                visual: cEntity,
+                                                priority: 0,
+                                                entityTypeId: entity.Bruce["EntityType.ID"],
+                                                accountId: this.apiGetter.accountId
+                                            }
                                         });
                                     }
                                 }
                                 else {
-                                    this.visualsManager.Remove(id, this.item.id);
+                                    this.visualsManager.RemoveRegos({
+                                        entityId: id,
+                                        menuItemId: this.item.id
+                                    });
                                 }
                             }
                             return [3 /*break*/, 3];
@@ -2079,7 +2206,10 @@ var EntitiesLoadedRenderManager;
 function removeEntity(viewer, visual) {
     unmarkEntity(visual);
     if (visual instanceof Entity) {
-        EntityRenderEngine.Remove(viewer, visual);
+        EntityRenderEngine.Remove({
+            viewer: viewer,
+            entity: visual
+        });
     }
     else if (visual instanceof Primitive) {
         if (viewer.scene.primitives.contains(visual)) {
@@ -2134,8 +2264,12 @@ function updateEntityShow(viewer, visual, show) {
 function updateEntity(viewer, entityId, register) {
     var isolatedIds = register.GetIsolated();
     var isIsolated = isolatedIds.includes(entityId);
-    var isHidden = register.IsHidden(entityId);
-    var regos = register.GetRegos(entityId);
+    var isHidden = register.GetIsHidden({
+        entityId: entityId
+    });
+    var regos = register.GetRegos({
+        entityId: entityId
+    });
     var highestPriority = null;
     for (var i = 0; i < regos.length; i++) {
         var rego = regos[i];
@@ -2194,7 +2328,9 @@ function select(viewer, visual) {
     var _a;
     var color = Color.fromAlpha(Color.YELLOW, 0.5);
     if (visual instanceof Entity) {
-        var entities = EntityUtils.GatherEntity(visual);
+        var entities = EntityUtils.GatherEntity({
+            entity: visual
+        });
         var keyMapping = {
             "point": "color",
             "polygon": "material",
@@ -2234,14 +2370,22 @@ function select(viewer, visual) {
         }
         visual.color = color.clone();
     }
-    var opacity = EntityUtils.GetOpacity(visual);
+    var opacity = EntityUtils.GetOpacity({
+        entity: visual
+    });
     if (opacity != null) {
-        EntityUtils.SetOpacity(viewer, visual, opacity);
+        EntityUtils.SetOpacity({
+            viewer: viewer,
+            entity: visual,
+            opacity: opacity
+        });
     }
 }
 function deselect(viewer, visual) {
     if (visual instanceof Entity) {
-        var entities = EntityUtils.GatherEntity(visual);
+        var entities = EntityUtils.GatherEntity({
+            entity: visual
+        });
         var keyMapping = {
             "point": "color",
             "polygon": "material",
@@ -2273,9 +2417,15 @@ function deselect(viewer, visual) {
             visual.color = orgColor;
         }
     }
-    var opacity = EntityUtils.GetOpacity(visual);
+    var opacity = EntityUtils.GetOpacity({
+        entity: visual
+    });
     if (opacity != null) {
-        EntityUtils.SetOpacity(viewer, visual, opacity);
+        EntityUtils.SetOpacity({
+            viewer: viewer,
+            entity: visual,
+            opacity: opacity
+        });
     }
 }
 /**
@@ -2284,6 +2434,12 @@ function deselect(viewer, visual) {
  */
 var VisualsRegister;
 (function (VisualsRegister) {
+    var EVisualUpdateType;
+    (function (EVisualUpdateType) {
+        EVisualUpdateType["Add"] = "ADD";
+        EVisualUpdateType["Remove"] = "REMOVE";
+        EVisualUpdateType["Update"] = "UPDATE";
+    })(EVisualUpdateType = VisualsRegister.EVisualUpdateType || (VisualsRegister.EVisualUpdateType = {}));
     var Register = /** @class */ (function () {
         function Register(viewer) {
             this.id = ObjectUtils.UId();
@@ -2292,6 +2448,8 @@ var VisualsRegister;
             this.selectedIds = [];
             this.isolatedIds = [];
             this.hiddenIds = [];
+            // Entity id -> opacity for visual.
+            this.opacity = {};
             this.viewer = viewer;
         }
         Object.defineProperty(Register.prototype, "Id", {
@@ -2301,6 +2459,13 @@ var VisualsRegister;
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(Register.prototype, "Viewer", {
+            get: function () {
+                return this.viewer;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(Register.prototype, "OnUpdate", {
             get: function () {
                 if (!this.onUpdate) {
@@ -2311,37 +2476,52 @@ var VisualsRegister;
             enumerable: false,
             configurable: true
         });
-        Register.prototype.Select = function (id, refreshIfSelected) {
-            if (refreshIfSelected === void 0) { refreshIfSelected = false; }
-            var doSelect = refreshIfSelected;
-            if (this.selectedIds.indexOf(id) === -1) {
-                this.selectedIds.push(id);
-                doSelect = true;
-            }
-            if (doSelect) {
-                var regos = this.rego[id];
-                if (regos) {
-                    for (var i = 0; i < regos.length; i++) {
-                        var rego = regos[i];
-                        select(this.viewer, rego.visual);
+        Register.prototype.SetSelected = function (params) {
+            var _a;
+            var entityIds = params.entityIds, selected = params.selected, refreshIfSelected = params.refreshIfSelected;
+            if (refreshIfSelected == null) {
+                refreshIfSelected = true;
+            }
+            for (var i = 0; i < entityIds.length; i++) {
+                var id = entityIds[i];
+                if (selected) {
+                    var doSelect = refreshIfSelected;
+                    if (this.selectedIds.indexOf(id) === -1) {
+                        this.selectedIds.push(id);
+                        doSelect = true;
+                    }
+                    if (doSelect) {
+                        var regos = this.rego[id];
+                        if (regos) {
+                            for (var i_1 = 0; i_1 < regos.length; i_1++) {
+                                var rego = regos[i_1];
+                                select(this.viewer, rego.visual);
+                            }
+                        }
                     }
                 }
-            }
-        };
-        Register.prototype.Deselect = function (id) {
-            var index = this.selectedIds.indexOf(id);
-            if (index !== -1) {
-                this.selectedIds.splice(index, 1);
-                var regos = this.rego[id];
-                if (regos) {
-                    for (var i = 0; i < regos.length; i++) {
-                        var rego = regos[i];
-                        deselect(this.viewer, rego.visual);
+                else {
+                    var index = this.selectedIds.indexOf(id);
+                    if (index !== -1) {
+                        this.selectedIds.splice(index, 1);
+                        var regos = this.rego[id];
+                        if (regos) {
+                            for (var i_2 = 0; i_2 < regos.length; i_2++) {
+                                var rego = regos[i_2];
+                                deselect(this.viewer, rego.visual);
+                            }
+                        }
                     }
                 }
+                (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
+                    entityId: id,
+                    type: EVisualUpdateType.Update,
+                    selected: selected
+                });
             }
         };
-        Register.prototype.IsSelected = function (id) {
+        Register.prototype.GetIsSelected = function (params) {
+            var id = params.entityId;
             return this.selectedIds.indexOf(id) !== -1;
         };
         Register.prototype.ClearSelected = function () {
@@ -2349,8 +2529,8 @@ var VisualsRegister;
                 var id = this.selectedIds[i];
                 var regos = this.rego[id];
                 if (regos) {
-                    for (var i_1 = 0; i_1 < regos.length; i_1++) {
-                        var rego = regos[i_1];
+                    for (var i_3 = 0; i_3 < regos.length; i_3++) {
+                        var rego = regos[i_3];
                         deselect(this.viewer, rego.visual);
                     }
                 }
@@ -2360,20 +2540,32 @@ var VisualsRegister;
         Register.prototype.GetSelected = function () {
             return this.selectedIds;
         };
-        Register.prototype.Isolate = function (id) {
-            if (this.isolatedIds.indexOf(id) === -1) {
-                this.isolatedIds.push(id);
-            }
-            this.updateAllEntities();
-        };
-        Register.prototype.Deisolate = function (id) {
-            var index = this.isolatedIds.indexOf(id);
-            if (index !== -1) {
-                this.isolatedIds.splice(index, 1);
+        Register.prototype.SetIsolate = function (params) {
+            var _a;
+            var entityIds = params.entityIds, isolate = params.isolated;
+            for (var i = 0; i < entityIds.length; i++) {
+                var id = entityIds[i];
+                if (isolate) {
+                    if (this.isolatedIds.indexOf(id) === -1) {
+                        this.isolatedIds.push(id);
+                    }
+                }
+                else {
+                    var index = this.isolatedIds.indexOf(id);
+                    if (index !== -1) {
+                        this.isolatedIds.splice(index, 1);
+                    }
+                }
+                (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
+                    entityId: id,
+                    type: EVisualUpdateType.Update,
+                    isolated: isolate
+                });
             }
             this.updateAllEntities();
         };
-        Register.prototype.IsIsolated = function (id) {
+        Register.prototype.GetIsIsolated = function (params) {
+            var id = params.entityId;
             return this.isolatedIds.indexOf(id) !== -1;
         };
         Register.prototype.GetIsolated = function () {
@@ -2383,42 +2575,80 @@ var VisualsRegister;
             this.isolatedIds = [];
             this.updateAllEntities();
         };
-        Register.prototype.Hide = function (id) {
-            if (this.hiddenIds.indexOf(id) === -1) {
-                this.hiddenIds.push(id);
-            }
-            updateEntity(this.viewer, id, this);
-        };
-        Register.prototype.Show = function (id) {
-            var index = this.hiddenIds.indexOf(id);
-            if (index !== -1) {
-                this.hiddenIds.splice(index, 1);
+        Register.prototype.SetHide = function (params) {
+            var _a;
+            var entityIds = params.entityIds, hidden = params.hidden;
+            for (var i = 0; i < entityIds.length; i++) {
+                var id = entityIds[i];
+                if (hidden) {
+                    if (this.hiddenIds.indexOf(id) === -1) {
+                        this.hiddenIds.push(id);
+                    }
+                    updateEntity(this.viewer, id, this);
+                }
+                else {
+                    var index = this.hiddenIds.indexOf(id);
+                    if (index !== -1) {
+                        this.hiddenIds.splice(index, 1);
+                    }
+                    updateEntity(this.viewer, id, this);
+                }
+                (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
+                    entityId: id,
+                    type: EVisualUpdateType.Update,
+                    hidden: hidden
+                });
             }
-            updateEntity(this.viewer, id, this);
         };
-        Register.prototype.IsHidden = function (id) {
+        Register.prototype.GetIsHidden = function (params) {
+            var id = params.entityId;
             return this.hiddenIds.indexOf(id) !== -1;
         };
         Register.prototype.GetHidden = function () {
             return this.hiddenIds;
         };
         Register.prototype.ClearHidden = function () {
+            var _a;
             this.hiddenIds = [];
             this.updateAllEntities();
+            (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
+                type: EVisualUpdateType.Update,
+                hidden: false
+            });
         };
-        Register.prototype.Add = function (rego) {
+        Register.prototype.AddRego = function (params) {
             var _a, _b;
-            this.Remove(rego.entityId, rego.menuItemId, false);
+            var rego = params.rego;
+            this.RemoveRegos({
+                entityId: rego.entityId,
+                menuItemId: rego.menuItemId,
+                doUpdate: false
+            });
             var entityId = rego.entityId;
             var entityRegos = (_a = this.rego[entityId]) !== null && _a !== void 0 ? _a : [];
             entityRegos.push(rego);
             this.rego[entityId] = entityRegos;
             markEntity(this, rego, rego.visual);
             updateEntity(this.viewer, entityId, this);
-            if (this.selectedIds.includes(entityId)) {
+            var selected = this.selectedIds.includes(entityId);
+            if (selected) {
                 select(this.viewer, rego.visual);
             }
-            (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({ rego: rego, isAdding: true });
+            var opacity = this.opacity[entityId];
+            if (opacity != null && opacity != 100) {
+                EntityUtils.SetOpacity({
+                    entity: rego.visual,
+                    opacity: opacity,
+                    viewer: this.viewer
+                });
+            }
+            (_b = this.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({
+                rego: rego,
+                type: EVisualUpdateType.Add,
+                entityId: rego.entityId,
+                opacity: opacity,
+                selected: selected
+            });
         };
         /**
          * Locates a visual corresponding to a given entity id.
@@ -2427,7 +2657,8 @@ var VisualsRegister;
          * @param menuItemId
          * @returns
          */
-        Register.prototype.GetRego = function (entityId, menuItemId) {
+        Register.prototype.GetRego = function (params) {
+            var entityId = params.entityId, menuItemId = params.menuItemId;
             var entityRegos = this.rego[entityId];
             if (!entityRegos) {
                 return [];
@@ -2437,94 +2668,104 @@ var VisualsRegister;
             }
             return entityRegos.find(function (x) { return x.best; });
         };
-        Register.prototype.GetRegos = function (entityId) {
-            var entityRegos = this.rego[entityId];
-            if (!entityRegos) {
-                return [];
-            }
-            return entityRegos;
-        };
-        Register.prototype.GetMenuItemRegos = function (menuItemId) {
-            var visuals = [];
-            for (var entityId in this.rego) {
-                var entityRegos = this.rego[entityId];
-                if (entityRegos) {
-                    var rego = entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
-                    if (rego) {
-                        visuals.push(rego);
-                    }
+        /**
+         * Returns regos matching given criteria.
+         * Either entityId or menuItemId must be provided.
+         * @param params
+         * @returns
+         */
+        Register.prototype.GetRegos = function (params) {
+            // TODO: refactor.
+            // Currently this was made by merging two functions.
+            var entityId = params.entityId, menuItemId = params.menuItemId;
+            if (entityId) {
+                var entityId_1 = params.entityId;
+                var entityRegos = this.rego[entityId_1];
+                if (!entityRegos) {
+                    return [];
                 }
-            }
-            return visuals;
-        };
-        Register.prototype.RemoveByEntityId = function (id) {
-            var _a;
-            var entityRegos = this.rego[id];
-            if (!entityRegos) {
-                return;
-            }
-            for (var i = 0; i < entityRegos.length; i++) {
-                var rego = entityRegos[i];
-                (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({ rego: rego, isAdding: false });
-                removeEntity(this.viewer, rego.visual);
-            }
-            this.rego[id] = [];
-            delete this.rego[id];
-        };
-        Register.prototype.RemoveByMenuItemId = function (id) {
-            var _a;
-            for (var entityId in this.rego) {
-                var entityRegos = this.rego[entityId];
-                if (entityRegos) {
-                    var rego = entityRegos.find(function (r) { return r.menuItemId === id; });
-                    if (!rego) {
-                        continue;
-                    }
-                    (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({ rego: rego, isAdding: false });
-                    removeEntity(this.viewer, rego.visual);
-                    var doesInclude = this.rego[entityId].find(function (r) { return r.menuItemId === id; });
-                    if (doesInclude) {
-                        this.rego[entityId] = entityRegos.filter(function (r) { return r.menuItemId !== id; });
-                        updateEntity(this.viewer, entityId, this);
+                return menuItemId ? entityRegos.filter(function (x) { return x.menuItemId == menuItemId; }) : entityRegos;
+            }
+            else if (menuItemId) {
+                var menuItemId_1 = params.menuItemId;
+                var visuals = [];
+                for (var entityId_2 in this.rego) {
+                    var entityRegos = this.rego[entityId_2];
+                    if (entityRegos) {
+                        var rego = entityRegos.find(function (r) { return r.menuItemId === menuItemId_1; });
+                        if (rego) {
+                            visuals.push(rego);
+                        }
                     }
                 }
+                return visuals;
             }
         };
         /**
-         *
-         * @param entityId
-         * @param menuItemId if not supplied it will affect all menu items.
-         * @param _doUpdate if menu item id is not supplied, then this will be ignored.
+         * Removes regos matching given criteria.
+         * Either entityId or menuItemId must be provided.
+         * @param params
          * @returns
          */
-        Register.prototype.Remove = function (entityId, menuItemId, _doUpdate) {
-            var _a;
-            if (_doUpdate == null) {
-                _doUpdate = true;
-            }
-            var entityRegos = this.rego[entityId];
-            if (!entityRegos) {
-                return;
+        Register.prototype.RemoveRegos = function (params) {
+            var _a, _b;
+            var entityId = params.entityId, menuItemId = params.menuItemId, doUpdate = params.doUpdate;
+            if (doUpdate == null) {
+                doUpdate = true;
+            }
+            // TODO: refactor.
+            // Currently this was made by merging two functions.
+            if (menuItemId && !entityId) {
+                for (var entityId_3 in this.rego) {
+                    var entityRegos = this.rego[entityId_3];
+                    if (entityRegos) {
+                        var rego = entityRegos.find(function (r) { return r.menuItemId === menuItemId; });
+                        if (!rego) {
+                            continue;
+                        }
+                        removeEntity(this.viewer, rego.visual);
+                        (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
+                            type: EVisualUpdateType.Remove,
+                            entityId: rego.entityId,
+                            rego: rego
+                        });
+                        var doesInclude = this.rego[entityId_3].find(function (r) { return r.menuItemId === menuItemId; });
+                        if (doesInclude) {
+                            this.rego[entityId_3] = entityRegos.filter(function (r) { return r.menuItemId !== menuItemId; });
+                            updateEntity(this.viewer, entityId_3, this);
+                        }
+                    }
+                }
             }
-            var menuItems = menuItemId ? menuItemId : Object.keys(entityRegos);
-            var _loop_3 = function (i) {
-                var menuItemId_1 = menuItems[i];
-                var rego = entityRegos.find(function (r) { return r.menuItemId === menuItemId_1; });
-                if (!rego) {
-                    return { value: void 0 };
+            else if (entityId) {
+                var entityRegos = this.rego[entityId];
+                if (!entityRegos) {
+                    return;
                 }
-                (_a = this_1.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({ rego: rego, isAdding: false });
-                removeEntity(this_1.viewer, rego.visual);
-                this_1.rego[entityId] = entityRegos.filter(function (r) { return r.menuItemId !== menuItemId_1; });
-                if (_doUpdate && menuItemId_1) {
-                    updateEntity(this_1.viewer, entityId, this_1);
+                var menuItems = menuItemId ? menuItemId : Object.keys(entityRegos);
+                var _loop_3 = function (i) {
+                    var menuItemId_2 = menuItems[i];
+                    var rego = entityRegos.find(function (r) { return r.menuItemId === menuItemId_2; });
+                    if (!rego) {
+                        return { value: void 0 };
+                    }
+                    removeEntity(this_1.viewer, rego.visual);
+                    (_b = this_1.onUpdate) === null || _b === void 0 ? void 0 : _b.Trigger({
+                        type: EVisualUpdateType.Remove,
+                        entityId: rego.entityId,
+                        rego: rego
+                    });
+                    this_1.rego[entityId] = entityRegos.filter(function (r) { return r.menuItemId !== menuItemId_2; });
+                    if (doUpdate && menuItemId_2) {
+                        updateEntity(this_1.viewer, entityId, this_1);
+                    }
+                };
+                var this_1 = this;
+                for (var i = 0; i < menuItems.length; i++) {
+                    var state_1 = _loop_3(i);
+                    if (typeof state_1 === "object")
+                        return state_1.value;
                 }
-            };
-            var this_1 = this;
-            for (var i = 0; i < menuItems.length; i++) {
-                var state_1 = _loop_3(i);
-                if (typeof state_1 === "object")
-                    return state_1.value;
             }
         };
         /**
@@ -2533,10 +2774,15 @@ var VisualsRegister;
          * @param cursor
          * @returns
          */
-        Register.prototype.GetFromCursor = function (cursor) {
+        Register.prototype.GetRegosFromCursor = function (params) {
             var _a;
+            var cursor = params.cursor;
             var found = [];
-            var picked = this.viewer.scene.drillPick(new Cartesian2(cursor.x, cursor.y), 5);
+            var width = Math.ceil(EnsureNumber(params.width, 5));
+            var height = Math.ceil(EnsureNumber(params.height, 5));
+            var x = Math.ceil(cursor.x - width / 2);
+            var y = Math.ceil(cursor.y - height / 2);
+            var picked = this.viewer.scene.drillPick(new Cartesian2(x, y), 5, width, height);
             for (var i = 0; i < picked.length; i++) {
                 var object = picked[i];
                 var entity = (object && object.id && object.id instanceof Entity ? object.id : object);
@@ -2545,12 +2791,14 @@ var VisualsRegister;
                     found.push(visual._rego);
                 }
             }
-            return found;
+            return {
+                regos: found
+            };
         };
         /**
          * Returns all registered entity ids.
          */
-        Register.prototype.GetIds = function () {
+        Register.prototype.GetEntityIds = function () {
             var ids = [];
             for (var entityId in this.rego) {
                 var regos = this.rego[entityId];
@@ -2564,10 +2812,10 @@ var VisualsRegister;
          * Marks regos corresponding to given entity ids as stale.
          * This will cause them to be updated on the next update cycle.
          * Optionally include menu item ids to restrict the filter.
-         * @param entityIds
-         * @param menuItemIds
+         * @param params
          */
-        Register.prototype.MarkStale = function (entityIds, menuItemIds) {
+        Register.prototype.MarkStale = function (params) {
+            var entityIds = params.entityIds, menuItemIds = params.menuItemIds;
             for (var _i = 0, entityIds_1 = entityIds; _i < entityIds_1.length; _i++) {
                 var entityId = entityIds_1[_i];
                 var regos = this.rego[entityId];
@@ -2589,6 +2837,77 @@ var VisualsRegister;
                 }
             }
         };
+        /**
+         * Sets opacity for given set of entities.
+         * 100% opacity is treated as "use original".
+         * @param params
+         */
+        Register.prototype.SetOpacity = function (params) {
+            var _a;
+            var entityIds = params.entityIds, menuItemIds = params.menuItemId;
+            for (var _i = 0, entityIds_2 = entityIds; _i < entityIds_2.length; _i++) {
+                var entityId = entityIds_2[_i];
+                var regos = this.rego[entityId];
+                if (regos && regos.length) {
+                    for (var _b = 0, regos_2 = regos; _b < regos_2.length; _b++) {
+                        var rego = regos_2[_b];
+                        if (rego.visual &&
+                            (!menuItemIds || menuItemIds.includes(rego.menuItemId))) {
+                            if (params.opacity == 100) {
+                                EntityUtils.RevertOpacity({
+                                    entity: rego.visual,
+                                    viewer: this.viewer
+                                });
+                            }
+                            else {
+                                EntityUtils.SetOpacity({
+                                    entity: rego.visual,
+                                    opacity: params.opacity,
+                                    viewer: this.viewer
+                                });
+                            }
+                            this.opacity[rego.entityId] = params.opacity;
+                            (_a = this.onUpdate) === null || _a === void 0 ? void 0 : _a.Trigger({
+                                rego: rego,
+                                type: EVisualUpdateType.Update,
+                                entityId: rego.entityId,
+                                opacity: params.opacity
+                            });
+                        }
+                    }
+                }
+            }
+        };
+        /**
+         * Returns opacity for given entity/s.
+         * If multiple entities are supplied, then the average is returned.
+         * Unknown opacity is treated as 100% opacity.
+         * @param params
+         * @returns
+         */
+        Register.prototype.GetOpacity = function (params) {
+            var totalOpacity = null;
+            var totalTicks = 0;
+            var entityIds = params.entityIds, menuItemIds = params.menuItemIds;
+            for (var _i = 0, entityIds_3 = entityIds; _i < entityIds_3.length; _i++) {
+                var entityId = entityIds_3[_i];
+                var regos = this.rego[entityId];
+                if (regos && regos.length) {
+                    for (var _a = 0, regos_3 = regos; _a < regos_3.length; _a++) {
+                        var rego = regos_3[_a];
+                        if (rego.visual &&
+                            (!menuItemIds || menuItemIds.includes(rego.menuItemId))) {
+                            var opacity = this.opacity[rego.entityId];
+                            if (opacity != null) {
+                                totalOpacity += opacity;
+                                totalTicks += 1;
+                            }
+                        }
+                    }
+                }
+            }
+            return totalOpacity ? totalOpacity / totalTicks : 100;
+        };
         return Register;
     }());
     VisualsRegister.Register = Register;
@@ -2601,11 +2920,12 @@ var VisualsRegister;
 var EntitiesIdsRenderManager;
 (function (EntitiesIdsRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsManager, apiGetter, monitor, item) {
+        function Manager(params) {
             this.getter = null;
             this.getterSub = null;
             this.disposed = false;
             this.renderedEntities = {};
+            var viewer = params.viewer, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item, visualsManager = params.register;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
             this.monitor = monitor;
@@ -2643,7 +2963,9 @@ var EntitiesIdsRenderManager;
             (_a = this.getterSub) === null || _a === void 0 ? void 0 : _a.call(this);
             this.getterSub = null;
             this.disposed = true;
-            this.visualsManager.RemoveByMenuItemId(this.item.id);
+            this.visualsManager.RemoveRegos({
+                menuItemId: this.item.id
+            });
         };
         Manager.prototype.ReRender = function (entityIds) {
             return __awaiter(this, void 0, void 0, function () {
@@ -2659,7 +2981,10 @@ var EntitiesIdsRenderManager;
                             return (_a = _this.item.BruceEntity) === null || _a === void 0 ? void 0 : _a.EntityIds.includes(x);
                         });
                     }
-                    this.visualsManager.MarkStale(entityIds, [this.item.id]);
+                    this.visualsManager.MarkStale({
+                        entityIds: entityIds,
+                        menuItemIds: [this.item.id]
+                    });
                     this.onGetterUpdate(entityIds);
                     return [2 /*return*/];
                 });
@@ -2701,19 +3026,28 @@ var EntitiesIdsRenderManager;
                                 cEntity = cEntities[id];
                                 this.renderedEntities[id] = !!cEntity;
                                 if (cEntity) {
-                                    visual = (_a = this.visualsManager.GetRego(id, this.item.id)) === null || _a === void 0 ? void 0 : _a.visual;
+                                    visual = (_a = this.visualsManager.GetRego({
+                                        entityId: id,
+                                        menuItemId: this.item.id
+                                    })) === null || _a === void 0 ? void 0 : _a.visual;
                                     if (!visual || visual != cEntity) {
-                                        this.visualsManager.Add({
-                                            entityId: id,
-                                            menuItemId: this.item.id,
-                                            visual: cEntity,
-                                            priority: 0,
-                                            entityTypeId: entity.Bruce["EntityType.ID"]
+                                        this.visualsManager.AddRego({
+                                            rego: {
+                                                entityId: id,
+                                                menuItemId: this.item.id,
+                                                visual: cEntity,
+                                                priority: 0,
+                                                entityTypeId: entity.Bruce["EntityType.ID"],
+                                                accountId: this.apiGetter.accountId
+                                            }
                                         });
                                     }
                                 }
                                 else {
-                                    this.visualsManager.Remove(id, this.item.id);
+                                    this.visualsManager.RemoveRegos({
+                                        entityId: id,
+                                        menuItemId: this.item.id
+                                    });
                                 }
                             }
                             return [3 /*break*/, 5];
@@ -2737,10 +3071,11 @@ var EntitiesIdsRenderManager;
 var EntityRenderManager;
 (function (EntityRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsManager, apiGetter, monitor, item) {
+        function Manager(params) {
             this.getter = null;
             this.getterSub = null;
             this.disposed = false;
+            var viewer = params.viewer, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item, visualsManager = params.register;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
             this.monitor = monitor;
@@ -2778,7 +3113,9 @@ var EntityRenderManager;
             this.disposed = true;
             (_a = this.getterSub) === null || _a === void 0 ? void 0 : _a.call(this);
             this.getterSub = null;
-            this.visualsManager.RemoveByMenuItemId(this.item.id);
+            this.visualsManager.RemoveRegos({
+                menuItemId: this.item.id
+            });
         };
         Manager.prototype.ReRender = function (entityIds) {
             return __awaiter(this, void 0, void 0, function () {
@@ -2788,7 +3125,10 @@ var EntityRenderManager;
                             if (entityIds && !entityIds.includes(this.item.BruceEntity.EntityId)) {
                                 return [2 /*return*/];
                             }
-                            this.visualsManager.MarkStale(entityIds, [this.item.id]);
+                            this.visualsManager.MarkStale({
+                                entityIds: entityIds,
+                                menuItemIds: [this.item.id]
+                            });
                             return [4 /*yield*/, this.onGetterUpdate(this.item.BruceEntity.EntityId)];
                         case 1:
                             _a.sent();
@@ -2827,19 +3167,28 @@ var EntityRenderManager;
                             cEntities = _b.sent();
                             cEntity = cEntities[id];
                             if (cEntity) {
-                                visual = (_a = this.visualsManager.GetRego(id, this.item.id)) === null || _a === void 0 ? void 0 : _a.visual;
+                                visual = (_a = this.visualsManager.GetRego({
+                                    entityId: id,
+                                    menuItemId: this.item.id
+                                })) === null || _a === void 0 ? void 0 : _a.visual;
                                 if (!visual || visual != cEntity) {
-                                    this.visualsManager.Add({
-                                        entityId: entity.Bruce.ID,
-                                        menuItemId: this.item.id,
-                                        visual: cEntity,
-                                        priority: 0,
-                                        entityTypeId: entity.Bruce["EntityType.ID"]
+                                    this.visualsManager.AddRego({
+                                        rego: {
+                                            entityId: entity.Bruce.ID,
+                                            menuItemId: this.item.id,
+                                            visual: cEntity,
+                                            priority: 0,
+                                            entityTypeId: entity.Bruce["EntityType.ID"],
+                                            accountId: this.apiGetter.accountId
+                                        }
                                     });
                                 }
                             }
                             else {
-                                this.visualsManager.Remove(id, this.item.id);
+                                this.visualsManager.RemoveRegos({
+                                    entityId: id,
+                                    menuItemId: this.item.id
+                                });
                             }
                             return [3 /*break*/, 4];
                         case 3:
@@ -2917,6 +3266,15 @@ var TilesetRenderEngine;
         root.transform = Matrix4.multiplyByTranslation(root.transform, new Cartesian3(EnsureNumber(transform.x), EnsureNumber(transform.y), EnsureNumber(transform.z)), root.transform);
         // Force matrix to update
         root.updateTransform();
+        // Store data in the tileset as we can't interpret it using the cesium primitive later.
+        var cTilesetExt = cTileset;
+        cTilesetExt._bruceCoords = __assign({}, cTilesetExt._bruceCoords);
+        cTilesetExt._bruceCoords.ucs = coords.ucs ? {
+            location: coords.ucs.location ? JSON.parse(JSON.stringify(coords.ucs.location)) : null,
+            transform: null
+        } : null;
+        cTilesetExt._bruceCoords.location = location ? JSON.parse(JSON.stringify(location)) : null;
+        cTilesetExt._bruceCoords.transform = transform ? JSON.parse(JSON.stringify(transform)) : null;
     }
     TilesetRenderEngine.ApplyPosition = ApplyPosition;
     function ApplySettings(cTileset, tileset) {
@@ -3011,6 +3369,149 @@ var TilesetRenderEngine;
         }
     }
     TilesetRenderEngine.Render = Render;
+    function ApplyLegacyPosition(params) {
+        var cTileset = params.cTileset, tileset = params.tileset;
+        var settings = tileset.Settings;
+        settings = __assign({}, settings);
+        var origin = settings.origin;
+        origin = __assign({}, origin);
+        var etc = settings.etc;
+        etc = __assign({}, etc);
+        var root = cTileset.root;
+        var transform = etc.dontTransform != true;
+        if (!transform) {
+            return;
+        }
+        if (origin.usingBoundingBox == null) {
+            origin.usingBoundingBox = true;
+        }
+        var getCurPos3d = function () {
+            if (origin.usingBoundingBox == false) {
+                return Matrix4.getTranslation(root.transform, new Cartesian3());
+            }
+            else {
+                return Cartesian3.clone(root.boundingSphere.center);
+            }
+        };
+        var pos3d;
+        if (origin.latitude != null && origin.longitude != null) {
+            pos3d = Cartesian3.fromDegrees(EnsureNumber(origin.longitude), EnsureNumber(origin.latitude), EnsureNumber(origin.altitude));
+        }
+        if (!pos3d) {
+            pos3d = getCurPos3d();
+        }
+        // Store data in the tileset as we can't interpret it using the cesium primitive later.
+        var cTilesetExt = cTileset;
+        cTilesetExt._bruceCoords.transform = null;
+        var rotate = etc.dontRotate != true;
+        if (rotate) {
+            var rotation = settings.rotation;
+            var hpr = HeadingPitchRoll.fromDegrees(EnsureNumber(rotation.z), EnsureNumber(rotation.x), EnsureNumber(rotation.y), new HeadingPitchRoll());
+            root.transform = Transforms.headingPitchRollToFixedFrame(pos3d, hpr);
+            root.updateTransform();
+            cTilesetExt._bruceCoords.transform = {
+                heading: rotation.z,
+                pitch: rotation.x,
+                roll: rotation.y,
+                scale: 1
+            };
+        }
+        var curPos3d = getCurPos3d();
+        var newTransform = Matrix4.pack(root.transform.clone(new Matrix4()), []);
+        newTransform[12] += pos3d.x - curPos3d.x;
+        newTransform[13] += pos3d.y - curPos3d.y;
+        newTransform[14] += pos3d.z - curPos3d.z;
+        root.transform = Matrix4.unpack(newTransform);
+        root.updateTransform();
+        var carto = Cartographic.fromCartesian(pos3d);
+        cTilesetExt._bruceCoords.location = carto ? {
+            altitude: carto.height,
+            latitude: carto.latitude,
+            longitude: carto.longitude
+        } : null;
+        cTilesetExt._bruceCoords.legacy = true;
+        cTilesetExt._bruceCoords.legacyUsingBoundingBox = origin.usingBoundingBox;
+    }
+    TilesetRenderEngine.ApplyLegacyPosition = ApplyLegacyPosition;
+    function ApplyLegacySettings(params) {
+        var cTileset = params.cTileset, tileset = params.tileset;
+        var settings = tileset.Settings;
+        settings = __assign({}, settings);
+        var visual = settings.visual;
+        visual = __assign({}, visual);
+        cTileset.maximumScreenSpaceError = EnsureNumber(visual.maximumScreenSpaceError, 5);
+        cTileset.pointCloudShading.attenuation = visual.attenuation != false;
+        cTileset.pointCloudShading.maximumAttenuation = EnsureNumber(visual.attenuationMax, 4);
+        var colorMask = visual.colorMask;
+        if (colorMask && (tileset.Type == "S" || tileset.Type == "X")) {
+            tileset.style = new Cesium3DTileStyle({
+                color: colorMask
+            });
+        }
+    }
+    TilesetRenderEngine.ApplyLegacySettings = ApplyLegacySettings;
+    function RenderLegacy(params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var apiGetter, viewer, tileset, ionId, settings, visual, etc, loadUrl, api, cTileset;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        apiGetter = params.apiGetter, viewer = params.viewer, tileset = params.tileset, ionId = params.ionId;
+                        settings = tileset === null || tileset === void 0 ? void 0 : tileset.Settings;
+                        settings = __assign({}, settings);
+                        visual = settings.visual;
+                        visual = __assign({}, visual);
+                        etc = settings.etc;
+                        etc = __assign({}, etc);
+                        loadUrl = null;
+                        if (!ionId) return [3 /*break*/, 2];
+                        return [4 /*yield*/, IonResource.fromAssetId(EnsureNumber(ionId))];
+                    case 1:
+                        // TODO: Can cause issues with menu-item dispose race conditions.
+                        loadUrl = _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        if (tileset) {
+                            if (etc === null || etc === void 0 ? void 0 : etc.ExternalTilesetURL) {
+                                loadUrl = etc.ExternalTilesetURL;
+                            }
+                            else {
+                                api = apiGetter.getApi(apiGetter.accountId);
+                                loadUrl = api.GetBaseUrl() + ("ui.tileset/" + tileset.id + "/file/tileset.json");
+                            }
+                        }
+                        _a.label = 3;
+                    case 3:
+                        cTileset = this.cTileset = new Cesium3DTileset({
+                            url: loadUrl
+                        });
+                        this.viewer.scene.primitives.add(cTileset);
+                        cTileset.readyPromise.then(function () {
+                            try {
+                                if (!isAlive(viewer, cTileset)) {
+                                    return;
+                                }
+                                if (tileset) {
+                                    ApplyLegacySettings({
+                                        cTileset: cTileset,
+                                        tileset: tileset
+                                    });
+                                    ApplyLegacyPosition({
+                                        cTileset: cTileset,
+                                        tileset: tileset
+                                    });
+                                }
+                            }
+                            catch (e) {
+                                console.error(e);
+                            }
+                        });
+                        return [2 /*return*/, cTileset];
+                }
+            });
+        });
+    }
+    TilesetRenderEngine.RenderLegacy = RenderLegacy;
     var CadStyler = /** @class */ (function () {
         function CadStyler(api, cTileset, fallbackStyleId, styleMapping) {
             this.disposed = false;
@@ -3405,10 +3906,11 @@ var TilesetRenderEngine;
 var TilesetCadRenderManager;
 (function (TilesetCadRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsManager, apiGetter, item) {
+        function Manager(params) {
             this.disposed = false;
             this.cTileset = null;
             this.styler = null;
+            var viewer = params.viewer, visualsManager = params.register, apiGetter = params.apiGetter, item = params.item;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
             this.item = item;
@@ -3507,13 +4009,13 @@ var TilesetCadRenderManager;
             for (var i = 0; i < content.featuresLength; i++) {
                 var feature = content.getFeature(i);
                 var rego = this.mapTilesetFeature(feature);
-                if (rego === null || rego === void 0 ? void 0 : rego.entityId) {
+                if ((rego === null || rego === void 0 ? void 0 : rego.entityId) && this.styler) {
                     this.styler.QueueEntities([rego]);
                 }
             }
         };
         Manager.prototype.mapTilesetFeature = function (feature) {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e, _f;
             var version = (_c = (_b = (_a = feature === null || feature === void 0 ? void 0 : feature.tileset) === null || _a === void 0 ? void 0 : _a.extensions) === null || _b === void 0 ? void 0 : _b.modelTree) === null || _c === void 0 ? void 0 : _c.version;
             if (!version) {
                 version = 1;
@@ -3523,7 +4025,8 @@ var TilesetCadRenderManager;
                 entityTypeId: null,
                 menuItemId: this.item.id,
                 priority: 0,
-                visual: feature
+                visual: feature,
+                accountId: (_e = (_d = this.item.tileset) === null || _d === void 0 ? void 0 : _d.ClientAccountID) !== null && _e !== void 0 ? _e : this.apiGetter.accountId
             };
             if (version == 1) {
                 var pathStr = feature.getProperty("BrucePath");
@@ -3552,7 +4055,7 @@ var TilesetCadRenderManager;
             }
             // Optional menu item restriction.
             // Allows only showing certain entities from a tileset.
-            var onlyIds = (_d = this.item.BruceEntity) === null || _d === void 0 ? void 0 : _d.EntityIds;
+            var onlyIds = (_f = this.item.BruceEntity) === null || _f === void 0 ? void 0 : _f.EntityIds;
             if ((onlyIds === null || onlyIds === void 0 ? void 0 : onlyIds.length) && !onlyIds.includes(rego.entityId)) {
                 if (this.item.BruceEntity.Ghosts) {
                     feature.color = Color.WHITE.clone().withAlpha(0.5);
@@ -3562,7 +4065,9 @@ var TilesetCadRenderManager;
                 }
                 return null;
             }
-            this.visualsManager.Add(rego);
+            this.visualsManager.AddRego({
+                rego: rego
+            });
             return rego;
         };
         Manager.prototype.getMetaByGeomId = function (geomId, tileset) {
@@ -3635,7 +4140,9 @@ var TilesetCadRenderManager;
                 this.cTileset = null;
             }
             (_a = this.styler) === null || _a === void 0 ? void 0 : _a.Dispose();
-            this.visualsManager.RemoveByMenuItemId(this.item.id);
+            this.visualsManager.RemoveRegos({
+                menuItemId: this.item.id
+            });
         };
         Manager.prototype.ReRender = function (entityIds) {
             return __awaiter(this, void 0, void 0, function () {
@@ -3644,7 +4151,9 @@ var TilesetCadRenderManager;
                     if (!this.styler) {
                         return [2 /*return*/];
                     }
-                    regos = this.visualsManager.GetMenuItemRegos(this.item.id);
+                    regos = this.visualsManager.GetRegos({
+                        menuItemId: this.item.id
+                    });
                     if (entityIds != null) {
                         regos = regos.filter(function (r) { return entityIds.indexOf(r.entityId) >= 0; });
                     }
@@ -3693,7 +4202,7 @@ var MAX_RANGE = 3000;
 var TilesetOsmRenderManager;
 (function (TilesetOsmRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsManager, apiGetter, monitor, item) {
+        function Manager(params) {
             this.disposed = false;
             this.cTileset = null;
             this.counter = 0;
@@ -3704,6 +4213,7 @@ var TilesetOsmRenderManager;
             this.entityTypeId = null;
             this.queueCheckInterval = null;
             this.processingQueue = 0;
+            var viewer = params.viewer, visualsManager = params.register, apiGetter = params.apiGetter, monitor = params.monitor, item = params.item;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
             this.item = item;
@@ -3744,7 +4254,9 @@ var TilesetOsmRenderManager;
                 }
                 this.cTileset = null;
             }
-            this.visualsManager.RemoveByMenuItemId(this.item.id);
+            this.visualsManager.RemoveRegos({
+                menuItemId: this.item.id
+            });
             this.featureQueue = [];
         };
         Manager.prototype.Init = function () {
@@ -3908,7 +4420,7 @@ var TilesetOsmRenderManager;
         };
         Manager.prototype.mapTileBatch = function (features) {
             return __awaiter(this, void 0, void 0, function () {
-                var featureIds, featureMap, _loop_1, this_1, i, api, bIds, i, id, bId, feature, rego;
+                var featureIds, featureMap, _loop_1, this_1, i, api, bIds, i, osmId, bruceId, feature, rego;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -3939,25 +4451,29 @@ var TilesetOsmRenderManager;
                         case 1:
                             bIds = (_a.sent()).idMapping;
                             for (i = 0; i < featureIds.length; i++) {
-                                id = featureIds[i];
-                                bId = bIds[id];
-                                if (!bId) {
-                                    bId = ObjectUtils.UId();
+                                osmId = featureIds[i];
+                                bruceId = bIds[osmId];
+                                if (!bruceId) {
+                                    bruceId = ObjectUtils.UId();
                                 }
                                 feature = featureMap[i];
                                 if (this.item.ghostLoading == true) {
                                     feature.color = feature._orgColor;
                                 }
                                 rego = {
-                                    entityId: bId,
+                                    entityId: bruceId,
                                     menuItemId: this.item.id,
                                     priority: 0,
                                     visual: feature,
                                     entityTypeId: this.entityTypeId,
-                                    sourceId: this.sourceId
+                                    sourceId: this.sourceId,
+                                    sourceEntityId: osmId,
+                                    accountId: this.apiGetter.accountId
                                 };
-                                this.visualsManager.Add(rego);
-                                this._loadedCesiumEntities[bId] = rego;
+                                this.visualsManager.AddRego({
+                                    rego: rego
+                                });
+                                this._loadedCesiumEntities[bruceId] = rego;
                             }
                             return [2 /*return*/];
                     }
@@ -3972,7 +4488,10 @@ var TilesetOsmRenderManager;
                 var rego = this._loadedCesiumEntities[key];
                 if (rego) {
                     if (!this.getIsVisualWithinRange(rego.visual, MAX_RANGE)) {
-                        this.visualsManager.Remove(rego.entityId, this.item.id);
+                        this.visualsManager.RemoveRegos({
+                            entityId: rego.entityId,
+                            menuItemId: this.item.id
+                        });
                         this._loadedCesiumEntities[key] = null;
                         delete this._loadedCesiumEntities[key];
                         this.totalLoaded -= 1;
@@ -4000,9 +4519,10 @@ var TilesetOsmRenderManager;
 var TilesetEntitiesRenderManager;
 (function (TilesetEntitiesRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, visualsManager, apiGetter, item) {
+        function Manager(params) {
             this.disposed = false;
             this.cTileset = null;
+            var viewer = params.viewer, visualsManager = params.register, apiGetter = params.apiGetter, item = params.item;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
             this.item = item;
@@ -4082,7 +4602,9 @@ var TilesetEntitiesRenderManager;
                 }
                 this.cTileset = null;
             }
-            this.visualsManager.RemoveByMenuItemId(this.item.id);
+            this.visualsManager.RemoveRegos({
+                menuItemId: this.item.id
+            });
         };
         Manager.prototype.onCTilesetLoad = function () {
             if (this.item.FlyTo) {
@@ -4100,6 +4622,7 @@ var TilesetEntitiesRenderManager;
             }
         };
         Manager.prototype.mapTilesetFeature = function (feature) {
+            var _a, _b, _c;
             var id = feature.getProperty("BruceId");
             if (id) {
                 var rego = {
@@ -4107,9 +4630,13 @@ var TilesetEntitiesRenderManager;
                     entityTypeId: this.typeId,
                     menuItemId: this.item.id,
                     priority: 0,
-                    visual: feature
+                    visual: feature,
+                    tilesetId: (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetID,
+                    accountId: (_c = (_b = this.item.tileset) === null || _b === void 0 ? void 0 : _b.ClientAccountID) !== null && _c !== void 0 ? _c : this.apiGetter.accountId
                 };
-                this.visualsManager.Add(rego);
+                this.visualsManager.AddRego({
+                    rego: rego
+                });
             }
         };
         Manager.prototype.ReRender = function (entityIds) {
@@ -4127,9 +4654,10 @@ var TilesetEntitiesRenderManager;
 var TilesetPointcloudRenderManager;
 (function (TilesetPointcloudRenderManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, apiGetter, item) {
+        function Manager(params) {
             this.disposed = false;
             this.cTileset = null;
+            var viewer = params.viewer, apiGetter = params.apiGetter, item = params.item;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
             this.item = item;
@@ -4226,9 +4754,10 @@ var TilesetPointcloudRenderManager;
 var DataSourceStaticKmlManager;
 (function (DataSourceStaticKmlManager) {
     var Manager = /** @class */ (function () {
-        function Manager(viewer, apiGetter, item) {
+        function Manager(params) {
             this.disposed = false;
             this.dataSource = null;
+            var viewer = params.viewer, apiGetter = params.apiGetter, item = params.item;
             this.viewer = viewer;
             this.apiGetter = apiGetter;
             this.item = item;
@@ -4285,6 +4814,253 @@ var DataSourceStaticKmlManager;
     DataSourceStaticKmlManager.Manager = Manager;
 })(DataSourceStaticKmlManager || (DataSourceStaticKmlManager = {}));
 
+function getLegacyTileset(params) {
+    return __awaiter(this, void 0, void 0, function () {
+        var apiGetter, menuItem, tileset, api, legacyTileset, e_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    apiGetter = params.apiGetter, menuItem = params.menuItem, tileset = params.tileset;
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    api = apiGetter.getApi(menuItem.tileset.ClientAccountID);
+                    return [4 /*yield*/, api.GET("ui.tileset/" + tileset.id)];
+                case 2:
+                    legacyTileset = _a.sent();
+                    return [2 /*return*/, legacyTileset];
+                case 3:
+                    e_1 = _a.sent();
+                    console.log(e_1);
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+function getTileset(params) {
+    return __awaiter(this, void 0, void 0, function () {
+        var apiGetter, menuItem, api, tileset, e_2;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    apiGetter = params.apiGetter, menuItem = params.menuItem;
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    api = apiGetter.getApi(menuItem.tileset.ClientAccountID);
+                    return [4 /*yield*/, Tileset.Get({
+                            api: api,
+                            tilesetId: menuItem.tileset.TilesetID
+                        })];
+                case 2:
+                    tileset = (_a.sent()).tileset;
+                    return [2 /*return*/, tileset];
+                case 3:
+                    e_2 = _a.sent();
+                    console.error(e_2);
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+var TilesetArbRenderManager;
+(function (TilesetArbRenderManager) {
+    var Manager = /** @class */ (function () {
+        function Manager(params) {
+            this.disposed = false;
+            this.cTileset = null;
+            this.styler = null;
+            this.viewer = params.viewer;
+            this.apiGetter = params.apiGetter;
+            this.item = params.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.Init = function () {
+            var _a, _b, _c;
+            return __awaiter(this, void 0, void 0, function () {
+                var itemUrl, tileset, legacyTileset, _d;
+                var _this = this;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            itemUrl = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.TilesetURL;
+                            if (itemUrl && itemUrl.includes("cc3d.api")) {
+                                this.item.tileset.ClientAccountID = "cc3d";
+                            }
+                            else if ((_b = this.item.IonResource) === null || _b === void 0 ? void 0 : _b.AssetID) {
+                                this.item.tileset.ClientAccountID = "cc3d";
+                            }
+                            return [4 /*yield*/, getTileset({
+                                    apiGetter: this.apiGetter,
+                                    menuItem: this.item
+                                })];
+                        case 1:
+                            tileset = _e.sent();
+                            if (!(tileset === null || tileset === void 0 ? void 0 : tileset.type)) return [3 /*break*/, 2];
+                            this.cTileset = TilesetRenderEngine.Render({
+                                apiGetter: this.apiGetter,
+                                tileset: tileset,
+                                viewer: this.viewer,
+                                coords: null
+                            });
+                            return [3 /*break*/, 5];
+                        case 2: return [4 /*yield*/, getLegacyTileset({
+                                apiGetter: this.apiGetter,
+                                menuItem: this.item,
+                                tileset: tileset
+                            })];
+                        case 3:
+                            legacyTileset = _e.sent();
+                            _d = this;
+                            return [4 /*yield*/, TilesetRenderEngine.RenderLegacy({
+                                    apiGetter: this.apiGetter,
+                                    tileset: legacyTileset,
+                                    viewer: this.viewer,
+                                    ionId: (_c = this.item.IonResource) === null || _c === void 0 ? void 0 : _c.AssetID
+                                })];
+                        case 4:
+                            _d.cTileset = _e.sent();
+                            _e.label = 5;
+                        case 5:
+                            this.cTileset.readyPromise.then(function () {
+                                try {
+                                    if (_this.item.ApplyStyles) {
+                                        var api = _this.apiGetter.getApi();
+                                        _this.styler = new TilesetRenderEngine.CadStyler(api, _this.cTileset, _this.item.styleId, _this.item.StyleMapping);
+                                        _this.onCTilesetLoad();
+                                    }
+                                }
+                                catch (e) {
+                                    console.error(e);
+                                }
+                            });
+                            this.cTileset.tileLoad.addEventListener(function (tile) {
+                                try {
+                                    _this.mapCTile(tile);
+                                }
+                                catch (e) {
+                                    console.error(e);
+                                }
+                            });
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        Manager.prototype.onCTilesetLoad = function () {
+            if (this.item.FlyTo) {
+                this.viewer.zoomTo(this.cTileset, new HeadingPitchRange(0.0, -0.5, this.cTileset.boundingSphere.radius / 4.0));
+            }
+        };
+        Manager.prototype.Dispose = function () {
+            var _a;
+            if (this.disposed) {
+                return;
+            }
+            this.disposed = true;
+            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.cTileset = null;
+            }
+            (_a = this.styler) === null || _a === void 0 ? void 0 : _a.Dispose();
+            this.visualsManager.RemoveRegos({
+                menuItemId: this.item.id
+            });
+        };
+        Manager.prototype.ReRender = function (entityIds) {
+            return __awaiter(this, void 0, void 0, function () {
+                var regos;
+                return __generator(this, function (_a) {
+                    if (!this.styler) {
+                        return [2 /*return*/];
+                    }
+                    regos = this.visualsManager.GetRegos({
+                        menuItemId: this.item.id
+                    });
+                    if (entityIds != null) {
+                        regos = regos.filter(function (r) { return entityIds.indexOf(r.entityId) >= 0; });
+                    }
+                    this.styler.QueueEntities(regos);
+                    return [2 /*return*/];
+                });
+            });
+        };
+        Manager.prototype.mapCTile = function (tile) {
+            var content = tile === null || tile === void 0 ? void 0 : tile.content;
+            if (!content) {
+                return;
+            }
+            for (var i = 0; i < content.featuresLength; i++) {
+                var feature = content.getFeature(i);
+                var rego = this.mapTilesetFeature(feature);
+                if ((rego === null || rego === void 0 ? void 0 : rego.entityId) && this.styler) {
+                    this.styler.QueueEntities([rego]);
+                }
+            }
+        };
+        Manager.prototype.mapTilesetFeature = function (feature) {
+            var _a, _b, _c;
+            var rego = {
+                entityId: null,
+                entityTypeId: null,
+                menuItemId: this.item.id,
+                priority: 0,
+                visual: feature,
+                accountId: (_b = (_a = this.item.tileset) === null || _a === void 0 ? void 0 : _a.ClientAccountID) !== null && _b !== void 0 ? _b : this.apiGetter.accountId
+            };
+            var props = feature.getPropertyNames([]);
+            if (props.find(function (x) { return x == "BrucePath"; })) {
+                var path = (_c = feature.getProperty("BrucePath")) === null || _c === void 0 ? void 0 : _c.split("|");
+                if (path === null || path === void 0 ? void 0 : path.length) {
+                    rego.entityId = path[path.length - 1];
+                }
+            }
+            if (!rego.entityId) {
+                var ACCEPTABLE_PROPS = [
+                    "Building_ID", "BuildingID", "BruceId"
+                ];
+                for (var _i = 0, ACCEPTABLE_PROPS_1 = ACCEPTABLE_PROPS; _i < ACCEPTABLE_PROPS_1.length; _i++) {
+                    var acceptableId = ACCEPTABLE_PROPS_1[_i];
+                    if (props.indexOf(acceptableId) > -1) {
+                        rego.entityId = feature.getProperty(acceptableId);
+                        if (rego.entityId) {
+                            break;
+                        }
+                    }
+                }
+            }
+            if (!rego.entityId) {
+                return null;
+            }
+            this.visualsManager.AddRego({
+                rego: rego
+            });
+            return rego;
+        };
+        return Manager;
+    }());
+    TilesetArbRenderManager.Manager = Manager;
+})(TilesetArbRenderManager || (TilesetArbRenderManager = {}));
+
 /**
  * Utility to keep track of enabled menu items within a Cesium viewer.
  */
@@ -4359,31 +5135,88 @@ var MenuItemManager;
                             }
                             switch (params.item.Type) {
                                 case MenuItem.EType.Entities:
-                                    rItem.renderManager = new EntitiesRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item, this.sharedGetters);
+                                    rItem.renderManager = new EntitiesRenderManager.Manager({
+                                        viewer: this.viewer,
+                                        register: this.visualsRegister,
+                                        apiGetter: params.apiGetter,
+                                        monitor: this.sharedMonitor,
+                                        item: params.item,
+                                        sharedGetters: this.sharedGetters
+                                    });
                                     break;
                                 case MenuItem.EType.EntitiesLoaded:
-                                    rItem.renderManager = new EntitiesLoadedRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
+                                    rItem.renderManager = new EntitiesLoadedRenderManager.Manager({
+                                        viewer: this.viewer,
+                                        register: this.visualsRegister,
+                                        apiGetter: params.apiGetter,
+                                        monitor: this.sharedMonitor,
+                                        item: params.item
+                                    });
                                     break;
                                 case MenuItem.EType.EntitiesIds:
-                                    rItem.renderManager = new EntitiesIdsRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
+                                    rItem.renderManager = new EntitiesIdsRenderManager.Manager({
+                                        viewer: this.viewer,
+                                        register: this.visualsRegister,
+                                        apiGetter: params.apiGetter,
+                                        monitor: this.sharedMonitor,
+                                        item: params.item
+                                    });
                                     break;
                                 case MenuItem.EType.Entity:
-                                    rItem.renderManager = new EntityRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
+                                    rItem.renderManager = new EntityRenderManager.Manager({
+                                        viewer: this.viewer,
+                                        register: this.visualsRegister,
+                                        apiGetter: params.apiGetter,
+                                        monitor: this.sharedMonitor,
+                                        item: params.item
+                                    });
                                     break;
                                 case MenuItem.EType.CadTileset:
-                                    rItem.renderManager = new TilesetCadRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item);
+                                    rItem.renderManager = new TilesetCadRenderManager.Manager({
+                                        viewer: this.viewer,
+                                        register: this.visualsRegister,
+                                        apiGetter: params.apiGetter,
+                                        item: params.item
+                                    });
                                     break;
                                 case MenuItem.EType.Osm:
-                                    rItem.renderManager = new TilesetOsmRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, this.sharedMonitor, params.item);
+                                    rItem.renderManager = new TilesetOsmRenderManager.Manager({
+                                        viewer: this.viewer,
+                                        register: this.visualsRegister,
+                                        apiGetter: params.apiGetter,
+                                        monitor: this.sharedMonitor,
+                                        item: params.item
+                                    });
                                     break;
                                 case MenuItem.EType.PointCloud:
-                                    rItem.renderManager = new TilesetPointcloudRenderManager.Manager(this.viewer, params.apiGetter, params.item);
+                                    rItem.renderManager = new TilesetPointcloudRenderManager.Manager({
+                                        viewer: this.viewer,
+                                        apiGetter: params.apiGetter,
+                                        item: params.item
+                                    });
                                     break;
                                 case MenuItem.EType.EntityTileset:
-                                    rItem.renderManager = new TilesetEntitiesRenderManager.Manager(this.viewer, this.visualsRegister, params.apiGetter, params.item);
+                                    rItem.renderManager = new TilesetEntitiesRenderManager.Manager({
+                                        viewer: this.viewer,
+                                        register: this.visualsRegister,
+                                        apiGetter: params.apiGetter,
+                                        item: params.item
+                                    });
                                     break;
                                 case MenuItem.EType.Kml:
-                                    rItem.renderManager = new DataSourceStaticKmlManager.Manager(this.viewer, params.apiGetter, params.item);
+                                    rItem.renderManager = new DataSourceStaticKmlManager.Manager({
+                                        viewer: this.viewer,
+                                        apiGetter: params.apiGetter,
+                                        item: params.item
+                                    });
+                                    break;
+                                case MenuItem.EType.ArbTileset:
+                                    rItem.renderManager = new TilesetArbRenderManager.Manager({
+                                        apiGetter: params.apiGetter,
+                                        item: params.item,
+                                        viewer: this.viewer,
+                                        register: this.visualsRegister
+                                    });
                                     break;
                                 // Any "none" type can be ignored. These are just containers for other items.
                                 case MenuItem.EType.None:
@@ -4531,11 +5364,11 @@ var MenuItemManager;
 /**
  * Utility to help generate menu items for rendering various data.
  */
-var RenderHelper;
-(function (RenderHelper) {
+var MenuItemCreator;
+(function (MenuItemCreator) {
     function RenderEntities(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var entityIds, item;
+            var entityIds, item, renderedId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4563,26 +5396,33 @@ var RenderHelper;
                                 apiGetter: params.apiGetter,
                                 item: item
                             })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1:
+                        renderedId = _a.sent();
+                        return [2 /*return*/, {
+                                menuItemIds: [renderedId],
+                                menuItems: [item]
+                            }];
                 }
             });
         });
     }
-    RenderHelper.RenderEntities = RenderEntities;
+    MenuItemCreator.RenderEntities = RenderEntities;
     function RenderEntityTypes(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var typeIds, renderedItemIds, i, typeId, menuItem, itemId;
+            var typeIds, renderedItemIds, menuItems, i, typeId, menuItem, itemId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         typeIds = params.entityTypeIds;
                         renderedItemIds = [];
+                        menuItems = [];
                         i = 0;
                         _a.label = 1;
                     case 1:
                         if (!(i < typeIds.length)) return [3 /*break*/, 4];
                         typeId = typeIds[i];
                         menuItem = MenuItem.CreateFromTypeId(typeId, 0);
+                        menuItems.push(menuItem);
                         return [4 /*yield*/, params.manager.RenderItem({
                                 apiGetter: params.apiGetter,
                                 item: menuItem
@@ -4594,15 +5434,18 @@ var RenderHelper;
                     case 3:
                         i++;
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, renderedItemIds];
+                    case 4: return [2 /*return*/, {
+                            menuItemIds: renderedItemIds,
+                            menuItems: menuItems
+                        }];
                 }
             });
         });
     }
-    RenderHelper.RenderEntityTypes = RenderEntityTypes;
+    MenuItemCreator.RenderEntityTypes = RenderEntityTypes;
     function RenderEntityFilter(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var filter, item;
+            var filter, item, renderedIds;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4634,12 +5477,17 @@ var RenderHelper;
                                 apiGetter: params.apiGetter,
                                 item: item
                             })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1:
+                        renderedIds = _a.sent();
+                        return [2 /*return*/, {
+                                menuItemIds: [renderedIds],
+                                menuItems: [item]
+                            }];
                 }
             });
         });
     }
-    RenderHelper.RenderEntityFilter = RenderEntityFilter;
+    MenuItemCreator.RenderEntityFilter = RenderEntityFilter;
     function RenderMenuItems(params) {
         return __awaiter(this, void 0, void 0, function () {
             var menuItems, renderedItemIds, i, menuItem, itemId;
@@ -4664,15 +5512,17 @@ var RenderHelper;
                     case 3:
                         i++;
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, renderedItemIds];
+                    case 4: return [2 /*return*/, {
+                            menuItemIds: renderedItemIds
+                        }];
                 }
             });
         });
     }
-    RenderHelper.RenderMenuItems = RenderMenuItems;
+    MenuItemCreator.RenderMenuItems = RenderMenuItems;
     function RenderTileset(params) {
         return __awaiter(this, void 0, void 0, function () {
-            var tilesetId, api, tileset, _a, menuItem;
+            var tilesetId, api, tileset, _a, menuItem, renderedIds;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -4706,13 +5556,18 @@ var RenderHelper;
                                 item: menuItem,
                                 apiGetter: params.apiGetter
                             })];
-                    case 4: return [2 /*return*/, _b.sent()];
+                    case 4:
+                        renderedIds = _b.sent();
+                        return [2 /*return*/, {
+                                menuItems: [menuItem],
+                                menuItemIds: [renderedIds]
+                            }];
                     case 5: throw (new Error("Tileset type not supported."));
                 }
             });
         });
     }
-    RenderHelper.RenderTileset = RenderTileset;
+    MenuItemCreator.RenderTileset = RenderTileset;
     function RenderBookmarkItems(params) {
         return __awaiter(this, void 0, void 0, function () {
             var viewId, bookmarkId, api, view, _a, bookmark, _b, enabledIds, menuItems, version, vSettings, bSettings, vSettings, bSettings, renderedItemIds, traverseItems_1, i;
@@ -4811,13 +5666,16 @@ var RenderHelper;
                     case 9:
                         i++;
                         return [3 /*break*/, 7];
-                    case 10: return [2 /*return*/, renderedItemIds];
+                    case 10: return [2 /*return*/, {
+                            menuItemIds: renderedItemIds,
+                            menuItems: menuItems
+                        }];
                 }
             });
         });
     }
-    RenderHelper.RenderBookmarkItems = RenderBookmarkItems;
-})(RenderHelper || (RenderHelper = {}));
+    MenuItemCreator.RenderBookmarkItems = RenderBookmarkItems;
+})(MenuItemCreator || (MenuItemCreator = {}));
 
 var DEFAULT_BING_KEY = "AqL0uYT5T84jiJeX55_b9zJeeP3MX2p1WLOHH4ljIEPZ7ZL2M81bYLzyYeSwuzzl";
 var DEFAULT_MAPBOX_KEY = "pk.eyJ1IjoiYWxleHRodW5kZXIiLCJhIjoiY2psbHJxbnN5MTBvbzNxczZwMHNpeTI0MCJ9.fdoj2QW_7n8RV4e0NCFgZA";
@@ -5192,8 +6050,8 @@ var TileRenderEngine;
     TileRenderEngine.CompareLegacyNames = CompareLegacyNames;
     var Map;
     (function (Map) {
-        var V1;
-        (function (V1) {
+        var LegacyNavigator;
+        (function (LegacyNavigator) {
             function Render(params) {
                 return __awaiter(this, void 0, void 0, function () {
                     var enabled, tile, bId, layer, defaultId, provider, provider, min, max, _a, mapboxKey, _b;
@@ -5302,7 +6160,7 @@ var TileRenderEngine;
                     });
                 });
             }
-            V1.Render = Render;
+            LegacyNavigator.Render = Render;
             function RenderView(params) {
                 var _a;
                 return __awaiter(this, void 0, void 0, function () {
@@ -5432,10 +6290,10 @@ var TileRenderEngine;
                     });
                 });
             }
-            V1.RenderView = RenderView;
-        })(V1 = Map.V1 || (Map.V1 = {}));
-        var V2;
-        (function (V2) {
+            LegacyNavigator.RenderView = RenderView;
+        })(LegacyNavigator = Map.LegacyNavigator || (Map.LegacyNavigator = {}));
+        var Navigator;
+        (function (Navigator) {
             function GetOrCreateLayer(viewer, apiGetter, meta) {
                 return __awaiter(this, void 0, void 0, function () {
                     var enabled, i, layer, layerMeta, defaultImg, provider, api, tileset, settings, _a, _b, _c, _d, mapboxKey, _e, layer;
@@ -5551,7 +6409,7 @@ var TileRenderEngine;
                     });
                 });
             }
-            V2.GetOrCreateLayer = GetOrCreateLayer;
+            Navigator.GetOrCreateLayer = GetOrCreateLayer;
             function Render(params) {
                 return __awaiter(this, void 0, void 0, function () {
                     var i, enabled, curEnabled, toDisable, curEnabledArr, _loop_2, i, i, _loop_3, i;
@@ -5615,13 +6473,13 @@ var TileRenderEngine;
                     });
                 });
             }
-            V2.Render = Render;
-        })(V2 = Map.V2 || (Map.V2 = {}));
+            Navigator.Render = Render;
+        })(Navigator = Map.Navigator || (Map.Navigator = {}));
     })(Map = TileRenderEngine.Map || (TileRenderEngine.Map = {}));
     var Terrain;
     (function (Terrain) {
-        var V1;
-        (function (V1) {
+        var LegacyNavigator;
+        (function (LegacyNavigator) {
             function Render(params) {
                 var _a;
                 var bId = createLegacyTerrId(params.data);
@@ -5647,7 +6505,7 @@ var TileRenderEngine;
                     params.viewer.terrainProvider = provider;
                 }
             }
-            V1.Render = Render;
+            LegacyNavigator.Render = Render;
             function RenderView(params) {
                 var _a, _b;
                 return __awaiter(this, void 0, void 0, function () {
@@ -5709,10 +6567,10 @@ var TileRenderEngine;
                     });
                 });
             }
-            V1.RenderView = RenderView;
-        })(V1 = Terrain.V1 || (Terrain.V1 = {}));
-        var V2;
-        (function (V2) {
+            LegacyNavigator.RenderView = RenderView;
+        })(LegacyNavigator = Terrain.LegacyNavigator || (Terrain.LegacyNavigator = {}));
+        var Navigator;
+        (function (Navigator) {
             function Render(params) {
                 var _a;
                 return __awaiter(this, void 0, void 0, function () {
@@ -5775,15 +6633,15 @@ var TileRenderEngine;
                     });
                 });
             }
-            V2.Render = Render;
-        })(V2 = Terrain.V2 || (Terrain.V2 = {}));
+            Navigator.Render = Render;
+        })(Navigator = Terrain.Navigator || (Terrain.Navigator = {}));
     })(Terrain = TileRenderEngine.Terrain || (TileRenderEngine.Terrain = {}));
 })(TileRenderEngine || (TileRenderEngine = {}));
 
 // TODO: Move these to the data model.
 var MIN_SHADOW_SIZE = 2048;
 var MAX_SHADOW_SIZE = 32768;
-function renderV1(params, bookmark, view) {
+function renderLegacyNavigator(params, bookmark, view) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
         var vSettings, bSettings, frustum, scene, curFrustum, camera, pos, go, enabledItems, newItemIds, _i, enabledItems_1, id;
@@ -5792,7 +6650,7 @@ function renderV1(params, bookmark, view) {
                 case 0:
                     vSettings = view.Settings;
                     bSettings = bookmark === null || bookmark === void 0 ? void 0 : bookmark.Settings;
-                    return [4 /*yield*/, TileRenderEngine.Terrain.V1.RenderView({
+                    return [4 /*yield*/, TileRenderEngine.Terrain.LegacyNavigator.RenderView({
                             apiGetter: params.apiGetter,
                             bookmarkId: params.bookmarkId,
                             viewer: params.manager.Viewer,
@@ -5800,7 +6658,7 @@ function renderV1(params, bookmark, view) {
                         })];
                 case 1:
                     _c.sent();
-                    return [4 /*yield*/, TileRenderEngine.Map.V1.RenderView({
+                    return [4 /*yield*/, TileRenderEngine.Map.LegacyNavigator.RenderView({
                             apiGetter: params.apiGetter,
                             bookmarkId: params.bookmarkId,
                             viewer: params.manager.Viewer,
@@ -5856,7 +6714,7 @@ function renderV1(params, bookmark, view) {
                         }
                     }
                     if (!params.bookmarkId) return [3 /*break*/, 4];
-                    return [4 /*yield*/, RenderHelper.RenderBookmarkItems({
+                    return [4 /*yield*/, MenuItemCreator.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
                             manager: params.manager,
                             view: view,
@@ -5870,7 +6728,7 @@ function renderV1(params, bookmark, view) {
         });
     });
 }
-function renderV2(params, bookmark, view) {
+function renderNavigator(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;
     return __awaiter(this, void 0, void 0, function () {
         var viewer, scene, vSettings, bSettings, defaults, camera, newLens, curLens, transition, pos, gOcclusion, hillShades, baseColor, shadows, size, ambientOcclusion, AO, lighting, light, quality, fxaa, dateTime, clock, terrain, selectedIds, i, id, imagery, curEnabled, newItemIds, _i, curEnabled_1, id;
@@ -6041,7 +6899,7 @@ function renderV2(params, bookmark, view) {
                     }
                     terrain = (_w = bSettings === null || bSettings === void 0 ? void 0 : bSettings.terrain) !== null && _w !== void 0 ? _w : (_x = defaults.settings) === null || _x === void 0 ? void 0 : _x.terrain;
                     if (!terrain) return [3 /*break*/, 2];
-                    return [4 /*yield*/, TileRenderEngine.Terrain.V2.Render({
+                    return [4 /*yield*/, TileRenderEngine.Terrain.Navigator.Render({
                             apiGetter: params.apiGetter,
                             tile: terrain,
                             viewer: params.manager.Viewer,
@@ -6058,7 +6916,11 @@ function renderV2(params, bookmark, view) {
                         params.manager.VisualsRegister.ClearSelected();
                         for (i = 0; i < selectedIds.length; i++) {
                             id = selectedIds[i];
-                            params.manager.VisualsRegister.Select(id, false);
+                            params.manager.VisualsRegister.SetSelected({
+                                selected: true,
+                                entityIds: [id],
+                                refreshIfSelected: false
+                            });
                         }
                     }
                     imagery = (_z = bSettings.imagery) !== null && _z !== void 0 ? _z : (_0 = defaults.settings) === null || _0 === void 0 ? void 0 : _0.imagery;
@@ -6077,7 +6939,7 @@ function renderV2(params, bookmark, view) {
                             }
                         ];
                     }
-                    return [4 /*yield*/, TileRenderEngine.Map.V2.Render({
+                    return [4 /*yield*/, TileRenderEngine.Map.Navigator.Render({
                             apiGetter: params.apiGetter,
                             tiles: imagery,
                             viewer: params.manager.Viewer,
@@ -6101,7 +6963,7 @@ function renderV2(params, bookmark, view) {
                     return [3 /*break*/, 4];
                 case 7:
                     if (!params.bookmarkId) return [3 /*break*/, 9];
-                    return [4 /*yield*/, RenderHelper.RenderBookmarkItems({
+                    return [4 /*yield*/, MenuItemCreator.RenderBookmarkItems({
                             apiGetter: params.apiGetter,
                             manager: params.manager,
                             view: view,
@@ -6162,12 +7024,12 @@ var ViewRenderEngine;
                             throw new Error("View and bookmark settings version mismatch.");
                         }
                         version = view.DataVersion;
-                        if (!(version === 2)) return [3 /*break*/, 9];
-                        return [4 /*yield*/, renderV2(params, bookmark, view)];
+                        if (!(version == 1)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, renderLegacyNavigator(params, bookmark, view)];
                     case 8:
                         _c.sent();
                         return [3 /*break*/, 11];
-                    case 9: return [4 /*yield*/, renderV1(params, bookmark, view)];
+                    case 9: return [4 /*yield*/, renderNavigator(params, bookmark, view)];
                     case 10:
                         _c.sent();
                         _c.label = 11;
@@ -6209,7 +7071,8 @@ var ViewUtils;
         return "flatterrain";
     }
     ViewUtils.GatherLegacyTerrainTile = GatherLegacyTerrainTile;
-    function GatherMapTiles(viewer) {
+    function GatherMapTiles(params) {
+        var viewer = params.viewer;
         var imagery = viewer.imageryLayers;
         var tiles = [];
         var _loop_1 = function (i) {
@@ -6233,15 +7096,20 @@ var ViewUtils;
         for (var i = 0; i < imagery.length; i++) {
             _loop_1(i);
         }
-        return tiles;
+        return {
+            imagery: tiles
+        };
     }
     ViewUtils.GatherMapTiles = GatherMapTiles;
-    function GatherTerrainTile(viewer) {
+    function GatherTerrainTile(params) {
+        var viewer = params.viewer;
         var provider = viewer.terrainProvider;
         if (provider._bMeta) {
             return {
-                accountId: provider._bMeta.accountId,
-                tilesetId: provider._bMeta.tilesetId,
+                terrain: {
+                    accountId: provider._bMeta.accountId,
+                    tilesetId: provider._bMeta.tilesetId,
+                }
             };
         }
         return null;
@@ -6249,5 +7117,5 @@ var ViewUtils;
     ViewUtils.GatherTerrainTile = GatherTerrainTile;
 })(ViewUtils || (ViewUtils = {}));
 
-export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, RenderHelper, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, SharedGetters, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils };
+export { CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, SharedGetters, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils };
 //# sourceMappingURL=bruce-cesium.es5.js.map