@hzab/map-combine 0.4.0-alpha.0 → 0.4.2-alpha.0

package/src/cesium/CesiumPoint.ts

@@ -1,13 +1,15 @@
-
 import { Point } from "../basic/Point";
 import { CesiumMap } from "./CesiumMap";
 
+function geographyTcartesian3(e: number[]) {
+  return Cesium.Cartesian3.fromDegrees(e[0], e[1], e[2] ?? 3);
+}
 
 export function drawPoint(map: CesiumMap, point: Point<unknown>) {
-  const { markers, event } = map
-  const { size, center } = point
-  let status = 0
-  let skip = 0
+  const { markers, event } = map;
+  const { size, center } = point;
+  let status = 0;
+  let skip = 0;
   const shape = markers.add({
     show: false,
     position: Cesium.Cartesian3.ZERO,
@@ -20,118 +22,116 @@ export function drawPoint(map: CesiumMap, point: Point<unknown>) {
       cursor: point.cursor,
       silent: point.silent,
       onPointerIn() {
-        status == 2 && point.event.trigger('pointer-in')
+        status == 2 && point.event.trigger("pointer-in");
       },
       onPointerOut() {
-
-        status == 2 && point.event.trigger('pointer-out')
+        status == 2 && point.event.trigger("pointer-out");
       },
       onLClick() {
-        status == 2 && point.event.trigger('left-click')
+        status == 2 && point.event.trigger("left-click");
       },
       onRClick() {
-        status == 2 && point.event.trigger('right-click')
+        status == 2 && point.event.trigger("right-click");
       },
       onPointerDown() {
         if (point.editable && status == 2) {
-          status = 3
-          map.moveable = false
+          status = 3;
+          map.moveable = false;
         }
-
       },
       onPointerUp() {
         if (point.editable && status == 3) {
-          status = 2
-          map.moveable = true
+          status = 2;
+          map.moveable = true;
         }
-      }
-    }
-  })
+      },
+    },
+  });
 
   if (point.coordinates) {
-    status = 2
-    shape.position = Cesium.Cartesian3.fromDegrees(...point.coordinates)
-    shape.show = point.show
+    status = 2;
+    const p = point.coordinates;
+    shape.position = geographyTcartesian3(p);
+    shape.show = point.show;
   }
 
   const onMouseMove = () => {
     switch (status) {
       case 0:
-        status = 1
-        shape.position = Cesium.Cartesian3.fromDegrees(...event.geography)
-        shape.show = point.show
+        status = 1;
+        shape.position = geographyTcartesian3(event.geography);
+        shape.show = point.show;
         break;
       case 1:
       case 3:
-        shape.position = Cesium.Cartesian3.fromDegrees(...event.geography)
-        break
+        shape.position = geographyTcartesian3(event.geography);
+        break;
     }
-  }
+  };
 
   const onClick = () => {
     if (status == 1) {
-      status = 2
-      skip++
-      point.coordinates = event.geography
-      point.event.trigger('pointer-in')
+      status = 2;
+      skip++;
+      point.coordinates = event.geography;
+      point.event.trigger("pointer-in");
     }
-  }
+  };
 
   const onUpdate = (e: Set<string>) => {
     if (skip) {
-      skip--
-      return
+      skip--;
+      return;
     }
-    const { size, center } = point
-    e.forEach(key => {
+    const { size, center } = point;
+    e.forEach((key) => {
       switch (key) {
-        case 'show':
-          shape.show = point.show
+        case "show":
+          shape.show = point.show;
           break;
-        case 'editable':
+        case "editable":
           break;
-        case 'coordinates':
+        case "coordinates":
           if (point.coordinates) {
-            shape.position = Cesium.Cartesian3.fromDegrees(...point.coordinates)
-            shape.show = point.show
+            const p = point.coordinates;
+            shape.position = geographyTcartesian3(p);
+            shape.show = point.show;
             status = 2;
           } else {
-            shape.show = false
-            status = 0
+            shape.show = false;
+            status = 0;
           }
 
           break;
-        case 'src':
-          shape.image = point.src
+        case "src":
+          shape.image = point.src;
           break;
-        case 'size':
-          shape.width = point.size[0]
-          shape.height = point.size[1]
+        case "size":
+          shape.width = point.size[0];
+          shape.height = point.size[1];
           break;
-        case 'center':
-          shape.pixelOffset = new Cesium.Cartesian2(-size[0] * (center[0] - 0.5), -size[1] * (center[1] - 0.5))
+        case "center":
+          shape.pixelOffset = new Cesium.Cartesian2(-size[0] * (center[0] - 0.5), -size[1] * (center[1] - 0.5));
           break;
-        case 'rotation':
-          shape.rotation = Cesium.Math.toRadians(point.rotation)
+        case "rotation":
+          shape.rotation = Cesium.Math.toRadians(point.rotation);
           break;
         default:
-          throw new Error(`${key} 还不支持修改`)
+          throw new Error(`${key} 还不支持修改`);
       }
-    })
-  }
+    });
+  };
 
   const onDestroy = () => {
-    markers.remove(shape)
-    event.off('pointer-move', onMouseMove)
-    event.off('left-click', onClick)
-    point.event.off('update', onUpdate)
-    point.event.off('destroy', onDestroy)
-
-  }
-
-  event.on('pointer-move', onMouseMove)
-  event.on('left-click', onClick)
-  point.event.on('update', onUpdate)
-  point.event.on('destroy', onDestroy)
+    markers.remove(shape);
+    event.off("pointer-move", onMouseMove);
+    event.off("left-click", onClick);
+    point.event.off("update", onUpdate);
+    point.event.off("destroy", onDestroy);
+  };
 
-}
+  event.on("pointer-move", onMouseMove);
+  event.on("left-click", onClick);
+  point.event.on("update", onUpdate);
+  point.event.on("destroy", onDestroy);
+}