cesium-pocket 0.3.0-alpha → 0.3.1-alpha

package/{CircleDrawer-1f9OEOcZ.js → CircleDrawer-DbOS8_ZI.js}

@@ -1,4 +1,4 @@
-import { CustomDataSource as C, Cartesian3 as r, JulianDate as I, defined as l, ConstantPositionProperty as E, HeightReference as P, Color as u, EntityCollection as B, ScreenSpaceEventType as c, ScreenSpaceEventHandler as w, VerticalOrigin as R, PolylineDashMaterialProperty as M, CallbackProperty as A, PolygonHierarchy as m, Cartographic as y, Transforms as S, Matrix4 as g, EllipsoidGeodesic as k } from "cesium";
+import { CustomDataSource as C, Cartesian3 as r, JulianDate as I, defined as l, ConstantPositionProperty as E, HeightReference as S, Color as u, EntityCollection as B, ScreenSpaceEventType as c, ScreenSpaceEventHandler as w, VerticalOrigin as R, PolylineDashMaterialProperty as M, CallbackProperty as A, PolygonHierarchy as P, Cartographic as y, Transforms as b, Matrix4 as g, EllipsoidGeodesic as k } from "cesium";
 import { toRaw as d } from "vue";
 const h = {
   STOPED: Symbol("STOPED"),
@@ -139,7 +139,7 @@ class L extends G {
       color: u.TRANSPARENT,
       outlineColor: u.YELLOW,
       outlineWidth: 2,
-      heightReference: P.CLAMP_TO_GROUND
+      heightReference: S.CLAMP_TO_GROUND
       //贴地
     }, this.dataSource.entities.add({
       position: e,
@@ -163,22 +163,22 @@ class L extends G {
     });
   }
 }
