leiting-bim 2.1.157 → 2.1.160

package/plugins/cesium-core/dist/cesium-core.mjs

@@ -1075,6 +1075,8 @@ class Bt {
     h(this, "entity", null);
     h(this, "tooltip", null);
     h(this, "tempPoints", []);
+    h(this, "options", null);
+    h(this, "keydownHandler", null);
     this.Cesium = t, this.viewer = e;
   }
   getPickPosition(t) {
@@ -1093,9 +1095,58 @@ class Bt {
     }
     return n;
   }
+  syncEntity() {
+    if (this.entity) {
+      if (this.positions.length === 0) {
+        this.viewer.entities.remove(this.entity), this.entity = null;
+        return;
+      }
+      this.entity.polyline.positions = this.positions.slice();
+    }
+  }
+  undoLastPoint() {
+    if (this.positions.length === 0) return;
+    this.positions.pop();
+    const t = this.tempPoints.pop();
+    t && this.viewer.entities.remove(t), this.syncEntity();
+  }
+  finishDrawing(t = !1) {
+    var s, o, r;
+    const { Cesium: e } = this;
+    if (t && this.positions.length > 0) {
+      this.positions.length = this.positions.length - 1;
+      const l = this.tempPoints.pop();
+      l && this.viewer.entities.remove(l);
+    }
+    if (this.syncEntity(), this.stopDrawing(), (s = this.tooltip) == null || s.hide(), this.tooltip = null, this.positions.length < 2) return;
+    const i = this.positions.map((l) => {
+      const c = e.Cartographic.fromCartesian(l);
+      return {
+        lng: e.Math.toDegrees(c.longitude),
+        lat: e.Math.toDegrees(c.latitude),
+        height: c.height
+      };
+    }), n = {
+      entity: this.entity,
+      positions: this.positions,
+      lnglats: i,
+      clear: () => {
+        this.clear();
+      }
+    };
+    (r = (o = this.options) == null ? void 0 : o.onComplete) == null || r.call(o, n);
+  }
+  bindKeyboardEvents() {
+    this.unbindKeyboardEvents(), this.keydownHandler = (t) => {
+      t.key === "Escape" && (t.preventDefault(), this.finishDrawing(!1));
+    }, document.addEventListener("keydown", this.keydownHandler);
+  }
+  unbindKeyboardEvents() {
+    this.keydownHandler && (document.removeEventListener("keydown", this.keydownHandler), this.keydownHandler = null);
+  }
   startDrawing(t) {
     const { Cesium: e, viewer: i } = this;
-    this.positions = [], this.tempPoints = [], this.entity = null, this.tooltip = new ze(), this.tooltip.show("单击左键添加点，双击左键结束"), this.handler = new e.ScreenSpaceEventHandler(i.canvas), this.handler.setInputAction((n) => {
+    this.options = t, this.positions = [], this.tempPoints = [], this.entity = null, this.tooltip = new ze(), this.tooltip.show("单击左键添加点，右键撤销，双击左键或 Esc 结束"), this.handler = new e.ScreenSpaceEventHandler(i.canvas), this.bindKeyboardEvents(), this.handler.setInputAction((n) => {
       var r, l;
       const s = this.getPickPosition(n.position);
       if (!s) return;
@@ -1117,35 +1168,19 @@ class Bt {
         }
       });
     }, e.ScreenSpaceEventType.LEFT_CLICK), this.handler.setInputAction(() => {
-      var o, r;
-      if (this.stopDrawing(), (o = this.tooltip) == null || o.hide(), this.tooltip = null, this.positions.length < 2) return;
-      this.positions.length = this.positions.length - 1, this.entity && (this.entity.polyline.positions = this.positions.slice());
-      const n = this.positions.map((l) => {
-        const c = e.Cartographic.fromCartesian(l);
-        return {
-          lng: e.Math.toDegrees(c.longitude),
-          lat: e.Math.toDegrees(c.latitude),
-          height: c.height
-        };
-      }), s = {
-        entity: this.entity,
-        positions: this.positions,
-        lnglats: n,
-        clear: () => {
-          this.clear();
-        }
-      };
-      (r = t.onComplete) == null || r.call(t, s);
+      this.undoLastPoint();
+    }, e.ScreenSpaceEventType.RIGHT_CLICK), this.handler.setInputAction(() => {
+      this.finishDrawing(!0);
     }, e.ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
   }
   stopDrawing() {
     var t;
-    (t = this.handler) == null || t.destroy(), this.handler = null;
+    this.unbindKeyboardEvents(), (t = this.handler) == null || t.destroy(), this.handler = null;
   }
   clear() {
     var e;
     const { viewer: t } = this;
-    this.entity && (t.entities.remove(this.entity), this.entity = null), this.tempPoints.forEach((i) => t.entities.remove(i)), this.tempPoints = [], (e = this.tooltip) == null || e.hide(), this.tooltip = null, this.positions = [], this.stopDrawing();
+    this.entity && (t.entities.remove(this.entity), this.entity = null), this.tempPoints.forEach((i) => t.entities.remove(i)), this.tempPoints = [], (e = this.tooltip) == null || e.hide(), this.tooltip = null, this.positions = [], this.options = null, this.stopDrawing();
   }
 }
 class jt {
@@ -1329,6 +1364,8 @@ class Vt {
     h(this, "entity", null);
     h(this, "tooltip", null);
     h(this, "tempPoints", []);
+    h(this, "options", null);
+    h(this, "keydownHandler", null);
     this.Cesium = t, this.viewer = e;
   }
   isHelperPick(t) {
@@ -1365,9 +1402,44 @@ class Vt {
     }
     return n;
   }
+  syncEntity() {
+    this.entity && this.positions.length === 0 && (this.viewer.entities.remove(this.entity), this.entity = null);
+  }
+  undoLastPoint() {
+    if (this.positions.length === 0) return;
+    this.positions.pop(), this.lnglats.pop();
+    const t = this.tempPoints.pop();
+    t && this.viewer.entities.remove(t), this.syncEntity();
+  }
+  finishDrawing(t = !1) {
+    var i, n, s;
+    if (t && this.positions.length > 0) {
+      this.positions.length = this.positions.length - 1, this.lnglats.length = this.lnglats.length - 1;
+      const o = this.tempPoints.pop();
+      o && this.viewer.entities.remove(o);
+    }
+    if (this.syncEntity(), this.stopDrawing(), (i = this.tooltip) == null || i.hide(), this.tooltip = null, this.positions.length < 3) return;
+    const e = {
+      entity: this.entity,
+      positions: this.positions,
+      lnglats: this.lnglats.slice(),
+      clear: () => {
+        this.clear();
+      }
+    };
+    (s = (n = this.options) == null ? void 0 : n.onComplete) == null || s.call(n, e);
+  }
+  bindKeyboardEvents() {
+    this.unbindKeyboardEvents(), this.keydownHandler = (t) => {
+      t.key === "Escape" && (t.preventDefault(), this.finishDrawing(!1));
+    }, document.addEventListener("keydown", this.keydownHandler);
+  }
+  unbindKeyboardEvents() {
+    this.keydownHandler && (document.removeEventListener("keydown", this.keydownHandler), this.keydownHandler = null);
+  }
   startDrawing(t) {
     const { Cesium: e, viewer: i } = this;
-    this.positions = [], this.lnglats = [], this.tempPoints = [], this.entity = null, this.tooltip = new ze(), this.tooltip.show("单击左键添加点，双击左键结束"), this.handler = new e.ScreenSpaceEventHandler(i.canvas), this.handler.setInputAction((n) => {
+    this.options = t, this.positions = [], this.lnglats = [], this.tempPoints = [], this.entity = null, this.tooltip = new ze(), this.tooltip.show("单击左键添加点，右键撤销，双击左键或 Esc 结束"), this.handler = new e.ScreenSpaceEventHandler(i.canvas), this.bindKeyboardEvents(), this.handler.setInputAction((n) => {
       const s = this.getPickPosition(n.position);
       if (!s) return;
       this.positions.push(s);
@@ -1397,28 +1469,19 @@ class Vt {
         }
       }), this.entity._drawHelper = !0);
     }, e.ScreenSpaceEventType.LEFT_CLICK), this.handler.setInputAction(() => {
-      var o, r;
-      if (this.stopDrawing(), (o = this.tooltip) == null || o.hide(), this.tooltip = null, this.positions.length < 3) return;
-      this.positions.length = this.positions.length - 1, this.lnglats.length = this.lnglats.length - 1;
-      const n = this.lnglats.slice(), s = {
-        entity: this.entity,
-        positions: this.positions,
-        lnglats: n,
-        clear: () => {
-          this.clear();
-        }
-      };
-      (r = t.onComplete) == null || r.call(t, s);
+      this.undoLastPoint();
+    }, e.ScreenSpaceEventType.RIGHT_CLICK), this.handler.setInputAction(() => {
+      this.finishDrawing(!0);
     }, e.ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
   }
   stopDrawing() {
     var t;
-    (t = this.handler) == null || t.destroy(), this.handler = null;
+    this.unbindKeyboardEvents(), (t = this.handler) == null || t.destroy(), this.handler = null;
   }
   clear() {
     var e;
     const { viewer: t } = this;
-    this.entity && (t.entities.remove(this.entity), this.entity = null), this.tempPoints.forEach((i) => t.entities.remove(i)), this.tempPoints = [], (e = this.tooltip) == null || e.hide(), this.tooltip = null, this.positions = [], this.lnglats = [], this.stopDrawing();
+    this.entity && (t.entities.remove(this.entity), this.entity = null), this.tempPoints.forEach((i) => t.entities.remove(i)), this.tempPoints = [], (e = this.tooltip) == null || e.hide(), this.tooltip = null, this.positions = [], this.lnglats = [], this.options = null, this.stopDrawing();
   }
 }
 class Mn {
@@ -1458,24 +1521,24 @@ class Mn {
     this.clear();
   }
 }
