bruce-cesium 2.8.3 → 2.8.4

package/dist/bruce-cesium.es5.js

@@ -1,6 +1,6 @@
 import { BruceEvent, Cartes, Carto, Entity as Entity$1, Geometry, Tileset, MathUtils, LRUCache, ZoomControl, Style, EntityTag, Calculator, EntityLod, EntityType, ClientFile, ObjectUtils, Bounds, EntityRelationType, DelayQueue, BatchedDataGetter, EntityCoords, EntityFilterGetter, EntitySource, MenuItem, EntityRelation, ENVIRONMENT, ProjectView, ProjectViewBookmark, ProjectViewTile, ProjectViewLegacyTile, ProgramKey, Camera, AbstractApi, EntityAttachment, EntityAttachmentType, EntityAttribute } from 'bruce-models';
 import * as Cesium from 'cesium';
-import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, JulianDate, SceneMode, Entity, Primitive, Cesium3DTileFeature, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, SceneTransforms, Cesium3DTileset, Matrix4, Matrix3, IonResource, Ion, OrthographicFrustum, EasingFunction, createWorldTerrain, EllipsoidTerrainProvider, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, CesiumInspector, defined, PolygonPipeline, EllipsoidGeodesic, sampleTerrainMostDetailed, Model, ColorMaterialProperty, GeometryInstance, ScreenSpaceEventHandler, ScreenSpaceEventType, BoundingSphere } from 'cesium';
+import { Cartographic, Cartesian2, CallbackProperty, Cartesian3, Color, Rectangle, Math as Math$1, Entity, Primitive, Cesium3DTileFeature, JulianDate, HeightReference, DistanceDisplayCondition, NearFarScalar, HorizontalOrigin, VerticalOrigin, ClassificationType, ArcType, CornerType, ShadowMode, PolygonHierarchy, PolylineGraphics, HeadingPitchRoll, Transforms, ColorBlendMode, SceneMode, Cesium3DTileColorBlendMode, HeadingPitchRange, createOsmBuildings, Cesium3DTileStyle, KmlDataSource, OrthographicFrustum, EasingFunction, SceneTransforms, EllipsoidTerrainProvider, CesiumInspector, defined, EllipsoidGeodesic, sampleTerrainMostDetailed, Cesium3DTileset, Model, createWorldTerrain, CesiumTerrainProvider, BingMapsImageryProvider, BingMapsStyle, MapboxImageryProvider, MapboxStyleImageryProvider, ArcGisMapServerImageryProvider, OpenStreetMapImageryProvider, GridImageryProvider, GeographicTilingScheme, ImageryLayer, UrlTemplateImageryProvider, TileMapServiceImageryProvider, IonImageryProvider, Matrix4, Matrix3, IonResource, Ion, PolygonPipeline, ScreenSpaceEventHandler, ScreenSpaceEventType, ColorMaterialProperty, GeometryInstance, BoundingSphere } from 'cesium';
 
 var TIME_LAG = 300;
 var POSITION_CHECK_TIMER = 950;
@@ -1741,7 +1741,7 @@ function getName(api, entity) {
                             type: type,
                             defaultToId: false
                         });
-                        return [2 /*return*/, name_1 ? name_1 : "Unnamed entity"];
+                        return [2 /*return*/, name_1 ? name_1 : "Unnamed Entity"];
                     }
                     return [3 /*break*/, 4];
                 case 3:
@@ -3716,16 +3716,13 @@ var RelationRenderEngine;
     })(Parabola = RelationRenderEngine.Parabola || (RelationRenderEngine.Parabola = {}));
 })(RelationRenderEngine || (RelationRenderEngine = {}));
 
