bruce-cesium 2.8.4 → 2.8.6

package/dist/bruce-cesium.umd.js

@@ -3732,28 +3732,27 @@
         EntityLabel.ATTACH_KEY = "nextspace-navigator-entity-label";
         var Label = /** @class */ (function () {
             function Label(params) {
-                var _this = this;
+                var _a;
+                // Counter to help differentiate between createLabel calls.
+                this.counter = 0;
                 // The label element itself.
                 this.label = null;
                 // Callback to kill render listener.
                 this.renderRemoval = null;
+                // Callback to kill terrain listener.
+                this.terrChangedRemoval = null;
                 // 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._pos3d = null;
+                this.prePositioned = false;
                 this.rego = params.rego;
                 this.viewer = params.viewer;
                 this.api = params.api;
                 this.visualRegister = params.visualRegister;
-                this.creating = true;
-                this.createCLabel(params.pos3d).then(function () {
-                    _this.creating = false;
-                }).catch(function (e) {
-                    console.error("Failed to create label", e);
-                    _this.creating = false;
-                });
+                this.prePositioned = !isNaN((_a = params.pos3d) === null || _a === void 0 ? void 0 : _a.x);
+                this.createLabel(params.pos3d);
             }
             Object.defineProperty(Label.prototype, "Rego", {
                 get: function () {
@@ -3769,9 +3768,14 @@
                 enumerable: false,
                 configurable: true
             });
-            Object.defineProperty(Label.prototype, "Creating", {
+            Object.defineProperty(Label.prototype, "pos3d", {
                 get: function () {
-                    return this.creating;
+                    return this._pos3d;
+                },
+                set: function (val) {
+                    this._pos3d = val;
+                    this.prePositioned = !isNaN(val === null || val === void 0 ? void 0 : val.x);
+                    this.createLabel(val);
                 },
                 enumerable: false,
                 configurable: true
@@ -3785,49 +3789,107 @@
                     return;
                 }
                 this.disposed = true;
-                if (this.label &&
-                    this.label.parentElement) {
-                    this.label.parentElement.removeChild(this.label);
-                    this.label = null;
-                }
-                if (this.renderRemoval) {
-                    this.renderRemoval();
-                    this.renderRemoval = null;
-                }
+                this.removeLabel();
             };
             /**
              * Creates cesium entity for the label if one does not exist.
-             * @param pos23 optional position to create label at.
+             * @param starterPos3d optional position to create label at. Ignored for billboard labels.
              */
-            Label.prototype.createCLabel = function (pos3d) {
-                var _a, _b, _c, _d, _e, _f;
+            Label.prototype.createLabel = function (starterPos3d) {
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                 return __awaiter(this, void 0, void 0, function () {
-                    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 pos3d, counter, sizeInM, heightRef, pixelOffset, visual, hierarchy, posses, centerIndex, pos1, pos2, pos3, posses, isClamped, centerIndex, size, height, scale, posses, centerIndex, text, type, e_1, ele, _lastDistance, _lastCameraPos, getDistance, MAX_DISTANCE, updateLabel, terrTimeout;
                     var _this = this;
-                    return __generator(this, function (_g) {
-                        switch (_g.label) {
+                    return __generator(this, function (_l) {
+                        switch (_l.label) {
                             case 0:
-                                if (this.label || this.disposed) {
+                                pos3d = starterPos3d ? starterPos3d.clone() : null;
+                                counter = ++this.counter;
+                                if (this.disposed) {
                                     return [2 /*return*/];
                                 }
+                                this.removeLabel();
+                                sizeInM = 0;
                                 heightRef = null;
-                                heightOffset = 10;
-                                pixelOffset = new Cesium.Cartesian2(0, 0);
-                                if (!isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 3];
+                                pixelOffset = new Cesium.Cartesian2(0, -5);
+                                if (!isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                    heightRef = Cesium.HeightReference.NONE;
+                                    pixelOffset.y = -15;
+                                }
                                 visual = (_a = this.rego) === null || _a === void 0 ? void 0 : _a.visual;
+                                // If pos3d is already set we'll run through the visuals to figure out the entity's size.
+                                // If unset then we'll use the entity's position to draw the label.
                                 if (visual && visual instanceof Cesium.Entity) {
-                                    if (visual.polygon) {
-                                        heightRef = getValue$1(this.viewer, visual.polygon.heightReference);
+                                    if (!this.prePositioned && visual.polygon) {
+                                        hierarchy = getValue$1(this.viewer, visual.polygon.hierarchy);
+                                        if ((_b = hierarchy === null || hierarchy === void 0 ? void 0 : hierarchy.positions) === null || _b === void 0 ? void 0 : _b.length) {
+                                            posses = [].concat(hierarchy.positions);
+                                            try {
+                                                sizeInM = (_c = exports.MeasureUtils.MeasurePolygon({
+                                                    posses: posses,
+                                                })) === null || _c === void 0 ? void 0 : _c.area;
+                                                if (isNaN(sizeInM)) {
+                                                    sizeInM = 0;
+                                                }
+                                            }
+                                            catch (e) {
+                                                console.error("Failed to measure polygon", e);
+                                            }
+                                            if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                                heightRef = getValue$1(this.viewer, visual.polygon.heightReference);
+                                                if (bruceModels.Cartes.IsRing3Closed(posses)) {
+                                                    posses.pop();
+                                                }
+                                                centerIndex = Math.floor(posses.length / 2);
+                                                if (posses.length >= 3) {
+                                                    pos1 = posses[centerIndex];
+                                                    pos2 = posses[0];
+                                                    pos3 = posses[posses.length - 1];
+                                                    if (pos1 && pos2 && pos3) {
+                                                        pos3d = Cesium.Cartesian3.midpoint(pos1, pos2, new Cesium.Cartesian3());
+                                                        pos3d = Cesium.Cartesian3.midpoint(pos3d, pos3, new Cesium.Cartesian3());
+                                                    }
+                                                }
+                                                if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                                    pos3d = posses[centerIndex];
+                                                }
+                                            }
+                                        }
                                     }
-                                    else if (visual.polyline) {
-                                        isClamped = getValue$1(this.viewer, visual.polyline.clampToGround);
-                                        heightRef = isClamped == false ? Cesium.HeightReference.NONE : Cesium.HeightReference.CLAMP_TO_GROUND;
+                                    else if (!this.prePositioned && visual.polyline) {
+                                        posses = getValue$1(this.viewer, visual.polyline.positions);
+                                        if (posses === null || posses === void 0 ? void 0 : posses.length) {
+                                            if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                                isClamped = getValue$1(this.viewer, visual.polyline.clampToGround);
+                                                heightRef = isClamped == false ? Cesium.HeightReference.NONE : Cesium.HeightReference.CLAMP_TO_GROUND;
+                                                centerIndex = Math.floor(posses.length / 2);
+                                                pos3d = posses[centerIndex];
+                                            }
+                                            try {
+                                                sizeInM = (_d = exports.MeasureUtils.MeasurePolyline({
+                                                    posses: posses,
+                                                })) === null || _d === void 0 ? void 0 : _d.totalLength;
+                                                if (isNaN(sizeInM)) {
+                                                    sizeInM = 0;
+                                                }
+                                            }
+                                            catch (e) {
+                                                console.error("Failed to measure polyline", e);
+                                            }
+                                        }
                                     }
                                     else if (visual.model) {
-                                        heightRef = getValue$1(this.viewer, visual.model.heightReference);
+                                        if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                            heightRef = getValue$1(this.viewer, visual.model.heightReference);
+                                        }
                                     }
                                     else if (visual.point) {
                                         heightRef = getValue$1(this.viewer, visual.point.heightReference);
+                                        size = getValue$1(this.viewer, visual.point.pixelSize);
+                                        if (size) {
+                                            pixelOffset.y = -(size / 2);
+                                            pixelOffset.y -= 5;
+                                        }
                                     }
                                     else if (visual.billboard) {
                                         heightRef = getValue$1(this.viewer, visual.billboard.heightReference);
@@ -3835,63 +3897,57 @@
                                         if (height) {
                                             scale = EnsureNumber(getValue$1(this.viewer, visual.billboard.scale), 1);
                                             pixelOffset.y = -(height * scale);
+                                            pixelOffset.y -= 5;
                                         }
-                                        // 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 Cesium.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 = Cesium.Cartographic.toCartesian(Cesium.Cartographic.fromRadians(lon, lat, 0));
+                                    else if (!this.prePositioned && visual.corridor) {
+                                        posses = getValue$1(this.viewer, visual.corridor.positions);
+                                        if (posses === null || posses === void 0 ? void 0 : posses.length) {
+                                            if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                                heightRef = getValue$1(this.viewer, visual.corridor.heightReference);
+                                                centerIndex = Math.floor(posses.length / 2);
+                                                pos3d = posses[centerIndex];
                                             }
-                                            else if (latIsDeg && lonIsDeg) {
-                                                pos3d = Cesium.Cartographic.toCartesian(Cesium.Cartographic.fromDegrees(lon, lat, 0));
+                                            try {
+                                                sizeInM = (_e = exports.MeasureUtils.MeasurePolyline({
+                                                    posses: posses,
+                                                })) === null || _e === void 0 ? void 0 : _e.totalLength;
+                                                if (isNaN(sizeInM)) {
+                                                    sizeInM = 0;
+                                                }
+                                            }
+                                            catch (e) {
+                                                console.error("Failed to measure polyline", e);
                                             }
-                                            heightRef = Cesium.HeightReference.CLAMP_TO_GROUND;
                                         }
                                     }
+                                    else if (visual.ellipse) {
+                                        if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                            heightRef = getValue$1(this.viewer, visual.ellipse.heightReference);
+                                        }
+                                    }
+                                    if (visual.billboard || visual.point || isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
+                                        pos3d = getValue$1(this.viewer, visual.position);
+                                    }
                                 }
                                 if (!isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) return [3 /*break*/, 2];
                                 return [4 /*yield*/, exports.EntityUtils.GetPosAsync({
                                         viewer: this.viewer,
                                         api: this.api,
-                                        entityId: (_c = this.rego) === null || _c === void 0 ? void 0 : _c.entityId,
+                                        entityId: (_f = this.rego) === null || _f === void 0 ? void 0 : _f.entityId,
                                         returnHeightRef: Cesium.HeightReference.NONE,
-                                        tilesetId: (_d = this.rego) === null || _d === void 0 ? void 0 : _d.tilesetId,
+                                        recordHeightRef: heightRef == null || isNaN(heightRef) ? Cesium.HeightReference.NONE : heightRef,
+                                        tilesetId: (_g = this.rego) === null || _g === void 0 ? void 0 : _g.tilesetId,
                                         visualRegister: this.visualRegister
                                     })];
                             case 1:
-                                pos3d = _g.sent();
+                                pos3d = _l.sent();
                                 heightRef = Cesium.HeightReference.NONE;
-                                _g.label = 2;
-                            case 2: return [3 /*break*/, 4];
-                            case 3:
-                                heightRef = Cesium.HeightReference.NONE;
-                                // Flat padding.
-                                heightOffset = 0;
-                                pixelOffset.y = -15;
-                                _g.label = 4;
-                            case 4:
+                                if (this.counter != counter) {
+                                    return [2 /*return*/];
+                                }
+                                _l.label = 2;
+                            case 2:
                                 if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
                                     return [2 /*return*/];
                                 }
@@ -3904,18 +3960,42 @@
                                 if (isNaN(pos3d === null || pos3d === void 0 ? void 0 : pos3d.x)) {
                                     return [2 /*return*/];
                                 }
-                                if (heightOffset) {
-                                    carto = Cesium.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 = Cesium.Cartographic.toCartesian(carto);
+                                this._pos3d = pos3d;
+                                text = "Unknown Entity";
+                                if (!((_h = this.rego) === null || _h === void 0 ? void 0 : _h.relation)) return [3 /*break*/, 7];
+                                type = this.rego.relation.RelationType;
+                                if (!(!type && this.rego.relation["Related.Entity.ID"])) return [3 /*break*/, 6];
+                                _l.label = 3;
+                            case 3:
+                                _l.trys.push([3, 5, , 6]);
+                                return [4 /*yield*/, bruceModels.EntityRelationType.Get({
+                                        api: this.api,
+                                        relationTypeId: this.rego.relation["Related.Entity.ID"]
+                                    })];
+                            case 4:
+                                type = (_j = (_l.sent())) === null || _j === void 0 ? void 0 : _j.relationType;
+                                return [3 /*break*/, 6];
+                            case 5:
+                                e_1 = _l.sent();
+                                console.error(e_1);
+                                return [3 /*break*/, 6];
+                            case 6:
+                                if (type) {
+                                    text = type.Name ? type.Name : (type.ForwardName + "/" + type.ReverseName);
+                                }
+                                return [3 /*break*/, 8];
+                            case 7:
+                                if ((_k = this.rego) === null || _k === void 0 ? void 0 : _k.name) {
+                                    text = this.rego.name;
                                 }
-                                this.pos3d = pos3d;
-                                text = (_f = (_e = this.rego) === null || _e === void 0 ? void 0 : _e.name) !== null && _f !== void 0 ? _f : "Unnamed Entity";
+                                else {
+                                    text = "Unnamed Entity";
+                                }
+                                _l.label = 8;
+                            case 8:
                                 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            }");
+                                ele.setAttribute("style", "\n                position: absolute;\n                z-index: 0;\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;
@@ -3965,23 +4045,30 @@
                                     //         }
                                     //     }
                                     // }
-                                    var distance = Cesium.Cartesian3.distance(cameraPos, _this.pos3d);
+                                    var distance = Cesium.Cartesian3.distance(cameraPos, _this._pos3d);
                                     _lastDistance = distance;
                                     _lastCameraPos = cameraPos.clone();
                                     return distance;
                                 };
                                 MAX_DISTANCE = 5000;
+                                if (sizeInM > 30) {
+                                    MAX_DISTANCE = Math.max(MAX_DISTANCE, sizeInM / 2);
+                                }
                                 updateLabel = function () {
                                     var _a;
-                                    if (_this.disposed || isNaN((_a = _this.pos3d) === null || _a === void 0 ? void 0 : _a.x)) {
+                                    if (_this.disposed || isNaN((_a = _this._pos3d) === null || _a === void 0 ? void 0 : _a.x)) {
+                                        return;
+                                    }
+                                    if (!_this.viewer || _this.viewer.isDestroyed()) {
+                                        _this.Dispose();
                                         return;
                                     }
                                     var distance = getDistance();
-                                    if (isNaN(distance) || distance >= MAX_DISTANCE) {
+                                    if (isNaN(distance) || (!_this.prePositioned && distance >= MAX_DISTANCE)) {
                                         ele.style.display = "none";
                                         return;
                                     }
-                                    var pos2d = Cesium.SceneTransforms.wgs84ToWindowCoordinates(_this.viewer.scene, _this.pos3d);
+                                    var pos2d = Cesium.SceneTransforms.wgs84ToWindowCoordinates(_this.viewer.scene, _this._pos3d);
                                     if (isNaN(pos2d === null || pos2d === void 0 ? void 0 : pos2d.x)) {
                                         ele.style.display = "none";
                                         return;
@@ -3995,7 +4082,7 @@
                                     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);
+                                    var scale = _this.prePositioned ? 1 : 1 - (distance / MAX_DISTANCE);
                                     if (scale && scale > 0.15) {
                                         ele.style.transform = "scale(".concat(scale, ")");
                                         ele.style.opacity = "".concat(scale);
@@ -4011,11 +4098,42 @@
                                 };
                                 this.renderRemoval = this.viewer.scene.postUpdate.addEventListener(updateLabel);
                                 updateLabel();
+                                terrTimeout = null;
+                                this.terrChangedRemoval = this.viewer.scene.terrainProviderChanged.addEventListener(function () {
+                                    if (_this.disposed) {
+                                        return;
+                                    }
+                                    clearTimeout(terrTimeout);
+                                    terrTimeout = setTimeout(function () {
+                                        if (counter != _this.counter) {
+                                            return;
+                                        }
+                                        _this.createLabel(starterPos3d);
+                                    }, 2500);
+                                });
                                 return [2 /*return*/];
                         }
                     });
                 });
             };
+            /**
+             * Removes label from the viewer and unsubscribes from events.
+             */
+            Label.prototype.removeLabel = function () {
+                if (this.label &&
+                    this.label.parentElement) {
+                    this.label.parentElement.removeChild(this.label);
+                    this.label = null;
+                }
+                if (this.renderRemoval) {
+                    this.renderRemoval();
+                    this.renderRemoval = null;
+                }
+                if (this.terrChangedRemoval) {
+                    this.terrChangedRemoval();
+                    this.terrChangedRemoval = null;
+                }
+            };
             return Label;
         }());
         EntityLabel.Label = Label;
@@ -15950,7 +16068,7 @@
         ViewerUtils.CreateWidgets = CreateWidgets;
     })(exports.ViewerUtils || (exports.ViewerUtils = {}));
 
-    var VERSION$1 = "2.8.4";
+    var VERSION$1 = "2.8.6";
 
     exports.VERSION = VERSION$1;
     exports.CesiumViewMonitor = CesiumViewMonitor;