-var Ct = typeof global == "object" && global && global.Object === Object && global, Wt = typeof self == "object" && self && self.Object === Object && self, ie = Ct || Wt || Function("return this")(), ge = ie.Symbol, bt = Object.prototype, Ut = bt.hasOwnProperty, qt = bt.toString, Ce = ge ? ge.toStringTag : void 0;
-function Kt(a) {
+var Ct = typeof global == "object" && global && global.Object === Object && global, Wt = typeof self == "object" && self && self.Object === Object && self, ie = Ct || Wt || Function("return this")(), ge = ie.Symbol, bt = Object.prototype, Ut = bt.hasOwnProperty, Kt = bt.toString, Ce = ge ? ge.toStringTag : void 0;
+function qt(a) {
   var t = Ut.call(a, Ce), e = a[Ce];
   try {
     a[Ce] = void 0;
     var i = !0;
   } catch {
   }
-  var n = qt.call(a);
+  var n = Kt.call(a);
   return i && (t ? a[Ce] = e : delete a[Ce]), n;
 }
 var Xt = Object.prototype, Jt = Xt.toString;
-function Qt(a) {
+function Zt(a) {
   return Jt.call(a);
 }
-var Zt = "[object Null]", ei = "[object Undefined]", Be = ge ? ge.toStringTag : void 0;
+var Qt = "[object Null]", ei = "[object Undefined]", Be = ge ? ge.toStringTag : void 0;
 function Ee(a) {
-  return a == null ? a === void 0 ? ei : Zt : Be && Be in Object(a) ? Kt(a) : Qt(a);
+  return a == null ? a === void 0 ? ei : Qt : Be && Be in Object(a) ? qt(a) : Zt(a);
 }
 function Me(a) {
   return a != null && typeof a == "object";
@@ -1603,9 +1666,9 @@ var It = Object.prototype, Si = It.hasOwnProperty, Ai = It.propertyIsEnumerable,
 function Oi() {
   return !1;
 }
-var Tt = typeof exports == "object" && exports && !exports.nodeType && exports, Ue = Tt && typeof module == "object" && module && !module.nodeType && module, ki = Ue && Ue.exports === Tt, qe = ki ? ie.Buffer : void 0, Fi = qe ? qe.isBuffer : void 0, xt = Fi || Oi, Ri = "[object Arguments]", Hi = "[object Array]", zi = "[object Boolean]", Ni = "[object Date]", Gi = "[object Error]", Bi = "[object Function]", ji = "[object Map]", Yi = "[object Number]", Vi = "[object Object]", Wi = "[object RegExp]", Ui = "[object Set]", qi = "[object String]", Ki = "[object WeakMap]", Xi = "[object ArrayBuffer]", Ji = "[object DataView]", Qi = "[object Float32Array]", Zi = "[object Float64Array]", es = "[object Int8Array]", ts = "[object Int16Array]", is = "[object Int32Array]", ss = "[object Uint8Array]", os = "[object Uint8ClampedArray]", ns = "[object Uint16Array]", rs = "[object Uint32Array]", H = {};
-H[Qi] = H[Zi] = H[es] = H[ts] = H[is] = H[ss] = H[os] = H[ns] = H[rs] = !0;
-H[Ri] = H[Hi] = H[Xi] = H[zi] = H[Ji] = H[Ni] = H[Gi] = H[Bi] = H[ji] = H[Yi] = H[Vi] = H[Wi] = H[Ui] = H[qi] = H[Ki] = !1;
+var Tt = typeof exports == "object" && exports && !exports.nodeType && exports, Ue = Tt && typeof module == "object" && module && !module.nodeType && module, ki = Ue && Ue.exports === Tt, Ke = ki ? ie.Buffer : void 0, Fi = Ke ? Ke.isBuffer : void 0, xt = Fi || Oi, Ri = "[object Arguments]", Hi = "[object Array]", zi = "[object Boolean]", Ni = "[object Date]", Gi = "[object Error]", Bi = "[object Function]", ji = "[object Map]", Yi = "[object Number]", Vi = "[object Object]", Wi = "[object RegExp]", Ui = "[object Set]", Ki = "[object String]", qi = "[object WeakMap]", Xi = "[object ArrayBuffer]", Ji = "[object DataView]", Zi = "[object Float32Array]", Qi = "[object Float64Array]", es = "[object Int8Array]", ts = "[object Int16Array]", is = "[object Int32Array]", ss = "[object Uint8Array]", os = "[object Uint8ClampedArray]", ns = "[object Uint16Array]", rs = "[object Uint32Array]", H = {};
+H[Zi] = H[Qi] = H[es] = H[ts] = H[is] = H[ss] = H[os] = H[ns] = H[rs] = !0;
+H[Ri] = H[Hi] = H[Xi] = H[zi] = H[Ji] = H[Ni] = H[Gi] = H[Bi] = H[ji] = H[Yi] = H[Vi] = H[Wi] = H[Ui] = H[Ki] = H[qi] = !1;
 function as(a) {
   return Me(a) && Et(a.length) && !!H[Ee(a)];
 }
@@ -1620,7 +1683,7 @@ var _t = typeof exports == "object" && exports && !exports.nodeType && exports,
     return a || Oe && Oe.binding && Oe.binding("util");
   } catch {
   }
-})(), Ke = fe && fe.isTypedArray, hs = Ke ? Ne(Ke) : as, cs = Object.prototype, ds = cs.hasOwnProperty;
+})(), qe = fe && fe.isTypedArray, hs = qe ? Ne(qe) : as, cs = Object.prototype, ds = cs.hasOwnProperty;
 function ps(a, t) {
   var e = _e(a), i = !e && $i(a), n = !e && !i && xt(a), s = !e && !i && !n && hs(a), o = e || i || n || s, r = o ? _i(a.length, String) : [], l = r.length;
   for (var c in a)
@@ -1788,12 +1851,12 @@ function Ws(a) {
 function Us(a) {
   return this.__data__.has(a);
 }
-var qs = 200;
-function Ks(a, t) {
+var Ks = 200;
+function qs(a, t) {
   var e = this.__data__;
   if (e instanceof ae) {
     var i = e.__data__;
-    if (!Le || i.length < qs - 1)
+    if (!Le || i.length < Ks - 1)
       return i.push([a, t]), this.size = ++e.size, this;
     e = this.__data__ = new ye(i);
   }
@@ -1807,27 +1870,27 @@ we.prototype.clear = Ys;
 we.prototype.delete = Vs;
 we.prototype.get = Ws;
 we.prototype.has = Us;
-we.prototype.set = Ks;
+we.prototype.set = qs;
 var St = typeof exports == "object" && exports && !exports.nodeType && exports, Xe = St && typeof module == "object" && module && !module.nodeType && module, Xs = Xe && Xe.exports === St, Je = Xs ? ie.Buffer : void 0;
 Je && Je.allocUnsafe;
 function Js(a, t) {
   return a.slice();
 }
-function Qs(a, t) {
+function Zs(a, t) {
   for (var e = -1, i = a == null ? 0 : a.length, n = 0, s = []; ++e < i; ) {
     var o = a[e];
     t(o, e, a) && (s[n++] = o);
   }
   return s;
 }
-function Zs() {
+function Qs() {
   return [];
 }
-var eo = Object.prototype, to = eo.propertyIsEnumerable, Qe = Object.getOwnPropertySymbols, io = Qe ? function(a) {
-  return a == null ? [] : (a = Object(a), Qs(Qe(a), function(t) {
+var eo = Object.prototype, to = eo.propertyIsEnumerable, Ze = Object.getOwnPropertySymbols, io = Ze ? function(a) {
+  return a == null ? [] : (a = Object(a), Zs(Ze(a), function(t) {
     return to.call(a, t);
   }));
-} : Zs;
+} : Qs;
 function so(a, t, e) {
   var i = t(a);
   return _e(a) ? i : Bs(i, e(a));
@@ -1835,15 +1898,15 @@ function so(a, t, e) {
 function oo(a) {
   return so(a, ys, io);
 }
-var Fe = de(ie, "DataView"), Re = de(ie, "Promise"), He = de(ie, "Set"), Ze = "[object Map]", no = "[object Object]", et = "[object Promise]", tt = "[object Set]", it = "[object WeakMap]", st = "[object DataView]", ro = ce(Fe), ao = ce(Le), lo = ce(Re), ho = ce(He), co = ce(ke), re = Ee;
-(Fe && re(new Fe(new ArrayBuffer(1))) != st || Le && re(new Le()) != Ze || Re && re(Re.resolve()) != et || He && re(new He()) != tt || ke && re(new ke()) != it) && (re = function(a) {
+var Fe = de(ie, "DataView"), Re = de(ie, "Promise"), He = de(ie, "Set"), Qe = "[object Map]", no = "[object Object]", et = "[object Promise]", tt = "[object Set]", it = "[object WeakMap]", st = "[object DataView]", ro = ce(Fe), ao = ce(Le), lo = ce(Re), ho = ce(He), co = ce(ke), re = Ee;
+(Fe && re(new Fe(new ArrayBuffer(1))) != st || Le && re(new Le()) != Qe || Re && re(Re.resolve()) != et || He && re(new He()) != tt || ke && re(new ke()) != it) && (re = function(a) {
   var t = Ee(a), e = t == no ? a.constructor : void 0, i = e ? ce(e) : "";
   if (i)
     switch (i) {
       case ro:
         return st;
       case ao:
-        return Ze;
+        return Qe;
       case lo:
         return et;
       case ho:
@@ -1925,8 +1988,8 @@ var at = fe && fe.isMap, jo = at ? Ne(at) : Bo, Yo = "[object Set]";
 function Vo(a) {
   return Me(a) && re(a) == Yo;
 }
-var lt = fe && fe.isSet, Wo = lt ? Ne(lt) : Vo, At = "[object Arguments]", Uo = "[object Array]", qo = "[object Boolean]", Ko = "[object Date]", Xo = "[object Error]", $t = "[object Function]", Jo = "[object GeneratorFunction]", Qo = "[object Map]", Zo = "[object Number]", Ot = "[object Object]", en = "[object RegExp]", tn = "[object Set]", sn = "[object String]", on = "[object Symbol]", nn = "[object WeakMap]", rn = "[object ArrayBuffer]", an = "[object DataView]", ln = "[object Float32Array]", hn = "[object Float64Array]", cn = "[object Int8Array]", dn = "[object Int16Array]", pn = "[object Int32Array]", un = "[object Uint8Array]", mn = "[object Uint8ClampedArray]", gn = "[object Uint16Array]", fn = "[object Uint32Array]", R = {};
-R[At] = R[Uo] = R[rn] = R[an] = R[qo] = R[Ko] = R[ln] = R[hn] = R[cn] = R[dn] = R[pn] = R[Qo] = R[Zo] = R[Ot] = R[en] = R[tn] = R[sn] = R[on] = R[un] = R[mn] = R[gn] = R[fn] = !0;
+var lt = fe && fe.isSet, Wo = lt ? Ne(lt) : Vo, At = "[object Arguments]", Uo = "[object Array]", Ko = "[object Boolean]", qo = "[object Date]", Xo = "[object Error]", $t = "[object Function]", Jo = "[object GeneratorFunction]", Zo = "[object Map]", Qo = "[object Number]", Ot = "[object Object]", en = "[object RegExp]", tn = "[object Set]", sn = "[object String]", on = "[object Symbol]", nn = "[object WeakMap]", rn = "[object ArrayBuffer]", an = "[object DataView]", ln = "[object Float32Array]", hn = "[object Float64Array]", cn = "[object Int8Array]", dn = "[object Int16Array]", pn = "[object Int32Array]", un = "[object Uint8Array]", mn = "[object Uint8ClampedArray]", gn = "[object Uint16Array]", fn = "[object Uint32Array]", R = {};
+R[At] = R[Uo] = R[rn] = R[an] = R[Ko] = R[qo] = R[ln] = R[hn] = R[cn] = R[dn] = R[pn] = R[Zo] = R[Qo] = R[Ot] = R[en] = R[tn] = R[sn] = R[on] = R[un] = R[mn] = R[gn] = R[fn] = !0;
 R[Xo] = R[$t] = R[nn] = !1;
 function xe(a, t, e, i, n, s) {
   var o;
@@ -2691,12 +2754,15 @@ class Dn {
     category: e,
     options: i
   }) {
-    var n;
-    return e = e || "default", this.CategoryGet[e] ? this.CategoryGet[e]({
-      themeKey: t,
-      materialMap: this.categoryMap,
-      options: i || {}
-    }) : (n = this.categoryMap.get(e)) == null ? void 0 : n.get(t);
+    var s;
+    if (e = e || "default", this.CategoryGet[e])
+      return this.CategoryGet[e]({
+        themeKey: t,
+        materialMap: this.categoryMap,
+        options: i || {}
+      });
+    const n = (s = this.categoryMap.get(e)) == null ? void 0 : s.get(t);
+    return typeof n == "function" && n.__materialFactory === !0 ? n(i || {}) : n;
   }
   /**
    * 是否存在
@@ -2828,24 +2894,26 @@ class Pn {
     });
   }
   createWall(t, e) {
-    var l, c;
     if (!t.positions || t.positions.length < 1) return null;
     const i = this.materialManager.get({
       themeKey: t.theme,
       category: "wall",
       options: t
-    }), n = t.positions.length === ((l = t.minimumHeights) == null ? void 0 : l.length) ? t.minimumHeights.map((d) => d - Number(t.minHeight || 0)) : t.positions.map((d) => (d[2] || 0) - Number(t.minHeight || 0)), s = t.positions.length === ((c = t.maximumHeights) == null ? void 0 : c.length) ? t.maximumHeights.map((d) => d + Number(t.maxHeight || 0)) : t.positions.map((d) => (d[2] || 0) + Number(t.maxHeight || 0)), o = t.positions.map(
-      (d) => this.Cesium.Cartesian3.fromDegrees(d[0], d[1], d[2] || 0)
+    }), n = (v, C = 0) => {
+      const b = Number(v);
+      return Number.isFinite(b) ? b : C;
+    }, s = t.positions.map((v) => n(v == null ? void 0 : v[2], 0)), o = n(t.minHeight, 0), r = n(t.maxHeight, 0), l = (v) => Array.isArray(v) && v.length === t.positions.length && v.every((C) => Math.abs(n(C, 0)) < 1e-6), c = s.some((v) => Math.abs(v) > 1e-6), m = (Array.isArray(t.minimumHeights) && t.minimumHeights.length === t.positions.length && !(l(t.minimumHeights) && c) ? t.minimumHeights.map((v) => n(v, 0)) : s).map((v) => v - o), f = (Array.isArray(t.maximumHeights) && t.maximumHeights.length === t.positions.length && !(l(t.maximumHeights) && c) ? t.maximumHeights.map((v) => n(v, 0)) : s).map((v) => v + r), w = t.positions.map(
+      (v) => this.Cesium.Cartesian3.fromDegrees(v[0], v[1], v[2] || 0)
     );
-    let r = {
+    let y = {
       ...t
     };
-    return i && (r.material = i), this.viewer.entities.add({
+    return i && (y.material = i), this.viewer.entities.add({
       wall: {
-        ...r,
-        positions: o,
-        minimumHeights: n,
-        maximumHeights: s
+        ...y,
+        positions: w,
+        minimumHeights: m,
+        maximumHeights: f
       },
       show: (t.show ?? !0) && e
     });
@@ -3982,7 +4050,7 @@ class dt {
         }
       });
       if (this.pointEntities.push(o), this.positions.length === 2) {
-        this.stop(), this.previewSegmentEntities.forEach((K) => i.entities.remove(K)), this.previewSegmentEntities = [], this.previewAngleMarkerEntities.forEach((K) => i.entities.remove(K)), this.previewAngleMarkerEntities = [], this.previewPointEntity && (i.entities.remove(this.previewPointEntity), this.previewPointEntity = null);
+        this.stop(), this.previewSegmentEntities.forEach((q) => i.entities.remove(q)), this.previewSegmentEntities = [], this.previewAngleMarkerEntities.forEach((q) => i.entities.remove(q)), this.previewAngleMarkerEntities = [], this.previewPointEntity && (i.entities.remove(this.previewPointEntity), this.previewPointEntity = null);
         const d = e.Cartographic.fromCartesian(this.positions[0]), u = e.Cartographic.fromCartesian(this.positions[1]), m = d.height || 0, g = u.height || 0, p = m <= g ? this.positions[0] : this.positions[1], f = m > g ? this.positions[0] : this.positions[1], w = e.Cartographic.fromCartesian(p);
         e.Cartographic.fromCartesian(f);
         const y = Math.max(m, g), v = e.Cartesian3.fromDegrees(
@@ -4014,31 +4082,31 @@ class dt {
         this.segmentEntities.push(M, P, L);
         const E = e.Cartesian3.distance(p, v), I = e.Cartesian3.distance(v, f), S = e.Cartesian3.distance(p, f), _ = new e.Cartesian3((p.x + v.x) / 2, (p.y + v.y) / 2, (p.z + v.z) / 2), T = new e.Cartesian3((v.x + f.x) / 2, (v.y + f.y) / 2, (v.z + f.z) / 2), A = new e.Cartesian3((p.x + f.x) / 2, (p.y + f.y) / 2, (p.z + f.z) / 2), D = e.Cartographic.fromCartesian(_), O = e.Cartographic.fromCartesian(T), x = e.Cartographic.fromCartesian(A), $ = "measure_triangle_seg_v", F = "measure_triangle_seg_h", z = "measure_triangle_seg_hyp";
         this.segmentLabelIds = [$, F, z], this.htmlLabelPool.add({ text: `${E.toFixed(2)} m` }, { id: $, lon: e.Math.toDegrees(D.longitude), lat: e.Math.toDegrees(D.latitude), height: D.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${I.toFixed(2)} m` }, { id: F, lon: e.Math.toDegrees(O.longitude), lat: e.Math.toDegrees(O.latitude), height: O.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${S.toFixed(2)} m` }, { id: z, lon: e.Math.toDegrees(x.longitude), lat: e.Math.toDegrees(x.latitude), height: x.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } });
-        const G = e.Cartesian3.subtract(f, p, new e.Cartesian3()), B = e.Cartesian3.subtract(v, p, new e.Cartesian3()), q = e.Cartesian3.subtract(v, f, new e.Cartesian3()), X = e.Cartesian3.subtract(p, f, new e.Cartesian3()), se = e.Cartesian3.dot(G, B), pe = Math.sqrt(e.Cartesian3.dot(G, G)) * Math.sqrt(e.Cartesian3.dot(B, B)), ue = e.Cartesian3.dot(q, X), ve = Math.sqrt(e.Cartesian3.dot(q, q)) * Math.sqrt(e.Cartesian3.dot(X, X)), j = Math.acos(Math.min(Math.max(se / (pe || 1), -1), 1)), le = Math.acos(Math.min(Math.max(ue / (ve || 1), -1), 1)), ee = e.Cartographic.fromCartesian(p), Y = e.Cartographic.fromCartesian(f), J = "measure_triangle_angle_a", oe = "measure_triangle_angle_b";
+        const G = e.Cartesian3.subtract(f, p, new e.Cartesian3()), B = e.Cartesian3.subtract(v, p, new e.Cartesian3()), K = e.Cartesian3.subtract(v, f, new e.Cartesian3()), X = e.Cartesian3.subtract(p, f, new e.Cartesian3()), se = e.Cartesian3.dot(G, B), pe = Math.sqrt(e.Cartesian3.dot(G, G)) * Math.sqrt(e.Cartesian3.dot(B, B)), ue = e.Cartesian3.dot(K, X), ve = Math.sqrt(e.Cartesian3.dot(K, K)) * Math.sqrt(e.Cartesian3.dot(X, X)), j = Math.acos(Math.min(Math.max(se / (pe || 1), -1), 1)), le = Math.acos(Math.min(Math.max(ue / (ve || 1), -1), 1)), ee = e.Cartographic.fromCartesian(p), Y = e.Cartographic.fromCartesian(f), J = "measure_triangle_angle_a", oe = "measure_triangle_angle_b";
         this.angleLabelIds = [J, oe], this.htmlLabelPool.add({ text: `${(j * 180 / Math.PI).toFixed(2)}°` }, { id: J, lon: e.Math.toDegrees(ee.longitude), lat: e.Math.toDegrees(ee.latitude), height: ee.height || 0, theme: "measure-triangle-angle", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${(le * 180 / Math.PI).toFixed(2)}°` }, { id: oe, lon: e.Math.toDegrees(Y.longitude), lat: e.Math.toDegrees(Y.latitude), height: Y.height || 0, theme: "measure-triangle-angle", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } });
         const me = Math.max(0.01, Math.min(0.5, t.angleMarkerRatio ?? 0.2)), V = Math.min(E, I) * me;
         if (E > 1e-3 && I > 1e-3) {
-          const K = e.Cartesian3.normalize(
+          const q = e.Cartesian3.normalize(
             e.Cartesian3.subtract(p, v, new e.Cartesian3()),
             new e.Cartesian3()
           ), ne = e.Cartesian3.normalize(
             e.Cartesian3.subtract(f, v, new e.Cartesian3()),
             new e.Cartesian3()
-          ), Q = new e.Cartesian3(
-            v.x + K.x * V,
-            v.y + K.y * V,
-            v.z + K.z * V
+          ), Z = new e.Cartesian3(
+            v.x + q.x * V,
+            v.y + q.y * V,
+            v.z + q.z * V
           ), k = new e.Cartesian3(
             v.x + ne.x * V,
             v.y + ne.y * V,
             v.z + ne.z * V
           ), U = new e.Cartesian3(
-            v.x + K.x * V + ne.x * V,
-            v.y + K.y * V + ne.y * V,
-            v.z + K.z * V + ne.z * V
-          ), Z = i.entities.add({
+            v.x + q.x * V + ne.x * V,
+            v.y + q.y * V + ne.y * V,
+            v.z + q.z * V + ne.z * V
+          ), Q = i.entities.add({
             polyline: {
-              positions: [Q, U],
+              positions: [Z, U],
               width: t.width || 3,
               material: C,
               depthFailMaterial: new e.PolylineDashMaterialProperty({ color: b, dashLength: 12, dashPattern: 255 })
@@ -4051,7 +4119,7 @@ class dt {
               depthFailMaterial: new e.PolylineDashMaterialProperty({ color: b, dashLength: 12, dashPattern: 255 })
             }
           });
-          this.angleMarkerEntities.push(Z, Ie);
+          this.angleMarkerEntities.push(Q, Ie);
         }
         this.previewLabelId && this.htmlLabelPool && (this.htmlLabelPool.removeByIds([this.previewLabelId]), this.previewLabelId = null);
         const W = {
@@ -4107,8 +4175,8 @@ class dt {
         });
         this.previewSegmentEntities.push(Y, J, oe);
       }
-      const y = e.Cartesian3.distance(d, p), v = e.Cartesian3.distance(p, u), C = e.Cartesian3.distance(d, u), b = e.Cartesian3.subtract(u, d, new e.Cartesian3()), M = e.Cartesian3.subtract(p, d, new e.Cartesian3()), P = e.Cartesian3.subtract(p, u, new e.Cartesian3()), L = e.Cartesian3.subtract(d, u, new e.Cartesian3()), E = e.Cartesian3.dot(b, M), I = Math.sqrt(e.Cartesian3.dot(b, b)) * Math.sqrt(e.Cartesian3.dot(M, M)), S = e.Cartesian3.dot(P, L), _ = Math.sqrt(e.Cartesian3.dot(P, P)) * Math.sqrt(e.Cartesian3.dot(L, L)), T = Math.acos(Math.min(Math.max(E / (I || 1), -1), 1)), A = Math.acos(Math.min(Math.max(S / (_ || 1), -1), 1)), D = new e.Cartesian3((d.x + p.x) / 2, (d.y + p.y) / 2, (d.z + p.z) / 2), O = new e.Cartesian3((p.x + u.x) / 2, (p.y + u.y) / 2, (p.z + u.z) / 2), x = new e.Cartesian3((d.x + u.x) / 2, (d.y + u.y) / 2, (d.z + u.z) / 2), $ = e.Cartographic.fromCartesian(D), F = e.Cartographic.fromCartesian(O), z = e.Cartographic.fromCartesian(x), G = e.Cartographic.fromCartesian(d), B = e.Cartographic.fromCartesian(u), q = "measure_triangle_seg_v", X = "measure_triangle_seg_h", se = "measure_triangle_seg_hyp", pe = "measure_triangle_angle_a", ue = "measure_triangle_angle_b";
-      this.segmentLabelIds.length === 0 && (this.segmentLabelIds = [q, X, se]), this.angleLabelIds.length === 0 && (this.angleLabelIds = [pe, ue]), this.htmlLabelPool.add({ text: `${y.toFixed(2)} m` }, { id: q, lon: e.Math.toDegrees($.longitude), lat: e.Math.toDegrees($.latitude), height: $.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${v.toFixed(2)} m` }, { id: X, lon: e.Math.toDegrees(F.longitude), lat: e.Math.toDegrees(F.latitude), height: F.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${C.toFixed(2)} m` }, { id: se, lon: e.Math.toDegrees(z.longitude), lat: e.Math.toDegrees(z.latitude), height: z.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${(T * 180 / Math.PI).toFixed(2)}°` }, { id: pe, lon: e.Math.toDegrees(G.longitude), lat: e.Math.toDegrees(G.latitude), height: G.height || 0, theme: "measure-triangle-angle", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${(A * 180 / Math.PI).toFixed(2)}°` }, { id: ue, lon: e.Math.toDegrees(B.longitude), lat: e.Math.toDegrees(B.latitude), height: B.height || 0, theme: "measure-triangle-angle", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } });
+      const y = e.Cartesian3.distance(d, p), v = e.Cartesian3.distance(p, u), C = e.Cartesian3.distance(d, u), b = e.Cartesian3.subtract(u, d, new e.Cartesian3()), M = e.Cartesian3.subtract(p, d, new e.Cartesian3()), P = e.Cartesian3.subtract(p, u, new e.Cartesian3()), L = e.Cartesian3.subtract(d, u, new e.Cartesian3()), E = e.Cartesian3.dot(b, M), I = Math.sqrt(e.Cartesian3.dot(b, b)) * Math.sqrt(e.Cartesian3.dot(M, M)), S = e.Cartesian3.dot(P, L), _ = Math.sqrt(e.Cartesian3.dot(P, P)) * Math.sqrt(e.Cartesian3.dot(L, L)), T = Math.acos(Math.min(Math.max(E / (I || 1), -1), 1)), A = Math.acos(Math.min(Math.max(S / (_ || 1), -1), 1)), D = new e.Cartesian3((d.x + p.x) / 2, (d.y + p.y) / 2, (d.z + p.z) / 2), O = new e.Cartesian3((p.x + u.x) / 2, (p.y + u.y) / 2, (p.z + u.z) / 2), x = new e.Cartesian3((d.x + u.x) / 2, (d.y + u.y) / 2, (d.z + u.z) / 2), $ = e.Cartographic.fromCartesian(D), F = e.Cartographic.fromCartesian(O), z = e.Cartographic.fromCartesian(x), G = e.Cartographic.fromCartesian(d), B = e.Cartographic.fromCartesian(u), K = "measure_triangle_seg_v", X = "measure_triangle_seg_h", se = "measure_triangle_seg_hyp", pe = "measure_triangle_angle_a", ue = "measure_triangle_angle_b";
+      this.segmentLabelIds.length === 0 && (this.segmentLabelIds = [K, X, se]), this.angleLabelIds.length === 0 && (this.angleLabelIds = [pe, ue]), this.htmlLabelPool.add({ text: `${y.toFixed(2)} m` }, { id: K, lon: e.Math.toDegrees($.longitude), lat: e.Math.toDegrees($.latitude), height: $.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${v.toFixed(2)} m` }, { id: X, lon: e.Math.toDegrees(F.longitude), lat: e.Math.toDegrees(F.latitude), height: F.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${C.toFixed(2)} m` }, { id: se, lon: e.Math.toDegrees(z.longitude), lat: e.Math.toDegrees(z.latitude), height: z.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${(T * 180 / Math.PI).toFixed(2)}°` }, { id: pe, lon: e.Math.toDegrees(G.longitude), lat: e.Math.toDegrees(G.latitude), height: G.height || 0, theme: "measure-triangle-angle", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${(A * 180 / Math.PI).toFixed(2)}°` }, { id: ue, lon: e.Math.toDegrees(B.longitude), lat: e.Math.toDegrees(B.latitude), height: B.height || 0, theme: "measure-triangle-angle", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } });
       const ve = Math.max(0.01, Math.min(0.5, t.angleMarkerRatio ?? 0.2)), j = Math.min(y, v) * ve;
       if (y > 1e-3 && v > 1e-3) {
         const Y = e.Cartesian3.normalize(
@@ -4138,7 +4206,7 @@ class dt {
               material: f,
               depthFailMaterial: new e.PolylineDashMaterialProperty({ color: w, dashLength: 12, dashPattern: 255 })
             }
-          }), K = i.entities.add({
+          }), q = i.entities.add({
             polyline: {
               positions: new e.CallbackProperty(() => !this.previewMarkerP2 || !this.previewMarkerCorner ? [] : [this.previewMarkerP2, this.previewMarkerCorner], !1),
               width: t.width || 3,
@@ -4146,7 +4214,7 @@ class dt {
               depthFailMaterial: new e.PolylineDashMaterialProperty({ color: w, dashLength: 12, dashPattern: 255 })
             }
           });
-          this.previewAngleMarkerEntities.push(W, K);
+          this.previewAngleMarkerEntities.push(W, q);
         }
       }
     }, e.ScreenSpaceEventType.MOUSE_MOVE);
@@ -4158,27 +4226,27 @@ class dt {
     this.stop(), this.segmentEntities.forEach((t) => this.viewer.entities.remove(t)), this.segmentEntities = [], this.angleMarkerEntities.forEach((t) => this.viewer.entities.remove(t)), this.angleMarkerEntities = [], this.pointEntities.forEach((t) => this.viewer.entities.remove(t)), this.pointEntities = [], this.previewSegmentEntities.forEach((t) => this.viewer.entities.remove(t)), this.previewSegmentEntities = [], this.previewAngleMarkerEntities.forEach((t) => this.viewer.entities.remove(t)), this.previewAngleMarkerEntities = [], this.previewPointEntity && (this.viewer.entities.remove(this.previewPointEntity), this.previewPointEntity = null), this.htmlLabelPool && this.htmlLabelId && (this.htmlLabelPool.removeByIds([this.htmlLabelId]), this.htmlLabelId = null), this.previewLabelId && this.htmlLabelPool && (this.htmlLabelPool.removeByIds([this.previewLabelId]), this.previewLabelId = null), this.segmentLabelIds.length && this.htmlLabelPool && this.htmlLabelPool.removeByIds(this.segmentLabelIds.slice()), this.angleLabelIds.length && this.htmlLabelPool && this.htmlLabelPool.removeByIds(this.angleLabelIds.slice()), this.segmentLabelIds = [], this.angleLabelIds = [], this.positions = [];
   }
   rehydrate(t, e) {
-    var K, ne;
-    const i = this.Cesium, n = this.viewer, s = t.options || {}, o = s.lineColor || s.color || i.Color.YELLOW, r = ((ne = (K = s.dashLineColor || s.lineColor || s.color || i.Color.RED).withAlpha) == null ? void 0 : ne.call(K, 0.9)) || i.Color.RED, l = s.width || 3, c = (t.positions || []).map((Q) => new i.Cartesian3(Q[0], Q[1], Q[2]));
+    var q, ne;
+    const i = this.Cesium, n = this.viewer, s = t.options || {}, o = s.lineColor || s.color || i.Color.YELLOW, r = ((ne = (q = s.dashLineColor || s.lineColor || s.color || i.Color.RED).withAlpha) == null ? void 0 : ne.call(q, 0.9)) || i.Color.RED, l = s.width || 3, c = (t.positions || []).map((Z) => new i.Cartesian3(Z[0], Z[1], Z[2]));
     if (c.length < 2) return;
     if (!this.htmlLabelPool) {
-      const Q = s.overlayContainerId || "html-label-container";
-      this.htmlLabelPool = e || new N(i, n, Q), this.htmlLabelPool.registerTheme("measure-triangle", {
+      const Z = s.overlayContainerId || "html-label-container";
+      this.htmlLabelPool = e || new N(i, n, Z), this.htmlLabelPool.registerTheme("measure-triangle", {
         createElement: (k, U) => {
-          var Z;
-          k.innerHTML = String(((Z = U == null ? void 0 : U.data) == null ? void 0 : Z.text) || ""), k.style.background = "rgba(0,0,0,0.6)", k.style.color = "#fff", k.style.font = "14px sans-serif", k.style.padding = "4px 6px", k.style.borderRadius = "4px", k.style.whiteSpace = "pre";
+          var Q;
+          k.innerHTML = String(((Q = U == null ? void 0 : U.data) == null ? void 0 : Q.text) || ""), k.style.background = "rgba(0,0,0,0.6)", k.style.color = "#fff", k.style.font = "14px sans-serif", k.style.padding = "4px 6px", k.style.borderRadius = "4px", k.style.whiteSpace = "pre";
         },
         options: { offset: { x: 0, y: -10 } }
       }), this.htmlLabelPool.registerTheme("measure-triangle-seg", {
         createElement: (k, U) => {
-          var Z;
-          k.innerHTML = String(((Z = U == null ? void 0 : U.data) == null ? void 0 : Z.text) || ""), k.style.background = "rgba(0,0,0,0.6)", k.style.color = "#fff", k.style.font = "14px sans-serif", k.style.padding = "4px 6px", k.style.borderRadius = "4px", k.style.whiteSpace = "pre";
+          var Q;
+          k.innerHTML = String(((Q = U == null ? void 0 : U.data) == null ? void 0 : Q.text) || ""), k.style.background = "rgba(0,0,0,0.6)", k.style.color = "#fff", k.style.font = "14px sans-serif", k.style.padding = "4px 6px", k.style.borderRadius = "4px", k.style.whiteSpace = "pre";
         },
         options: { offset: { x: 0, y: -10 } }
       }), this.htmlLabelPool.registerTheme("measure-triangle-angle", {
         createElement: (k, U) => {
-          var Z;
-          k.innerHTML = String(((Z = U == null ? void 0 : U.data) == null ? void 0 : Z.text) || ""), k.style.background = "rgba(0,0,0,0.6)", k.style.color = "#fff", k.style.font = "14px sans-serif", k.style.padding = "4px 6px", k.style.borderRadius = "4px", k.style.whiteSpace = "pre";
+          var Q;
+          k.innerHTML = String(((Q = U == null ? void 0 : U.data) == null ? void 0 : Q.text) || ""), k.style.background = "rgba(0,0,0,0.6)", k.style.color = "#fff", k.style.font = "14px sans-serif", k.style.padding = "4px 6px", k.style.borderRadius = "4px", k.style.whiteSpace = "pre";
         },
         options: { offset: { x: 0, y: -10 } }
       });
@@ -4199,11 +4267,11 @@ class dt {
     this.segmentEntities.push(M, P, L);
     const E = i.Cartesian3.distance(p, b), I = i.Cartesian3.distance(b, f), S = i.Cartesian3.distance(p, f), _ = new i.Cartesian3((p.x + b.x) / 2, (p.y + b.y) / 2, (p.z + b.z) / 2), T = new i.Cartesian3((b.x + f.x) / 2, (b.y + f.y) / 2, (b.z + f.z) / 2), A = new i.Cartesian3((p.x + f.x) / 2, (p.y + f.y) / 2, (p.z + f.z) / 2), D = i.Cartographic.fromCartesian(_), O = i.Cartographic.fromCartesian(T), x = i.Cartographic.fromCartesian(A), $ = t.id + "_tri_v", F = t.id + "_tri_h", z = t.id + "_tri_hyp";
     this.segmentLabelIds = [$, F, z], this.htmlLabelPool.add({ text: `${E.toFixed(2)} m` }, { id: $, lon: i.Math.toDegrees(D.longitude), lat: i.Math.toDegrees(D.latitude), height: D.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${I.toFixed(2)} m` }, { id: F, lon: i.Math.toDegrees(O.longitude), lat: i.Math.toDegrees(O.latitude), height: O.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${S.toFixed(2)} m` }, { id: z, lon: i.Math.toDegrees(x.longitude), lat: i.Math.toDegrees(x.latitude), height: x.height || 0, theme: "measure-triangle-seg", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } });
-    const G = i.Cartesian3.subtract(f, p, new i.Cartesian3()), B = i.Cartesian3.subtract(b, p, new i.Cartesian3()), q = i.Cartesian3.subtract(b, f, new i.Cartesian3()), X = i.Cartesian3.subtract(p, f, new i.Cartesian3()), se = i.Cartesian3.dot(G, B), pe = Math.sqrt(i.Cartesian3.dot(G, G)) * Math.sqrt(i.Cartesian3.dot(B, B)), ue = i.Cartesian3.dot(q, X), ve = Math.sqrt(i.Cartesian3.dot(q, q)) * Math.sqrt(i.Cartesian3.dot(X, X)), j = Math.acos(Math.min(Math.max(se / (pe || 1), -1), 1)), le = Math.acos(Math.min(Math.max(ue / (ve || 1), -1), 1)), ee = i.Cartographic.fromCartesian(p), Y = i.Cartographic.fromCartesian(f), J = s.labelText || { angle: "角度" }, oe = t.id + "_tri_angA", me = t.id + "_tri_angB";
+    const G = i.Cartesian3.subtract(f, p, new i.Cartesian3()), B = i.Cartesian3.subtract(b, p, new i.Cartesian3()), K = i.Cartesian3.subtract(b, f, new i.Cartesian3()), X = i.Cartesian3.subtract(p, f, new i.Cartesian3()), se = i.Cartesian3.dot(G, B), pe = Math.sqrt(i.Cartesian3.dot(G, G)) * Math.sqrt(i.Cartesian3.dot(B, B)), ue = i.Cartesian3.dot(K, X), ve = Math.sqrt(i.Cartesian3.dot(K, K)) * Math.sqrt(i.Cartesian3.dot(X, X)), j = Math.acos(Math.min(Math.max(se / (pe || 1), -1), 1)), le = Math.acos(Math.min(Math.max(ue / (ve || 1), -1), 1)), ee = i.Cartographic.fromCartesian(p), Y = i.Cartographic.fromCartesian(f), J = s.labelText || { angle: "角度" }, oe = t.id + "_tri_angA", me = t.id + "_tri_angB";
     this.angleLabelIds = [oe, me], this.htmlLabelPool.add({ text: `${J.angle}:${(j * 180 / Math.PI).toFixed(2)}°` }, { id: oe, lon: i.Math.toDegrees(ee.longitude), lat: i.Math.toDegrees(ee.latitude), height: ee.height || 0, theme: "measure-triangle-angle", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } }), this.htmlLabelPool.add({ text: `${J.angle}:${(le * 180 / Math.PI).toFixed(2)}°` }, { id: me, lon: i.Math.toDegrees(Y.longitude), lat: i.Math.toDegrees(Y.latitude), height: Y.height || 0, theme: "measure-triangle-angle", show: !0, style: { pointerEvents: "none", userSelect: "none", cursor: "default" } });
     const V = Math.max(0.01, Math.min(0.5, s.angleMarkerRatio ?? 0.2)), W = Math.min(E, I) * V;
     if (E > 1e-3 && I > 1e-3) {
-      const Q = i.Cartesian3.normalize(i.Cartesian3.subtract(p, b, new i.Cartesian3()), new i.Cartesian3()), k = i.Cartesian3.normalize(i.Cartesian3.subtract(f, b, new i.Cartesian3()), new i.Cartesian3()), U = new i.Cartesian3(b.x + Q.x * W, b.y + Q.y * W, b.z + Q.z * W), Z = new i.Cartesian3(b.x + k.x * W, b.y + k.y * W, b.z + k.z * W), Ie = new i.Cartesian3(b.x + Q.x * W + k.x * W, b.y + Q.y * W + k.y * W, b.z + Q.z * W + k.z * W), kt = n.entities.add({ polyline: { positions: [U, Ie], width: l, material: o, depthFailMaterial: new i.PolylineDashMaterialProperty({ color: r, dashLength: 12, dashPattern: 255 }) } }), Ft = n.entities.add({ polyline: { positions: [Z, Ie], width: l, material: o, depthFailMaterial: new i.PolylineDashMaterialProperty({ color: r, dashLength: 12, dashPattern: 255 }) } });
+      const Z = i.Cartesian3.normalize(i.Cartesian3.subtract(p, b, new i.Cartesian3()), new i.Cartesian3()), k = i.Cartesian3.normalize(i.Cartesian3.subtract(f, b, new i.Cartesian3()), new i.Cartesian3()), U = new i.Cartesian3(b.x + Z.x * W, b.y + Z.y * W, b.z + Z.z * W), Q = new i.Cartesian3(b.x + k.x * W, b.y + k.y * W, b.z + k.z * W), Ie = new i.Cartesian3(b.x + Z.x * W + k.x * W, b.y + Z.y * W + k.y * W, b.z + Z.z * W + k.z * W), kt = n.entities.add({ polyline: { positions: [U, Ie], width: l, material: o, depthFailMaterial: new i.PolylineDashMaterialProperty({ color: r, dashLength: 12, dashPattern: 255 }) } }), Ft = n.entities.add({ polyline: { positions: [Q, Ie], width: l, material: o, depthFailMaterial: new i.PolylineDashMaterialProperty({ color: r, dashLength: 12, dashPattern: 255 }) } });
       this.angleMarkerEntities.push(kt, Ft);
     }
   }
@@ -5424,11 +5492,11 @@ ${f.area}:${m.toFixed(2)} m²` },
         [l[3], l[0]]
       ];
       for (let x = 0; x < w.length; x++) {
-        const [$, F] = w[x], z = x === 0 || x === 2 ? d : u, G = new e.Cartesian3(($.x + F.x) / 2, ($.y + F.y) / 2, ($.z + F.z) / 2), B = e.Cartographic.fromCartesian(G), q = `measure_rectangle_seg_${Date.now()}_${x}`;
-        this.segmentLabelIds.push(q), this.htmlLabelPool.add(
+        const [$, F] = w[x], z = x === 0 || x === 2 ? d : u, G = new e.Cartesian3(($.x + F.x) / 2, ($.y + F.y) / 2, ($.z + F.z) / 2), B = e.Cartographic.fromCartesian(G), K = `measure_rectangle_seg_${Date.now()}_${x}`;
+        this.segmentLabelIds.push(K), this.htmlLabelPool.add(
           { text: `${f.side}:${Number(z).toFixed(2)} m` },
           {
-            id: q,
+            id: K,
             lon: e.Math.toDegrees(B.longitude),
             lat: e.Math.toDegrees(B.latitude),
             height: B.height || 0,
@@ -5795,7 +5863,7 @@ class vt {
         for (let O = 1; O < g.length; O++) {
           const x = g[O - 1], $ = g[O], F = e.Cartographic.fromCartesian(x), z = e.Cartographic.fromCartesian($), B = new e.EllipsoidGeodesic(F, z).surfaceDistance;
           A += B;
-          const q = new e.Cartesian3((x.x + $.x) / 2, (x.y + $.y) / 2, (x.z + $.z) / 2), X = e.Cartographic.fromCartesian(q), se = `measure_regular_seg_${Date.now()}_${O - 1}`;
+          const K = new e.Cartesian3((x.x + $.x) / 2, (x.y + $.y) / 2, (x.z + $.z) / 2), X = e.Cartographic.fromCartesian(K), se = `measure_regular_seg_${Date.now()}_${O - 1}`;
           this.segmentLabelIds.push(se), this.htmlLabelPool.add(
             { text: `${T.side}:${B.toFixed(2)} m` },
             {