-// Key where the label instance is stored within the cesium entity.
-// Eg: cEntity[ATTACH_KEY] = new EntityLabel(...);
-var ATTACH_KEY = "nextspace-navigator-entity-label";
 /**
  * Returns cesium property's value.
  * This will check if it's one that changes over time, or just a fixed value.
  * Eg: const pos3d = getValue<Cesium.Cartesian3>(cViewer, cEntity.point.position);
  * @param viewer
  * @param obj
- */
+*/
 function getValue$1(viewer, obj) {
     if (obj === null || obj === void 0 ? void 0 : obj.getValue) {
         return obj.getValue(viewer.scene.lastRenderTime);
@@ -3734,9 +3731,12 @@ function getValue$1(viewer, obj) {
 }
 /**
  * Util for generating labels within cesium space on entities.
- */
+*/
 var EntityLabel;
 (function (EntityLabel) {
+    // Key where the label instance is stored within the cesium entity.
+    // Eg: rego[ATTACH_KEY] = new EntityLabel(...);
+    EntityLabel.ATTACH_KEY = "nextspace-navigator-entity-label";
     var Label = /** @class */ (function () {
         function Label(params) {
             var _this = this;
@@ -3747,16 +3747,28 @@ var EntityLabel;
             // Indicates the label was disposed and any actions will be ignored.
             this.disposed = false;
             this.creating = false;
+            // Calculated pos3d for the label.
+            // Override to make it draw at a different position.
+            this.pos3d = null;
             this.rego = params.rego;
             this.viewer = params.viewer;
+            this.api = params.api;
+            this.visualRegister = params.visualRegister;
             this.creating = true;
-            this.createCLabel().then(function () {
+            this.createCLabel(params.pos3d).then(function () {
                 _this.creating = false;
             }).catch(function (e) {
                 console.error("Failed to create label", e);
                 _this.creating = false;
             });
         }
+        Object.defineProperty(Label.prototype, "Rego", {
+            get: function () {
+                return this.rego;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(Label.prototype, "Disposed", {
             get: function () {
                 return this.disposed;
@@ -3792,161 +3804,222 @@ var EntityLabel;
         };
         /**
          * Creates cesium entity for the label if one does not exist.
+         * @param pos23 optional position to create label at.
          */
-        Label.prototype.createCLabel = function () {
-            var _a, _b, _c;
+        Label.prototype.createCLabel = function (pos3d) {
+            var _a, _b, _c, _d, _e, _f;
             return __awaiter(this, void 0, void 0, function () {
-                var pos3d, heightRef, heightOffset, pixelOffset, visual, isClamped, height, scale, carto, text, ele, _lastDistance, _lastCameraPos, getDistance, MAX_DISTANCE, updateLabel;
+                var heightRef, heightOffset, pixelOffset, visual, isClamped, height, scale, featureAny, propertyNames, latProp, lonProp, lat, lon, latIsRad, lonIsRad, latIsDeg, lonIsDeg, carto, text, ele, _lastDistance, _lastCameraPos, getDistance, MAX_DISTANCE, updateLabel;
                 var _this = this;
-                return __generator(this, function (_d) {
-                    if (this.label || this.disposed) {
-                        return [2 /*return*/];
-                    }
-                    pos3d = null;
-                    heightRef = null;
-                    heightOffset = 10;
-                    pixelOffset = new Cartesian2(0, 0);
-                    visual = (_a = this.rego) === null || _a === void 0 ? void 0 : _a.visual;
-                    if (visual && visual instanceof Entity) {
-                        if (visual.polygon) {
-                            heightRef = getValue$1(this.viewer, visual.polygon.heightReference);
-                        }
-                        else if (visual.polyline) {
-                            isClamped = getValue$1(this.viewer, visual.polyline.clampToGround);
-                            heightRef = isClamped == false ? HeightReference.NONE : HeightReference.CLAMP_TO_GROUND;
-                        }
-                        else if (visual.model) {
-                            heightRef = getValue$1(this.viewer, visual.model.heightReference);
-                        }
-                        else if (visual.point) {
-                            heightRef = getValue$1(this.viewer, visual.point.heightReference);
-                        }
-                        else if (visual.billboard) {
-                            heightRef = getValue$1(this.viewer, visual.billboard.heightReference);
-                            height = getValue$1(this.viewer, visual.billboard.height);
-                            if (height) {
-                                scale = EnsureNumber(getValue$1(this.viewer, visual.billboard.scale), 1);
-                                pixelOffset.y = -(height * scale);
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
+                        case 0:
+                            if (this.label || this.disposed) {
+                                return [2 /*return*/];
+                            }
+                            heightRef = null;
+                            heightOffset = 10;
+                            pixelOffset = new Cartesian2(0, 0);
+                            if (!isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 3];
+                            visual = (_a = this.rego) === null || _a === void 0 ? void 0 : _a.visual;
+                            if (visual && visual instanceof Entity) {
+                                if (visual.polygon) {
+                                    heightRef = getValue$1(this.viewer, visual.polygon.heightReference);
+                                }
+                                else if (visual.polyline) {
+                                    isClamped = getValue$1(this.viewer, visual.polyline.clampToGround);
+                                    heightRef = isClamped == false ? HeightReference.NONE : HeightReference.CLAMP_TO_GROUND;
+                                }
+                                else if (visual.model) {
+                                    heightRef = getValue$1(this.viewer, visual.model.heightReference);
+                                }
+                                else if (visual.point) {
+                                    heightRef = getValue$1(this.viewer, visual.point.heightReference);
+                                }
+                                else if (visual.billboard) {
+                                    heightRef = getValue$1(this.viewer, visual.billboard.heightReference);
+                                    height = getValue$1(this.viewer, visual.billboard.height);
+                                    if (height) {
+                                        scale = EnsureNumber(getValue$1(this.viewer, visual.billboard.scale), 1);
+                                        pixelOffset.y = -(height * scale);
+                                    }
+                                    // Flat padding.
+                                    pixelOffset.y -= 5;
+                                    heightOffset = 0;
+                                }
+                                else if (visual.corridor) {
+                                    heightRef = getValue$1(this.viewer, visual.corridor.heightReference);
+                                }
+                                else if (visual.ellipse) {
+                                    heightRef = getValue$1(this.viewer, visual.ellipse.heightReference);
+                                }
+                                pos3d = getValue$1(this.viewer, visual.position);
+                            }
+                            else if (visual instanceof Cesium3DTileFeature) {
+                                featureAny = visual;
+                                propertyNames = featureAny.getPropertyNames ? featureAny.getPropertyNames() : (_b = featureAny.getPropertyIds) === null || _b === void 0 ? void 0 : _b.call(featureAny);
+                                if (propertyNames === null || propertyNames === void 0 ? void 0 : propertyNames.length) {
+                                    latProp = propertyNames.find(function (x) { return x.toLowerCase().includes("lat"); });
+                                    lonProp = propertyNames.find(function (x) { return x.toLowerCase().includes("lon"); });
+                                    lat = latProp ? featureAny.getProperty(latProp) : null;
+                                    lon = lonProp ? featureAny.getProperty(lonProp) : null;
+                                    if (lat && lon) {
+                                        latIsRad = typeof lat == "number" && lat > -Math.PI && lat < Math.PI;
+                                        lonIsRad = typeof lon == "number" && lon > -Math.PI && lon < Math.PI;
+                                        latIsDeg = typeof lat == "number" && lat > -180 && lat < 180;
+                                        lonIsDeg = typeof lon == "number" && lon > -180 && lon < 180;
+                                        if (latIsRad && lonIsRad) {
+                                            pos3d = Cartographic.toCartesian(Cartographic.fromRadians(lon, lat, 0));
+                                        }
+                                        else if (latIsDeg && lonIsDeg) {
+                                            pos3d = Cartographic.toCartesian(Cartographic.fromDegrees(lon, lat, 0));
+                                        }
+                                        heightRef = HeightReference.CLAMP_TO_GROUND;
+                                    }
+                                }
                             }
+                            if (!isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, EntityUtils.GetPosAsync({
+                                    viewer: this.viewer,
+                                    api: this.api,
+                                    entityId: (_c = this.rego) === null || _c === void 0 ? void 0 : _c.entityId,
+                                    returnHeightRef: HeightReference.NONE,
+                                    tilesetId: (_d = this.rego) === null || _d === void 0 ? void 0 : _d.tilesetId,
+                                    visualRegister: this.visualRegister
+                                })];
+                        case 1:
+                            pos3d = _g.sent();
+                            heightRef = HeightReference.NONE;
+                            _g.label = 2;
+                        case 2: return [3 /*break*/, 4];
+                        case 3:
+                            heightRef = HeightReference.NONE;
                             // Flat padding.
-                            pixelOffset.y -= 5;
                             heightOffset = 0;
-                        }
-                        else if (visual.corridor) {
-                            heightRef = getValue$1(this.viewer, visual.corridor.heightReference);
-                        }
-                        else if (visual.ellipse) {
-                            heightRef = getValue$1(this.viewer, visual.ellipse.heightReference);
-                        }
-                        pos3d = getValue$1(this.viewer, visual.position);
-                    }
-                    if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
-                        return [2 /*return*/];
+                            pixelOffset.y = -15;
+                            _g.label = 4;
+                        case 4:
+                            if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                return [2 /*return*/];
+                            }
+                            pos3d = DrawingUtils.EnsurePosHeight({
+                                desiredHeightRef: HeightReference.NONE,
+                                heightRef: heightRef,
+                                pos3d: pos3d,
+                                viewer: this.viewer
+                            });
+                            if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                return [2 /*return*/];
+                            }
+                            if (heightOffset) {
+                                carto = Cartographic.fromCartesian(pos3d);
+                                // TODO: Check if we need to use heightRef and adjust to absolute height.
+                                // TODO: We should be smarter and not just add 10m to the height. Eg: use polygon extrusion.
+                                carto.height += heightOffset;
+                                pos3d = Cartographic.toCartesian(carto);
+                            }
+                            this.pos3d = pos3d;
+                            text = (_f = (_e = this.rego) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : "Unnamed Entity";
+                            ele = document.createElement("div");
+                            ele.innerHTML = text;
+                            ele.setAttribute("style", "\n                position: absolute;\n                z-index: 1;\n                display: none;\n                pointer-events: none;\n                padding: 6px 8px;\n                border-radius: 6px;\n                font-family: Arial;\n                font-size: 12px;\n                -webkit-backdrop-filter: blur(20px);\n                backdrop-filter: blur(20px);\n                background: rgba(33,39,42,.8);\n                border-radius: 9px;\n                box-shadow: 0 0 1px rgba(18,22,25,.36),0 18px 36px -4px rgba(18,22,25,.36);\n                color: #ffffff;\n            }");
+                            this.label = ele;
+                            this.viewer.container.appendChild(ele);
+                            _lastDistance = null;
+                            _lastCameraPos = null;
+                            getDistance = function () {
+                                var _a;
+                                if (_this.disposed) {
+                                    return null;
+                                }
+                                var cameraPos = (_a = _this.viewer.camera) === null || _a === void 0 ? void 0 : _a.position;
+                                if (isNaN(cameraPos === null || cameraPos === void 0 ? void 0 : cameraPos.x)) {
+                                    return null;
+                                }
+                                // If camera hasn't moved much then we can use the last distance.
+                                var TOLERANCE = 0.1;
+                                if (_lastCameraPos) {
+                                    var totalMovement = Math.abs(_lastCameraPos.x - cameraPos.x) +
+                                        Math.abs(_lastCameraPos.y - cameraPos.y) +
+                                        Math.abs(_lastCameraPos.z - cameraPos.z);
+                                    if (totalMovement < TOLERANCE) {
+                                        return _lastDistance;
+                                    }
+                                }
+                                // Check if there is a raycast collision between camera and pos3d.
+                                // We'll let the labels draw through a ground collision.
+                                // Commented out while it is WIP.
+                                // const direction = Cesium.Cartesian3.subtract(pos3d, cameraPos, new Cesium.Cartesian3());
+                                // const ray = new Cesium.Ray(pos3d.clone(), direction);
+                                // const objects = (this.viewer.scene as any).drillPickFromRay(ray, 1, [visuals]);
+                                // if (objects && objects.length > 0) {
+                                //     for (let i = 0; i < objects.length; ++i) {
+                                //         const obj = objects[i];
+                                //         if (!visuals.find(x => x == obj?.id)) {
+                                //             let isGround = true;
+                                //             if (obj.object) {
+                                //                 const url = obj.object?.primitive?._basePath;
+                                //                 if (url && typeof url == "string") {
+                                //                     isGround = url.includes("tile.googleapis.com");
+                                //                 }
+                                //                 else {
+                                //                     isGround = false;
+                                //                 }
+                                //             }
+                                //             if (!isGround) {
+                                //                 return null;
+                                //             }
+                                //         }
+                                //     }
+                                // }
+                                var distance = Cartesian3.distance(cameraPos, _this.pos3d);
+                                _lastDistance = distance;
+                                _lastCameraPos = cameraPos.clone();
+                                return distance;
+                            };
+                            MAX_DISTANCE = 5000;
+                            updateLabel = function () {
+                                var _a;
+                                if (_this.disposed || isNaN((_a = _this.pos3d) === null || _a === void 0 ? void 0 : _a.x)) {
+                                    return;
+                                }
+                                var distance = getDistance();
+                                if (isNaN(distance) || distance >= MAX_DISTANCE) {
+                                    ele.style.display = "none";
+                                    return;
+                                }
+                                var pos2d = SceneTransforms.wgs84ToWindowCoordinates(_this.viewer.scene, _this.pos3d);
+                                if (isNaN(pos2d === null || pos2d === void 0 ? void 0 : pos2d.x)) {
+                                    ele.style.display = "none";
+                                    return;
+                                }
+                                // If out of the screen then we can hide it.
+                                if (pos2d.x < 0 || pos2d.x > _this.viewer.canvas.clientWidth ||
+                                    pos2d.y < 0 || pos2d.y > _this.viewer.canvas.clientHeight) {
+                                    ele.style.display = "none";
+                                    return;
+                                }
+                                ele.style.display = "block";
+                                // Check scale to apply based on distance between camera and pos3d.
+                                // We'll make the label smaller and less transparent when further away.
+                                var scale = 1 - (distance / MAX_DISTANCE);
+                                if (scale && scale > 0.15) {
+                                    ele.style.transform = "scale(".concat(scale, ")");
+                                    ele.style.opacity = "".concat(scale);
+                                    var left = pos2d.x - (ele.clientWidth / 2) + pixelOffset.x;
+                                    ele.style.left = "".concat(left, "px");
+                                    var top_1 = pos2d.y - ele.clientHeight + (pixelOffset.y * scale);
+                                    ele.style.top = "".concat(top_1, "px");
+                                }
+                                else {
+                                    ele.style.transform = "";
+                                    ele.style.opacity = "0";
+                                }
+                            };
+                            this.renderRemoval = this.viewer.scene.postUpdate.addEventListener(updateLabel);
+                            updateLabel();
+                            return [2 /*return*/];
                     }
-                    carto = Cartographic.fromCartesian(pos3d);
-                    // TODO: Check if we need to use heightRef and adjust to absolute height.
-                    // TODO: We should be smarter and not just add 10m to the height. Eg: use polygon extrusion.
-                    carto.height += heightOffset;
-                    pos3d = Cartographic.toCartesian(carto);
-                    text = (_c = (_b = this.rego) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : "Unnamed Entity";
-                    ele = document.createElement("div");
-                    ele.innerHTML = text;
-                    ele.setAttribute("style", "\n                position: absolute;\n                z-index: 1;\n                display: none;\n                pointer-events: none;\n                padding: 6px;\n                border-radius: 6px;\n                font-family: sans-serif;\n                font-size: 12px;\n                background-color: #000000;\n                color: #ffffff;\n            }");
-                    this.label = ele;
-                    this.viewer.container.appendChild(ele);
-                    _lastDistance = null;
-                    _lastCameraPos = null;
-                    getDistance = function () {
-                        var _a;
-                        if (_this.disposed) {
-                            return null;
-                        }
-                        var cameraPos = (_a = _this.viewer.camera) === null || _a === void 0 ? void 0 : _a.position;
-                        if (isNaN(cameraPos === null || cameraPos === void 0 ? void 0 : cameraPos.x)) {
-                            return null;
-                        }
-                        // If camera hasn't moved much then we can use the last distance.
-                        var TOLERANCE = 0.1;
-                        if (_lastCameraPos) {
-                            var totalMovement = Math.abs(_lastCameraPos.x - cameraPos.x) +
-                                Math.abs(_lastCameraPos.y - cameraPos.y) +
-                                Math.abs(_lastCameraPos.z - cameraPos.z);
-                            if (totalMovement < TOLERANCE) {
-                                return _lastDistance;
-                            }
-                        }
-                        // Check if there is a raycast collision between camera and pos3d.
-                        // We'll let the labels draw through a ground collision.
-                        // Commented out while it is WIP.
-                        // const direction = Cesium.Cartesian3.subtract(pos3d, cameraPos, new Cesium.Cartesian3());
-                        // const ray = new Cesium.Ray(pos3d.clone(), direction);
-                        // const objects = (this.viewer.scene as any).drillPickFromRay(ray, 1, [visuals]);
-                        // if (objects && objects.length > 0) {
-                        //     for (let i = 0; i < objects.length; ++i) {
-                        //         const obj = objects[i];
-                        //         if (!visuals.find(x => x == obj?.id)) {
-                        //             let isGround = true;
-                        //             if (obj.object) {
-                        //                 const url = obj.object?.primitive?._basePath;
-                        //                 if (url && typeof url == "string") {
-                        //                     isGround = url.includes("tile.googleapis.com");
-                        //                 }
-                        //                 else {
-                        //                     isGround = false;
-                        //                 }
-                        //             }
-                        //             if (!isGround) {
-                        //                 return null;
-                        //             }
-                        //         }
-                        //     }
-                        // }
-                        var distance = Cartesian3.distance(cameraPos, pos3d);
-                        _lastDistance = distance;
-                        _lastCameraPos = cameraPos.clone();
-                        return distance;
-                    };
-                    MAX_DISTANCE = 5000;
-                    updateLabel = function () {
-                        if (_this.disposed || isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
-                            return;
-                        }
-                        var distance = getDistance();
-                        if (isNaN(distance) || distance >= MAX_DISTANCE) {
-                            ele.style.display = "none";
-                            return;
-                        }
-                        var pos2d = SceneTransforms.wgs84ToWindowCoordinates(_this.viewer.scene, pos3d);
-                        if (isNaN(pos2d === null || pos2d === void 0 ? void 0 : pos2d.x)) {
-                            ele.style.display = "none";
-                            return;
-                        }
-                        // If out of the screen then we can hide it.
-                        if (pos2d.x < 0 || pos2d.x > _this.viewer.canvas.clientWidth ||
-                            pos2d.y < 0 || pos2d.y > _this.viewer.canvas.clientHeight) {
-                            ele.style.display = "none";
-                            return;
-                        }
-                        ele.style.display = "block";
-                        // Check scale to apply based on distance between camera and pos3d.
-                        // We'll make the label smaller and less transparent when further away.
-                        var scale = 1 - (distance / MAX_DISTANCE);
-                        if (scale && scale > 0.15) {
-                            ele.style.transform = "scale(".concat(scale, ")");
-                            ele.style.opacity = "".concat(scale);
-                            var left = pos2d.x - (ele.clientWidth / 2) + pixelOffset.x;
-                            ele.style.left = "".concat(left, "px");
-                            var top_1 = pos2d.y - ele.clientHeight + (pixelOffset.y * scale);
-                            ele.style.top = "".concat(top_1, "px");
-                        }
-                        else {
-                            ele.style.transform = "";
-                            ele.style.opacity = "0";
-                        }
-                    };
-                    this.renderRemoval = this.viewer.scene.postUpdate.addEventListener(updateLabel);
-                    updateLabel();
-                    return [2 /*return*/];
                 });
             });
         };
@@ -3958,14 +4031,18 @@ var EntityLabel;
      * If one exists then the action is ignored.
      */
     function Attach(params) {
-        var rego = params.rego, viewer = params.viewer;
-        if (!rego || !viewer || rego[ATTACH_KEY]) {
+        var rego = params.rego, viewer = params.viewer, pos3d = params.pos3d, visualRegister = params.visualRegister, api = params.api;
+        if (!rego || !viewer || rego[EntityLabel.ATTACH_KEY]) {
             return;
         }
-        rego[ATTACH_KEY] = new Label({
+        rego[EntityLabel.ATTACH_KEY] = new Label({
             rego: rego,
-            viewer: viewer
+            viewer: viewer,
+            pos3d: pos3d,
+            visualRegister: visualRegister,
+            api: api
         });
+        return rego[EntityLabel.ATTACH_KEY];
     }
     EntityLabel.Attach = Attach;
     /**
@@ -3973,15 +4050,34 @@ var EntityLabel;
      * If one doesn't exist then the action is ignored.
      */
     function Detatch(params) {
-        var _a, _b;
-        var rego = params.rego;
-        if (!rego || !rego[ATTACH_KEY]) {
+        var _a, _b, _c;
+        var rego = params.rego, label = params.label;
+        if (!rego && label) {
+            rego = label.Rego;
+        }
+        if (!rego || !rego[EntityLabel.ATTACH_KEY]) {
+            if (label) {
+                (_a = label.Dispose) === null || _a === void 0 ? void 0 : _a.call(label);
+            }
             return;
         }
-        (_b = (_a = rego[ATTACH_KEY]).Dispose) === null || _b === void 0 ? void 0 : _b.call(_a);
-        rego[ATTACH_KEY] = null;
+        (_c = (_b = rego[EntityLabel.ATTACH_KEY]).Dispose) === null || _c === void 0 ? void 0 : _c.call(_b);
+        rego[EntityLabel.ATTACH_KEY] = null;
     }
     EntityLabel.Detatch = Detatch;
+    /**
+     * Returns label instance from given rego if one exists.
+     * @param params
+     * @returns
+     */
+    function GetLabel(params) {
+        var rego = params.rego;
+        if (!rego) {
+            return null;
+        }
+        return rego[EntityLabel.ATTACH_KEY];
+    }
+    EntityLabel.GetLabel = GetLabel;
 })(EntityLabel || (EntityLabel = {}));
 
 /**
@@ -4121,7 +4217,9 @@ function updateEntity(viewer, entityId, register) {
             if (isLabelled && visible) {
                 EntityLabel.Attach({
                     rego: rego,
-                    viewer: viewer
+                    viewer: viewer,
+                    api: register.ApiGetters.GetBruceApi(),
+                    visualRegister: register
                 });
             }
             else {
@@ -4302,7 +4400,7 @@ var VisualsRegister;
         EVisualUpdateType["DeselectAll"] = "DESELECT_ALL";
     })(EVisualUpdateType = VisualsRegister.EVisualUpdateType || (VisualsRegister.EVisualUpdateType = {}));
     var Register = /** @class */ (function () {
-        function Register(viewer) {
+        function Register(params) {
             this.id = ObjectUtils.UId();
             this.rego = {};
             this.onUpdate = null;
@@ -4315,7 +4413,8 @@ var VisualsRegister;
             // It will be drawn on the "best" visual, and only while the entity is visible.
             // Warning: this sucks for CAD entities.
             this.labelledEntityIds = [];
-            this.viewer = viewer;
+            this.viewer = params.viewer;
+            this.apiGetters = params.apiGetters;
         }
         Object.defineProperty(Register.prototype, "Id", {
             get: function () {
@@ -4331,6 +4430,13 @@ var VisualsRegister;
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(Register.prototype, "ApiGetters", {
+            get: function () {
+                return this.apiGetters;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(Register.prototype, "OnUpdate", {
             get: function () {
                 if (!this.onUpdate) {
@@ -9927,15 +10033,29 @@ var MenuItemManager;
         function Manager(params) {
             this.items = [];
             this.onUpdate = null;
-            var viewer = params.viewer, visualsRegister = params.visualsRegister;
+            var viewer = params.viewer, visualsRegister = params.visualsRegister, getters = params.getters;
             this.viewer = viewer;
+            if (!getters) {
+                getters = ENVIRONMENT.Api();
+            }
+            this.getters = getters;
             if (!visualsRegister) {
-                visualsRegister = new VisualsRegister.Register(viewer);
+                visualsRegister = new VisualsRegister.Register({
+                    viewer: this.viewer,
+                    apiGetters: getters
+                });
             }
             this.visualsRegister = visualsRegister;
             this.sharedGetters = new SharedGetters.Cache();
             this.sharedMonitor = new CesiumViewMonitor(this.viewer);
         }
+        Object.defineProperty(Manager.prototype, "Getters", {
+            get: function () {
+                return this.getters;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(Manager.prototype, "Viewer", {
             get: function () {
                 return this.viewer;
@@ -9978,11 +10098,15 @@ var MenuItemManager;
             if (this.viewer.isDestroyed()) {
                 return null;
             }
+            if (!params.getters) {
+                params.getters = this.getters;
+            }
+            // Deprecated. Backwards compatibility.
             if (!params.getters) {
                 params.getters = ENVIRONMENT.Api();
             }
-            if (params.apiGetter && !params.getters) {
-                console.warn("RenderItem(): Please pass getters instead of apiGetter. This is now deprecated due to needing access to other kinds of apis.");
+            if (params.apiGetter && !this.getters) {
+                console.warn("RenderItem(): Please pass getters within menu-item-manager constructor. 'getters' and 'apiGetter' within RenderItem are now deprecated.");
             }
             else if (!params.apiGetter) {
                 params.apiGetter = params.getters.GetBruceGetter();
@@ -15591,7 +15715,7 @@ var WidgetInfoView = /** @class */ (function (_super) {
                             defaultToId: false
                         });
                         if (!name_1) {
-                            name_1 = "Unnamed entity";
+                            name_1 = "Unnamed Entity";
                         }
                         this._title.style.display = "block";
                         this._flyTo.style.display = "flex";
@@ -15817,12 +15941,15 @@ var ViewerUtils;
      * @returns
      */
     function GetManager(params) {
-        var viewer = params.viewer, createIfMissing = params.createIfMissing;
+        var viewer = params.viewer, createIfMissing = params.createIfMissing, getters = params.getters;
         if (viewer[CESIUM_VIEWER_MANAGER_KEY]) {
             return viewer[CESIUM_VIEWER_MANAGER_KEY];
         }
         else if (createIfMissing != false) {
-            var manager = new MenuItemManager.Manager({ viewer: viewer });
+            var manager = new MenuItemManager.Manager({
+                viewer: viewer,
+                getters: getters
+            });
             viewer[CESIUM_VIEWER_MANAGER_KEY] = manager;
             return manager;
         }
@@ -15881,7 +16008,7 @@ var ViewerUtils;
     ViewerUtils.CreateWidgets = CreateWidgets;
 })(ViewerUtils || (ViewerUtils = {}));
 
-var VERSION$1 = "2.8.3";
+var VERSION$1 = "2.8.4";
 
 export { VERSION$1 as VERSION, CesiumViewMonitor, ViewerUtils, MenuItemManager, EntityRenderEngine, MenuItemCreator, VisualsRegister, RenderManager, EntitiesIdsRenderManager, EntitiesLoadedRenderManager, EntitiesRenderManager, EntityRenderManager, TilesetCadRenderManager, TilesetArbRenderManager, TilesetEntitiesRenderManager, TilesetOsmRenderManager, TilesetPointcloudRenderManager, TilesetGooglePhotosRenderManager, DataSourceStaticKmlManager, RelationsRenderManager, SharedGetters, CesiumParabola, EntityLabel, ViewRenderEngine, TileRenderEngine, TilesetRenderEngine, CESIUM_INSPECTOR_KEY, ViewUtils, DrawingUtils, MeasureUtils, EntityUtils, Draw3dPolygon, Draw3dPolyline };
 //# sourceMappingURL=bruce-cesium.es5.js.map