@hzab/map-combine 0.4.2-alpha.3 → 0.4.2-alpha.4

package/src/amap/AMapPoint.ts

@@ -1,89 +1,76 @@
 import { Point } from "../basic/Point";
 import { AMap } from "./AMap";
 
-const RD = 0.017453292519943295;
-
 export function drawPoint(map: AMap, point: Point<unknown>) {
   const { viewer, event, LbsAMap } = map;
   let status = 0;
-  let marker = null;
-  const _event = {
-    onPointerIn() {
-      point.event.trigger("pointer-in");
-    },
-    onPointerOut() {
-      point.event.trigger("pointer-out");
-    },
-    onLClick() {
-      point.event.trigger("left-click");
-    },
-    onRClick(e) {
-      event.canvas = [e.pixel.x, e.pixel.y];
-      point.event.trigger("right-click");
-    },
-    onPointerDown() {
-      if (point.editable && status == 2) {
-        status = 3;
-        map.moveable = false;
-      }
-    },
-    onPointerUp() {
-      if (point.editable && status == 3) {
-        status = 2;
-        map.moveable = true;
-        point.coordinates = [event.geography[0], event.geography[1], point.coordinates[2] ?? point.height];
-        point.event.trigger("data-update");
-      }
+  let skip = 0;
+
+  const { size, center } = point;
+  const pointOffset = [-size[0] * center[0], -size[1] * center[1]];
+  const marker = new LbsAMap.Marker({
+    position: new LbsAMap.LngLat(0, 0),
+    height: point.height,
+    title: point._option.name,
+    icon: new LbsAMap.Icon({
+      image: point.src,
+      size: point.size,
+      imageSize: point.size,
+    }),
+    angle: point.rotation,
+    anchor: point.center,
+    draggable: point.editable,
+    extData: {
+      cursor: point.cursor,
+      silent: point.silent,
     },
-  };
+    offset: pointOffset,
+  });
+  setIcon();
+  viewer.add([marker]);
 
-  const bindEvent = (graphical) => {
-    graphical.on("click", _event.onLClick);
-    graphical.on("rightclick", _event.onRClick);
-    graphical.on("mouseover", _event.onPointerIn);
-    graphical.on("mouseout", _event.onPointerOut);
-  };
+  if (point.coordinates) {
+    status = 2;
+    marker.setPosition(point.coordinates);
+    if (point.show) {
+      marker.show();
+    } else {
+      marker.hide();
+    }
+  }
 
-  const darwMarker = (opt) => {
-    marker = new LbsAMap.Marker({
-      ...opt,
-      title: point._option.name,
-      icon: new LbsAMap.Icon({
-        image: point.src,
-        size: point.size,
-        imageSize: point.size,
-      }),
-      angle: point.rotation * RD,
-      anchor: point.center,
-      draggable: point.editable,
-      extData: {
-        cursor: point.cursor,
-        silent: point.silent,
-      },
-    });
-    bindEvent(marker);
-    viewer.add([marker]);
+  const onMouseMove = () => {
+    switch (status) {
+      case 0:
+        status = 1;
+        marker.setPosition(event.geography);
+        if (point.show) {
+          marker.show();
+        } else {
+          marker.hide();
+        }
+        break;
+      case 1:
+      case 3:
+        marker.setPosition(event.geography);
+        break;
+    }
   };
 
-  const eventMarker = (e) => {
-    darwMarker({
-      position: new LbsAMap.LngLat(e.lnglat.lng, e.lnglat.lat),
-      height: point.coordinates[2] ?? point.height,
-    });
-    viewer.off("click", eventMarker);
+  const onClick = () => {
+    if (status == 1) {
+      status = 2;
+      skip++;
+      point.coordinates = event.geography;
+      point.event.trigger("pointer-in");
+    }
   };
 
-  if (point.coordinates) {
-    darwMarker({
-      position: new LbsAMap.LngLat(point.coordinates[0], point.coordinates[1]),
-      height: point.coordinates[2] ?? point.height,
-    });
-  } else {
-    viewer.on("click", eventMarker);
-  }
-
   const onUpdate = (e: Set<string>) => {
-    const keys = new Set();
+    if (skip) {
+      skip--;
+      return;
+    }
     e.forEach((key) => {
       switch (key) {
         case "show":
@@ -110,40 +97,41 @@ export function drawPoint(map: AMap, point: Point<unknown>) {
           }
           break;
         case "src":
-          keys.add("icon");
+          setIcon();
           break;
         case "size":
-          keys.add("icon");
+          setIcon();
           break;
         case "center":
           marker.setAnchor(point.center);
           break;
         case "rotation":
-          marker.setAngle(point.rotation * RD);
+          marker.setAngle(point.rotation);
           break;
         default:
           throw new Error(`${key} 还不支持修改`);
       }
     });
-
-    keys.forEach((e) => {
-      switch (e) {
-        case "icon":
-          marker.setIcon(
-            new LbsAMap.Icon({
-              image: point.src,
-              size: point.size,
-              imageSize: point.size,
-            }),
-          );
-          break;
-      }
-    });
   };
 
+  function setIcon() {
+    marker.setIcon(
+      new LbsAMap.Icon({
+        image: point.src,
+        size: point.size,
+        imageSize: point.size,
+      }),
+    );
+  }
+
   const onDestroy = () => {
     marker.remove();
     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);
 }