-class F extends L {
+class T extends L {
   constructor(e, i = null) {
     super(e), this.handler = null, this.pointCollection = new B(), this.billboardCallbackFun = this.addBillboardCallback, this.point_L_ClickEvent = () => {
       var t;
       (t = this.handler) == null || t.setInputAction((a) => {
         if (h.DRAWABLE == super.getStatus()) {
-          let n = this.viewer.camera.getPickRay(a.position), s = this.viewer.scene.globe.pick(n, this.viewer.scene);
-          if (l(s)) {
-            let v = this.billboardCallbackFun(s);
-            this.mainData.push(s), this.pointCollection.add(v);
+          let s = this.viewer.camera.getPickRay(a.position), n = this.viewer.scene.globe.pick(s, this.viewer.scene);
+          if (l(n)) {
+            let v = this.billboardCallbackFun(n);
+            this.mainData.push(n), this.pointCollection.add(v);
           }
         } else if (h.DELETABLE == super.getStatus()) {
-          const n = this.viewer.scene.pick(a.position);
-          if (l(n) && l(n.id)) {
-            const s = d(n.id);
-            this.pointCollection.contains(s) && p.DEL_ENABLED == super.getDelStatus() && this.deleteBillboard(s);
+          const s = this.viewer.scene.pick(a.position);
+          if (l(s) && l(s.id)) {
+            const n = d(s.id);
+            this.pointCollection.contains(n) && p.DEL_ENABLED == super.getDelStatus() && this.deleteBillboard(n);
           }
         }
       }, c.LEFT_CLICK);
@@ -189,32 +189,35 @@ class F extends L {
       }, c.LEFT_DOWN);
     }, this.point_L_UpEvent = () => {
       var t;
-      (t = this.handler) == null || t.setInputAction(() => {
-        o.DRAGING == super.getEditStatus() && (this.editDragUnable(), this.currentDragPoint = null, this.viewer.scene.screenSpaceCameraController.enableRotate = !0);
+      (t = this.handler) == null || t.setInputAction((a) => {
+        if (o.DRAGING == super.getEditStatus()) {
+          const s = this.viewer.scene.pickPosition(a.endPosition);
+          l(s) && this.editCallbackFun && this.editCallbackFun(s), this.editDragUnable(), this.currentDragPoint = null, this.viewer.scene.screenSpaceCameraController.enableRotate = !0;
+        }
       }, c.LEFT_UP);
     }, this.point_moveEvent = () => {
       var t;
       (t = this.handler) == null || t.setInputAction((a) => {
         if (h.EDITABLE == super.getStatus())
           if (o.DRAG_UNABLED == super.getEditStatus()) {
-            const n = this.viewer.scene.pick(a.endPosition);
-            if (l(n) && l(n.id) && this.pointCollection.contains(d(n.id))) {
-              let s = d(n.id);
-              this.currentDragPoint = s, this.editDragEnable();
+            const s = this.viewer.scene.pick(a.endPosition);
+            if (l(s) && l(s.id) && this.pointCollection.contains(d(s.id))) {
+              let n = d(s.id);
+              this.currentDragPoint = n, this.editDragEnable();
             }
           } else if (o.DRAGING == super.getEditStatus()) {
-            const n = this.viewer.scene.pickPosition(a.endPosition);
-            l(n) && this.currentDragPoint && (this.currentDragPoint.position = new E(n));
+            const s = this.viewer.scene.pickPosition(a.endPosition);
+            l(s) && this.currentDragPoint && (this.currentDragPoint.position = new E(s));
           } else
             this.editDragUnable();
         else if (h.DELETABLE == super.getStatus())
           if (p.DEL_UNABLED == super.getDelStatus()) {
-            const n = this.viewer.scene.pick(a.endPosition);
-            l(n) && l(n.id) && this.pointCollection.contains(d(n.id)) && this.delEnable();
+            const s = this.viewer.scene.pick(a.endPosition);
+            l(s) && l(s.id) && this.pointCollection.contains(d(s.id)) && this.delEnable();
           } else
             this.delUnable();
       }, c.MOUSE_MOVE);
-    }, i && (i.billboardCallbackFun && (this.billboardCallbackFun = i.billboardCallbackFun), i.delCallbackFun && (this.delCallbackFun = i.delCallbackFun));
+    }, i && (this.billboardCallbackFun = i.billboardCallbackFun ? i.billboardCallbackFun : this.addBillboardCallback, this.delCallbackFun = i.delCallbackFun ? i.delCallbackFun : this.delCallback, i.editCallbackFun && (this.editCallbackFun = i.editCallbackFun));
   }
   start() {
     super.drawableStatus(), this.handler || (this.handler = new w(this.viewer.scene.canvas)), this.point_L_ClickEvent(), this.point_L_DownEvent(), this.point_L_UpEvent(), this.point_moveEvent();
@@ -243,7 +246,7 @@ class F extends L {
         // 可选项：缩放倍数
         scale: 1,
         verticalOrigin: R.BOTTOM,
-        heightReference: P.CLAMP_TO_GROUND
+        heightReference: S.CLAMP_TO_GROUND
         //贴地
       },
       show: !0
@@ -267,13 +270,13 @@ class O extends L {
       var t;
       (t = this.handler) == null || t.setInputAction((a) => {
         if (h.DRAWABLE == super.getStatus()) {
-          let n = this.viewer.camera.getPickRay(a.position), s = this.viewer.scene.globe.pick(n, this.viewer.scene);
-          l(s) && (this.addPoint(s), this.mainData.push(s), this.mainData.length > 0 && (this.mainLineEntity || this.createMainLine(), this.dashLineEntity || this.createDashline(), this.mainData.length > 2 && this.drawerMode === f.POLYGON && !this.mainPolygonEntity && this.createMainPolygon()));
+          let s = this.viewer.camera.getPickRay(a.position), n = this.viewer.scene.globe.pick(s, this.viewer.scene);
+          l(n) && (this.addPoint(n), this.mainData.push(n), this.mainData.length > 0 && (this.mainLineEntity || this.createMainLine(), this.dashLineEntity || this.createDashline(), this.mainData.length > 2 && this.drawerMode === f.POLYGON && !this.mainPolygonEntity && this.createMainPolygon()));
         } else if (h.DELETABLE == super.getStatus()) {
-          const n = this.viewer.scene.pick(a.position);
-          if (l(n) && l(n.id)) {
-            const s = d(n.id);
-            this.dataSource.entities.contains(s) && p.DEL_ENABLED == super.getDelStatus() && this.deletePoint(s);
+          const s = this.viewer.scene.pick(a.position);
+          if (l(s) && l(s.id)) {
+            const n = d(s.id);
+            this.dataSource.entities.contains(n) && p.DEL_ENABLED == super.getDelStatus() && this.deletePoint(n);
           }
         }
       }, c.LEFT_CLICK);
@@ -290,10 +293,10 @@ class O extends L {
     }, this.line_moveEvent = () => {
       var t;
       (t = this.handler) == null || t.setInputAction((a) => {
-        const n = this.viewer.camera.getPickRay(a.endPosition);
-        if (n) {
-          const s = this.viewer.scene.globe.pick(n, this.viewer.scene);
-          l(s) && (h.DRAWABLE == super.getStatus() ? this.dashEndData = s : h.EDITABLE == super.getStatus() ? (this.dashLineEntity.show = !1, this.editMoveFun(a, s)) : h.DELETABLE == super.getStatus() && (this.dashLineEntity.show = !1, this.deleteMoveFun(a)));
+        const s = this.viewer.camera.getPickRay(a.endPosition);
+        if (s) {
+          const n = this.viewer.scene.globe.pick(s, this.viewer.scene);
+          l(n) && (h.DRAWABLE == super.getStatus() ? this.dashEndData = n : h.EDITABLE == super.getStatus() ? (this.dashLineEntity.show = !1, this.editMoveFun(a, n)) : h.DELETABLE == super.getStatus() && (this.dashLineEntity.show = !1, this.deleteMoveFun(a)));
         }
       }, c.MOUSE_MOVE);
     }, this.createDashline = () => {
@@ -311,8 +314,8 @@ class O extends L {
         show: !0,
         clampToGround: !0
       }, t.positions = new A(() => {
-        let a = this.mainData.length, n = this.mainData[a - 1];
-        return n || (n = this.mainData[a - 2]), this.dashEndData || console.log("发生错误了dashEndData"), [n, this.dashEndData];
+        let a = this.mainData.length, s = this.mainData[a - 1];
+        return s || (s = this.mainData[a - 2]), this.dashEndData || console.log("发生错误了dashEndData"), [s, this.dashEndData];
       }, !1), this.dashLineEntity = this.viewer.entities.add({
         polyline: t,
         properties: {
@@ -359,7 +362,7 @@ class O extends L {
       hierarchy: [new r(), new r(), new r()],
       material: u.RED.withAlpha(0.4),
       outline: !1
-    }, e.hierarchy = new A(() => new m(this.mainData), !1), this.mainPolygonEntity = this.viewer.entities.add({
+    }, e.hierarchy = new A(() => new P(this.mainData), !1), this.mainPolygonEntity = this.viewer.entities.add({
       polygon: e,
       properties: {
         entityType: "POLYGON"
@@ -374,8 +377,8 @@ class x extends L {
       var t;
       (t = this.handler) == null || t.setInputAction((a) => {
         if (h.DRAWABLE == super.getStatus()) {
-          let n = this.viewer.camera.getPickRay(a.position), s = this.viewer.scene.globe.pick(n, this.viewer.scene);
-          l(s) && (this.mainData.length === 0 ? (this.addPoint(s), this.firstPoint = s, this.mainData.push(s), this.createLine(), this.createPolygon()) : (this.addPoint(s), this.endPoint = s, this.stopStatus()));
+          let s = this.viewer.camera.getPickRay(a.position), n = this.viewer.scene.globe.pick(s, this.viewer.scene);
+          l(n) && (this.mainData.length === 0 ? (this.addPoint(n), this.firstPoint = n, this.mainData.push(n), this.createLine(), this.createPolygon()) : (this.addPoint(n), this.endPoint = n, this.stopStatus()));
         }
       }, c.LEFT_CLICK);
     }, this.rect_L_DownEvent = () => {
@@ -391,10 +394,10 @@ class x extends L {
     }, this.rect_moveEvent = () => {
       var t;
       (t = this.handler) == null || t.setInputAction((a) => {
-        const n = this.viewer.camera.getPickRay(a.endPosition);
-        if (n) {
-          const s = this.viewer.scene.globe.pick(n, this.viewer.scene);
-          l(s) && (h.DRAWABLE == super.getStatus() ? this.firstPoint && (this.endPoint = s, this.initMainData()) : h.EDITABLE == super.getStatus() && this.rectMove(a, s));
+        const s = this.viewer.camera.getPickRay(a.endPosition);
+        if (s) {
+          const n = this.viewer.scene.globe.pick(s, this.viewer.scene);
+          l(n) && (h.DRAWABLE == super.getStatus() ? this.firstPoint && (this.endPoint = n, this.initMainData()) : h.EDITABLE == super.getStatus() && this.rectMove(a, n));
         }
       }, c.MOUSE_MOVE);
     }, i && (this.point = i.point, this.polyline = i.polyline, this.polygon = i.polygon);
@@ -419,8 +422,8 @@ class x extends L {
   }
   initMainData() {
     if (this.firstPoint && this.endPoint) {
-      const e = y.fromCartesian(this.firstPoint), i = e.longitude, t = e.latitude, a = y.fromCartesian(this.endPoint), n = a.longitude, s = a.latitude, v = r.fromRadians(i, s), b = r.fromRadians(n, t);
-      this.mainData[0] = this.firstPoint, this.mainData[1] = v, this.mainData[2] = this.endPoint, this.mainData[3] = b;
+      const e = y.fromCartesian(this.firstPoint), i = e.longitude, t = e.latitude, a = y.fromCartesian(this.endPoint), s = a.longitude, n = a.latitude, v = r.fromRadians(i, n), m = r.fromRadians(s, t);
+      this.mainData[0] = this.firstPoint, this.mainData[1] = v, this.mainData[2] = this.endPoint, this.mainData[3] = m;
     }
   }
   //创建主线数据
@@ -449,7 +452,7 @@ class x extends L {
       hierarchy: [new r(), new r(), new r()],
       material: u.RED.withAlpha(0.4),
       outline: !1
-    }, e.hierarchy = new A(() => new m(this.mainData), !1), this.polygonEntity = this.viewer.entities.add({
+    }, e.hierarchy = new A(() => new P(this.mainData), !1), this.polygonEntity = this.viewer.entities.add({
       polygon: e,
       properties: {
         entityType: "POLYGON"
@@ -464,8 +467,8 @@ class Q extends L {
       var t;
       (t = this.handler) == null || t.setInputAction((a) => {
         if (h.DRAWABLE == super.getStatus()) {
-          let n = this.viewer.camera.getPickRay(a.position), s = this.viewer.scene.globe.pick(n, this.viewer.scene);
-          l(s) && (this.mainData.length === 0 ? (this.addPoint(s), this.mainData.push(s), this.firstPoint = s, this.createCircle()) : (this.endPoint = s, this.mainData.push(s), this.endPointEntity = this.addPoint(s), this.getAngle(), this.stopStatus()));
+          let s = this.viewer.camera.getPickRay(a.position), n = this.viewer.scene.globe.pick(s, this.viewer.scene);
+          l(n) && (this.mainData.length === 0 ? (this.addPoint(n), this.mainData.push(n), this.firstPoint = n, this.createCircle()) : (this.endPoint = n, this.mainData.push(n), this.endPointEntity = this.addPoint(n), this.getAngle(), this.stopStatus()));
         }
       }, c.LEFT_CLICK);
     }, this.circle_L_DownEvent = () => {
@@ -481,10 +484,10 @@ class Q extends L {
     }, this.circle_moveEvent = () => {
       var t;
       (t = this.handler) == null || t.setInputAction((a) => {
-        const n = this.viewer.camera.getPickRay(a.endPosition);
-        if (n) {
-          const s = this.viewer.scene.globe.pick(n, this.viewer.scene);
-          l(s) && (h.DRAWABLE == super.getStatus() ? this.mainData.length > 0 && (this.endPoint = s, this.countDistance()) : h.EDITABLE == super.getStatus() && this.circleMove(a, s));
+        const s = this.viewer.camera.getPickRay(a.endPosition);
+        if (s) {
+          const n = this.viewer.scene.globe.pick(s, this.viewer.scene);
+          l(n) && (h.DRAWABLE == super.getStatus() ? this.mainData.length > 0 && (this.endPoint = n, this.countDistance()) : h.EDITABLE == super.getStatus() && this.circleMove(a, n));
         }
       }, c.MOUSE_MOVE);
     }, i && (this.point = i.point, this.ellipse = i.ellipse);
@@ -499,7 +502,7 @@ class Q extends L {
     this.clearAllData(), this.firstPoint = new r(), this.endPoint = new r(), this.handler && (this.handler = null), this.ellipseEntity && this.viewer.entities.removeById(this.ellipseEntity.id);
   }
   getAngle() {
-    const e = S.eastNorthUpToFixedFrame(this.firstPoint.clone()), i = g.inverse(e, new g()), t = g.multiplyByPoint(i, this.endPoint.clone(), new r());
+    const e = b.eastNorthUpToFixedFrame(this.firstPoint.clone()), i = g.inverse(e, new g()), t = g.multiplyByPoint(i, this.endPoint.clone(), new r());
     this.angle = Math.atan2(t.x, t.y);
   }
   circleMove(e, i) {
@@ -517,7 +520,7 @@ class Q extends L {
       this.distance * Math.cos(this.angle),
       0
       // 保持水平，如果希望保持高度则设为 localEdge.z
-    ), i = S.eastNorthUpToFixedFrame(this.firstPoint), t = g.multiplyByPointAsVector(i, e, new r());
+    ), i = b.eastNorthUpToFixedFrame(this.firstPoint), t = g.multiplyByPointAsVector(i, e, new r());
     this.endPoint = r.add(this.firstPoint, t, new r());
   }
   countDistance() {
@@ -555,7 +558,7 @@ class Q extends L {
 export {
   O as C,
   h as D,
-  F as P,
+  T as P,
   x as R,
   Q as a,
   f as b

package/drawer.js

@@ -1,4 +1,4 @@
-import { C as D, a as e, b as s, D as R, P as w, R as o } from "./CircleDrawer-1f9OEOcZ.js";
+import { C as D, a as e, b as s, D as R, P as w, R as o } from "./CircleDrawer-DbOS8_ZI.js";
 export {
   D as CP2dDrawer,
   e as CircleDrawer,

package/index.js

@@ -3,7 +3,7 @@ import * as PA from "three";
 import { TrianglesDrawMode as tP, TriangleFanDrawMode as EA, TriangleStripDrawMode as SA, Loader as sP, LoaderUtils as F, FileLoader as qA, Color as S, LinearSRGBColorSpace as H, SpotLight as BP, PointLight as rP, DirectionalLight as vP, MeshBasicMaterial as W, SRGBColorSpace as R, MeshPhysicalMaterial as y, Vector2 as VA, Matrix4 as tA, Vector3 as K, Quaternion as hA, InstancedMesh as gP, InstancedBufferAttribute as CP, Object3D as JA, TextureLoader as DP, ImageBitmapLoader as wP, BufferAttribute as BA, InterleavedBuffer as QP, InterleavedBufferAttribute as cP, LinearMipmapLinearFilter as YA, NearestMipmapLinearFilter as IP, LinearMipmapNearestFilter as EP, NearestMipmapNearestFilter as zP, LinearFilter as zA, NearestFilter as NA, RepeatWrapping as TA, MirroredRepeatWrapping as TP, ClampToEdgeWrapping as lP, PointsMaterial as oP, Material as rA, LineBasicMaterial as aP, MeshStandardMaterial as KA, DoubleSide as MP, PropertyBinding as uP, BufferGeometry as pP, SkinnedMesh as bP, Mesh as iP, LineSegments as fP, Line as UP, LineLoop as yP, Points as dP, Group as vA, PerspectiveCamera as jP, MathUtils as HP, OrthographicCamera as mP, Skeleton as kP, AnimationClip as LP, Bone as OP, InterpolateDiscrete as SP, InterpolateLinear as XA, ColorManagement as MA, Texture as uA, VectorKeyframeTrack as pA, NumberKeyframeTrack as bA, QuaternionKeyframeTrack as iA, FrontSide as qP, Interpolant as VP, Box3 as hP, Sphere as JP } from "three";
 import { Viewer as h, Math as _, Cartesian2 as eA, Cartesian3 as L, Cartographic as ZA, SceneTransforms as YP, Ray as NP, Color as KP, ScreenSpaceEventType as gA, ScreenSpaceEventHandler as XP, createWorldTerrainAsync as ZP, EllipsoidTerrainProvider as GP, WebMapTileServiceImageryProvider as Y, Credit as N } from "cesium";
 import { P as G, a as fA, b as xP, c as WP, d as FP, C as UA } from "./index-CcaLwHv1.js";
-import { C as Mn, a as un, b as pn, D as bn, P as fn, R as Un } from "./CircleDrawer-1f9OEOcZ.js";
+import { C as Mn, a as un, b as pn, D as bn, P as fn, R as Un } from "./CircleDrawer-DbOS8_ZI.js";
 function yA(D, A) {
   if (A === tP)
     return console.warn("THREE.BufferGeometryUtils.toTrianglesDrawMode(): Geometry already defined as triangles."), D;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cesium-pocket",
-  "version": "0.3.0-alpha",
+  "version": "0.3.1-alpha",
   "description": "cesium的插件库；基于vue3的开发",
   "module": "./index.js",
   "types": "./index.d.ts",

package/src/drawer/PointDrawer.d.ts

@@ -1,14 +1,17 @@
 import { Cartesian3, Viewer, Entity } from 'cesium';
 import { DataCenter, DelCallbackFn } from './DataCenter.ts';
+export type EditCallbackFn = (cartesian: Cartesian3) => void;
 export type EntityCallbackFn = (cartesian: Cartesian3) => Entity;
 export type PointOptions = {
     billboardCallbackFun?: EntityCallbackFn;
+    editCallbackFun?: EditCallbackFn;
     delCallbackFun?: DelCallbackFn;
 } | null;
 export declare class PointDrawer extends DataCenter {
     private handler;
     private pointCollection;
     private billboardCallbackFun;
+    private editCallbackFun;
     constructor(viewer: Viewer, options?: PointOptions);
     start(): void;
     getEntity(): EntityCollection;