@xingm/vmap-cesium-toolbar 0.0.1-alpha.8 → 0.0.1-alpha.9

package/dist/hooks/toolBarConfig.d.ts

@@ -56,6 +56,7 @@ export declare const useToolBarConfig: (message: any) => {
             onSelect: (result: SearchResult) => void;
         };
         measurement: {
+            onMeasurementStart: (positions?: any) => void;
             onDistanceComplete: (positions: any, distance: any) => void;
             onAreaComplete: (positions: any, area: any) => void;
             onClear: () => void;

package/dist/index.d.ts

@@ -43,6 +43,7 @@ export interface SearchResult {
 
 // 测量回调接口
 export interface MeasurementCallback {
+  onMeasurementStart?: (positions?: Cartesian3[]) => void;
   onDistanceComplete?: (positions: Cartesian3[], distance: number) => void;
   onAreaComplete?: (positions: Cartesian3[], area: number) => void;
   onClear?: () => void;

package/dist/index.js

@@ -300,28 +300,28 @@ class v {
       for (let o = 0; o < a; o++) {
         const c = t[o], u = t[o + 1], b = n.Cartesian3.distance(c, u);
         if (b > 5) {
-          const x = n.Cartesian3.midpoint(
+          const G = n.Cartesian3.midpoint(
             c,
             u,
             new n.Cartesian3()
           );
-          let d = x;
-          const l = n.Cartographic.fromCartesian(x);
+          let d = G;
+          const l = n.Cartographic.fromCartesian(G);
           d = n.Cartesian3.fromRadians(
             l.longitude,
             l.latitude,
             l.height || 0
           );
-          let h = x;
+          let h = G;
           this.offsetHeight > 0 && (h = n.Cartesian3.fromRadians(
             l.longitude,
             l.latitude,
             (l.height || 0) + this.offsetHeight
           ));
-          const G = o % 2 === 0 ? -25 : 25, f = this.formatDistance(b);
+          const x = o % 2 === 0 ? -25 : 25, f = this.formatDistance(b);
           if (o < this.currentSegmentLabels.length && this.currentSegmentLabels[o].billboard) {
             const g = this.currentSegmentLabels[o];
-            if (g.position = new n.ConstantPositionProperty(h), g.billboard.pixelOffset = new n.ConstantProperty(new n.Cartesian2(0, G)), g._groundPosition = d, g._segmentText !== f) {
+            if (g.position = new n.ConstantPositionProperty(h), g.billboard.pixelOffset = new n.ConstantProperty(new n.Cartesian2(0, x)), g._groundPosition = d, g._segmentText !== f) {
               const A = this.createSegmentLengthBillboardImage(f);
               g.billboard.image = new n.ConstantProperty(A), g._segmentText = f;
             }
@@ -330,7 +330,7 @@ class v {
               position: h,
               billboard: {
                 image: g,
-                pixelOffset: new n.ConstantProperty(new n.Cartesian2(0, G)),
+                pixelOffset: new n.ConstantProperty(new n.Cartesian2(0, x)),
                 // 3D 使用 RELATIVE_TO_GROUND，2D 关闭贴地以保证可见
                 heightReference: new n.ConstantProperty(
                   this.offsetHeight > 0 ? n.HeightReference.RELATIVE_TO_GROUND : n.HeightReference.NONE
@@ -344,10 +344,10 @@ class v {
             w._segmentText = f, w._groundPosition = d, this.currentSegmentLabels.push(w), this.tempLabelEntities.push(w);
           }
         } else if (o < this.currentSegmentLabels.length) {
-          const x = this.currentSegmentLabels[o];
-          if (x) {
-            this.entities.remove(x);
-            const d = this.tempLabelEntities.indexOf(x);
+          const G = this.currentSegmentLabels[o];
+          if (G) {
+            this.entities.remove(G);
+            const d = this.tempLabelEntities.indexOf(G);
             d > -1 && this.tempLabelEntities.splice(d, 1);
           }
           this.currentSegmentLabels.splice(o, 1), o--;
@@ -355,28 +355,28 @@ class v {
       }
       if (this.tempPositions.length > 1) {
         let o = 0;
-        for (let G = 1; G < this.tempPositions.length; G++)
+        for (let x = 1; x < this.tempPositions.length; x++)
           o += n.Cartesian3.distance(
-            this.tempPositions[G - 1],
-            this.tempPositions[G]
+            this.tempPositions[x - 1],
+            this.tempPositions[x]
           );
         const c = this.tempPositions[this.tempPositions.length - 1], u = n.Cartographic.fromCartesian(c), b = n.Cartesian3.fromRadians(
           u.longitude,
           u.latitude,
           u.height || 0
         );
-        let x = b;
-        this.offsetHeight > 0 && (x = n.Cartesian3.fromRadians(
+        let G = b;
+        this.offsetHeight > 0 && (G = n.Cartesian3.fromRadians(
           u.longitude,
           u.latitude,
           (u.height || 0) + this.offsetHeight
         ));
         const l = `总长: ${this.formatDistance(o)}`, h = this.createTotalLengthBillboardImage(l);
         if (this.currentTotalLabel && this.currentTotalLabel.billboard)
-          this.currentTotalLabel.position = new n.ConstantPositionProperty(x), this.currentTotalLabel.billboard.image = new n.ConstantProperty(h), this.currentTotalLabel._groundPosition = b;
+          this.currentTotalLabel.position = new n.ConstantPositionProperty(G), this.currentTotalLabel.billboard.image = new n.ConstantProperty(h), this.currentTotalLabel._groundPosition = b;
         else {
-          const G = this.entities.add({
-            position: x,
+          const x = this.entities.add({
+            position: G,
             billboard: {
               image: h,
               pixelOffset: new n.ConstantProperty(new n.Cartesian2(0, -35)),
@@ -389,7 +389,7 @@ class v {
               disableDepthTestDistance: new n.ConstantProperty(Number.POSITIVE_INFINITY)
             }
           });
-          this.currentTotalLabel = G, this.currentTotalLabel._groundPosition = b, this.tempLabelEntities.push(G);
+          this.currentTotalLabel = x, this.currentTotalLabel._groundPosition = b, this.tempLabelEntities.push(x);
         }
       } else if (this.currentTotalLabel) {
         this.entities.remove(this.currentTotalLabel);
@@ -405,14 +405,14 @@ class v {
         return;
       const a = this.tempPositions.filter((o) => this.isValidCartesian3(o)), r = e && this.isValidCartesian3(e) && a.length >= 2 ? [...a, e] : a;
       if (r.length >= 3) {
-        const o = this.offsetHeight > 0 ? r.map((u) => {
-          const b = n.Cartographic.fromCartesian(u);
+        const o = r.map((u) => {
+          const b = n.Cartographic.fromCartesian(u), G = b.height || 0, d = this.offsetHeight > 0 ? this.offsetHeight : 0.1;
           return n.Cartesian3.fromRadians(
             b.longitude,
             b.latitude,
-            (b.height || 0) + this.offsetHeight
+            G + d
           );
-        }) : r, c = this.offsetHeight > 0 ? n.HeightReference.NONE : n.HeightReference.CLAMP_TO_GROUND;
+        }), c = n.HeightReference.NONE;
         this.currentPolygonEntity ? (this.currentPolygonEntity.polygon.hierarchy = new n.ConstantProperty(
           new n.PolygonHierarchy(o)
         ), this.currentPolygonEntity.polygon.heightReference = new n.ConstantProperty(c)) : (i = this.entities.add({
@@ -548,7 +548,7 @@ class v {
           r.latitude,
           (r.height || 0) + this.offsetHeight
         ));
-        const u = `面积: ${this.formatArea(s)}`, b = this.createTotalLengthBillboardImage(u), x = this.entities.add({
+        const u = `面积: ${this.formatArea(s)}`, b = this.createTotalLengthBillboardImage(u), G = this.entities.add({
           position: c,
           billboard: {
             image: b,
@@ -562,7 +562,7 @@ class v {
             disableDepthTestDistance: new n.ConstantProperty(Number.POSITIVE_INFINITY)
           }
         });
-        x._groundPosition = o, this.finishedLabelEntities.push(x);
+        G._groundPosition = o, this.finishedLabelEntities.push(G);
       }
     } else if (this.drawMode === "rectangle" && i.length >= 2) {
       const s = this.calculateRectangle(i[0], i[1]);
@@ -595,7 +595,7 @@ class v {
           r.latitude,
           this.offsetHeight
         ));
-        const u = `面积: ${this.formatArea(a)}`, b = this.createTotalLengthBillboardImage(u), x = this.entities.add({
+        const u = `面积: ${this.formatArea(a)}`, b = this.createTotalLengthBillboardImage(u), G = this.entities.add({
           position: c,
           billboard: {
             image: b,
@@ -609,7 +609,7 @@ class v {
             disableDepthTestDistance: new n.ConstantProperty(Number.POSITIVE_INFINITY)
           }
         });
-        x._groundPosition = o, this.finishedLabelEntities.push(x);
+        G._groundPosition = o, this.finishedLabelEntities.push(G);
       }
     }
     e && this.finishedEntities.push(e), this.tempLabelEntities.forEach((s) => {
@@ -1399,7 +1399,7 @@ class k {
    */
   setupDrawHelperCallbacks() {
     this.drawHelper.onDrawStart(() => {
-      console.log("开始绘制");
+      console.log("开始绘制"), this.measurementCallback?.onMeasurementStart && this.measurementCallback?.onMeasurementStart();
     }), this.drawHelper.onDrawEnd((e) => {
       if (e) {
         if (console.log("绘制完成", e), e.polyline) {
@@ -1720,7 +1720,7 @@ class k {
             });
             if (!h.ok)
               throw new Error(`HTTP error! status: ${h.status}`);
-            const G = await h.json(), g = (G?.data?.pois || G?.pois || []).map((w) => ({
+            const x = await h.json(), g = (x?.data?.pois || x?.pois || []).map((w) => ({
               name: w?.name || d,
               address: w?.address || "",
               longitude: Number(w?.lonlat?.split(",")[0] || 0),
@@ -1741,8 +1741,8 @@ class k {
         return;
       }
       o = setTimeout(() => {
-        const G = i.matches(":hover"), f = e.matches(":hover"), g = this.toolbarElement.matches(":hover"), w = document.activeElement === s;
-        !G && !f && !g && !w && (i.remove(), i.removeEventListener("mouseleave", c), i.removeEventListener("mouseenter", u), s.removeEventListener("blur", b));
+        const x = i.matches(":hover"), f = e.matches(":hover"), g = this.toolbarElement.matches(":hover"), w = document.activeElement === s;
+        !x && !f && !g && !w && (i.remove(), i.removeEventListener("mouseleave", c), i.removeEventListener("mouseenter", u), s.removeEventListener("blur", b));
       }, 150);
     }, u = () => {
       clearTimeout(o);
@@ -1751,10 +1751,10 @@ class k {
         const d = i.matches(":hover"), l = e.matches(":hover"), h = this.toolbarElement.matches(":hover");
         document.activeElement !== s && !d && !l && !h && (i.remove(), i.removeEventListener("mouseleave", c), i.removeEventListener("mouseenter", u), s.removeEventListener("blur", b));
       }, 200);
-    }, x = (d) => {
-      d.key === "Escape" && (i.remove(), i.removeEventListener("mouseleave", c), i.removeEventListener("mouseenter", u), s.removeEventListener("blur", b), document.removeEventListener("keydown", x));
+    }, G = (d) => {
+      d.key === "Escape" && (i.remove(), i.removeEventListener("mouseleave", c), i.removeEventListener("mouseenter", u), s.removeEventListener("blur", b), document.removeEventListener("keydown", G));
     };
-    i.addEventListener("mouseleave", c), i.addEventListener("mouseenter", u), s.addEventListener("blur", b), document.addEventListener("keydown", x), setTimeout(() => {
+    i.addEventListener("mouseleave", c), i.addEventListener("mouseenter", u), s.addEventListener("blur", b), document.addEventListener("keydown", G), setTimeout(() => {
       s.focus();
     }, 100);
   }
@@ -1881,25 +1881,25 @@ class k {
     let c = null;
     const u = i.getPickRay(o);
     if (u) {
-      const G = t.globe.pick(u, t);
-      n.defined(G) && (c = n.Cartographic.fromCartesian(G));
+      const x = t.globe.pick(u, t);
+      n.defined(x) && (c = n.Cartographic.fromCartesian(x));
     }
-    const b = i.positionCartographic.height, x = i.heading, d = i.pitch, l = i.roll;
+    const b = i.positionCartographic.height, G = i.heading, d = i.pitch, l = i.roll;
     t.mode = a;
     const h = this.drawHelper;
     if (h && typeof h.handleSceneModeChanged == "function" && h.handleSceneModeChanged(), c) {
-      const G = c.longitude, f = c.latitude;
+      const x = c.longitude, f = c.latitude;
       a === n.SceneMode.SCENE2D ? i.setView({
-        destination: n.Cartesian3.fromRadians(G, f, b),
+        destination: n.Cartesian3.fromRadians(x, f, b),
         orientation: {
           heading: 0,
           pitch: -Math.PI / 2,
           roll: 0
         }
       }) : i.setView({
-        destination: n.Cartesian3.fromRadians(G, f, b),
+        destination: n.Cartesian3.fromRadians(x, f, b),
         orientation: {
-          heading: x,
+          heading: G,
           pitch: d,
           roll: l
         }
@@ -1969,8 +1969,8 @@ class k {
         height: auto;
         display: block;
       `;
-      const G = document.createElement("div");
-      if (G.textContent = d.name, G.style.cssText = `
+      const x = document.createElement("div");
+      if (x.textContent = d.name, x.style.cssText = `
         font-size: 12px;
         color: #fff;
         padding: 4px 0;
@@ -1995,7 +1995,7 @@ class k {
           z-index: 10;
         `, l.appendChild(f);
       }
-      l.appendChild(h), l.appendChild(G), l.addEventListener("mouseenter", () => {
+      l.appendChild(h), l.appendChild(x), l.addEventListener("mouseenter", () => {
         l.style.transform = "scale(1.05)", l.style.boxShadow = "0 4px 12px rgba(0, 0, 0, 0.4)", l.style.borderColor = "#023C61", l.style.backgroundColor = "#023C61";
       }), l.addEventListener("mouseleave", () => {
         l.style.transform = "scale(1)", d.id !== this.currentMapType && (l.style.boxShadow = "none", l.style.borderColor = "transparent", l.style.backgroundColor = "transparent");
@@ -2032,17 +2032,17 @@ class k {
         cursor: pointer;
         transition: background-color 0.2s;
       `;
-      const h = document.createElement("div"), G = this.isNoFlyZoneChecked;
+      const h = document.createElement("div"), x = this.isNoFlyZoneChecked;
       h.style.cssText = `
         width: 18px;
         height: 18px;
         border: 2px solid rgba(255, 255, 255, 0.5);
         border-radius: 3px;
-        background: ${G ? "#023C61" : "transparent"};
+        background: ${x ? "#023C61" : "transparent"};
         display: flex;
         align-items: center;
         justify-content: center;
-      `, G && (h.innerHTML = "✓", h.style.color = "#ffffff", h.style.fontWeight = "bold", h.style.fontSize = "12px");
+      `, x && (h.innerHTML = "✓", h.style.color = "#ffffff", h.style.fontWeight = "bold", h.style.fontSize = "12px");
       const f = document.createElement("span");
       f.textContent = d.icon, f.style.cssText = `
         font-size: 12px;
@@ -2066,10 +2066,10 @@ class k {
         console.error("加载禁飞区失败:", d);
       });
     }, 100);
-    const x = () => {
+    const G = () => {
       s.remove();
     };
-    s.addEventListener("mouseleave", x);
+    s.addEventListener("mouseleave", G);
   }
   /**
    * 切换地图类型
@@ -2232,7 +2232,7 @@ class k {
               const b = s.map((d) => {
                 const l = n.Cartographic.fromCartesian(d);
                 return n.Cartesian3.fromRadians(l.longitude, l.latitude, u);
-              }), x = this.viewer.entities.add({
+              }), G = this.viewer.entities.add({
                 name: `${t.name}_top_outline`,
                 polyline: {
                   positions: b,
@@ -2241,7 +2241,7 @@ class k {
                   clampToGround: !1
                 }
               });
-              x.disableDepthTestDistance = Number.POSITIVE_INFINITY, this.noFlyZoneEntities.push(x);
+              G.disableDepthTestDistance = Number.POSITIVE_INFINITY, this.noFlyZoneEntities.push(G);
             }
           } catch {
           }