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

package/src/amap/AMapEvent.ts

@@ -1,54 +1,110 @@
-import { AMap } from "./AMap";
-
-/**
- * 高德地图事件
- * 高德地图 元素事件由各自元素处理
- * @param map
- */
-export function bindEvent(map: AMap) {
-  const { event, viewer, container } = map;
-
-  const frame = () => {
-    if (map.isAlive) {
-      requestAnimationFrame(frame);
-      event.trigger("view-preRender");
-    }
-  };
-  frame();
-
-  viewer.on("moveend", (e) => {
-    event.trigger("view-moveEnd");
-    event.trigger("view-change");
-  });
-
-  container.addEventListener("mousedown", (e) => {
-    event.trigger("pointer-down");
-  });
-
-  container.addEventListener("mouseup", (e) => {
-    event.trigger("pointer-up");
-  });
-
-  // 解决 ReactPoint 点击事件无法触发的问题
-  container.addEventListener("click", (e) => {
-    event.trigger("left-click");
-  });
-
-  viewer.on("mousemove", (e) => {
-    event.trigger("pointer-move");
-    event.canvas = [e.pixel.x, e.pixel.y];
-    event.geography = [e.lnglat.lng, e.lnglat.lat];
-  });
-
-  viewer.on("mapmove", () => {
-    event.trigger("view-change");
-  });
-
-  viewer.on("click", (e) => {
-    event.trigger("left-click");
-  });
-
-  viewer.on("dblclick", (e) => {
-    map.event.trigger("double-click");
-  });
-}
+import { pointToLineDistance } from "@turf/turf";
+
+import { AMap } from "./AMap";
+
+/**
+ * 高德地图事件
+ * 高德地图 元素事件由各自元素处理
+ * @param map
+ */
+export function bindEvent(map: AMap) {
+  const { event, viewer, container } = map;
+
+  const frame = () => {
+    if (map.isAlive) {
+      requestAnimationFrame(frame);
+      event.trigger("view-preRender");
+      map.bussinesses.forEach((e) => e.show && e.onFrame?.());
+    }
+  };
+  frame();
+
+  viewer.on("moveend", (e) => {
+    event.trigger("view-moveEnd");
+    event.trigger("view-change");
+  });
+
+  container.addEventListener("mousedown", (e) => {
+    event.trigger("pointer-down");
+  });
+
+  container.addEventListener("mouseup", (e) => {
+    event.trigger("pointer-up");
+  });
+
+  // 解决 ReactPoint 点击事件无法触发的问题
+  container.addEventListener("click", (e) => {
+    event.trigger("left-click");
+  });
+
+  viewer.on("mousemove", (e) => {
+    event.trigger("pointer-move");
+    event.canvas = [e.pixel.x, e.pixel.y];
+    event.geography = [e.lnglat.lng, e.lnglat.lat];
+  });
+
+  viewer.on("mapmove", () => {
+    event.trigger("view-change");
+  });
+
+  viewer.on("click", (e) => {
+    event.trigger("left-click");
+
+    // "drill-pick" 获取点击位置的元素
+    const clickPosition = e.lnglat;
+    const position = [clickPosition.lng, clickPosition.lat];
+    const allOverlays = viewer.getAllOverlays(); // 获取所有覆盖物
+    const pickedObjects = [];
+
+    // 遍历所有覆盖物，检查点击位置是否在覆盖物内
+    allOverlays.forEach((overlay) => {
+      // 判断是否为多边形
+      if (overlay instanceof map.LbsAMap.Polygon) {
+        // 使用 contains 方法判断点是否在多边形内
+        if (overlay.contains(clickPosition)) {
+          pickedObjects.push(overlay);
+        }
+      }
+      // 判断是否为折线
+      else if (overlay instanceof map.LbsAMap.Polyline) {
+        // 使用点线距离计算
+        const path = overlay.getPath();
+        const coords = path.map((p) => [p.getLng(), p.getLat()]);
+        const distance = pointToLineDistance(position, coords, { units: "meters" });
+
+        // 获取当前地图的分辨率（米/像素） 每像素代表多少米
+        const resolution = viewer.getResolution();
+        // 计算线宽对应的地理距离（单边）
+        const halfWidthInMeters = (overlay.getOptions().strokeWeight / 2) * resolution;
+
+        // 根据距离判断是否点击
+        if (distance < halfWidthInMeters + 2) {
+          pickedObjects.push(overlay);
+        }
+      }
+      // 判断是否为 Marker
+      else if (overlay instanceof map.LbsAMap.Marker) {
+        const position = overlay.getPosition();
+        const distance = map.LbsAMap.GeometryUtil.distance(position, clickPosition);
+        if (distance < 20) {
+          // 点击位置距离 Marker 小于 20 像素
+          pickedObjects.push(overlay);
+        }
+      }
+    });
+
+    // 按 zIndex 从高到低排序
+    pickedObjects.sort((a, b) => (b.getzIndex?.() || 0) - (a.getzIndex?.() || 0));
+
+    event.trigger("drill-pick", {
+      event: e,
+      pickedTargets: pickedObjects.map((it) => it.getOptions()?.extData?.target),
+      sourceObjects: pickedObjects,
+      position: position,
+    });
+  });
+
+  viewer.on("dblclick", (e) => {
+    map.event.trigger("double-click");
+  });
+}

package/src/amap/AMapPoint.ts

@@ -1,143 +1,140 @@
-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.height];
-        point.event.trigger("data-update");
-      }
-    },
-  };
-
-  const bindEvent = (graphical) => {
-    graphical.on("click", _event.onLClick);
-    graphical.on("rightclick", _event.onRClick);
-    graphical.on("mouseover", _event.onPointerIn);
-    graphical.on("mouseout", _event.onPointerOut);
-  };
-
-  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 eventMarker = (e) => {
-    darwMarker({ position: new LbsAMap.LngLat(e.lnglat.lng, e.lnglat.lat) });
-    viewer.off("click", eventMarker);
-  };
-
-  if (point.coordinates) {
-    darwMarker({ position: new LbsAMap.LngLat(...point.coordinates) });
-  } else {
-    viewer.on("click", eventMarker);
-  }
-
-  const onUpdate = (e: Set<string>) => {
-    const keys = new Set();
-    e.forEach((key) => {
-      switch (key) {
-        case "show":
-          if (status) {
-            if (point.show) {
-              marker.show();
-            } else {
-              marker.hide();
-            }
-          }
-          break;
-        case "editable":
-          marker.setDraggable(point.editable);
-          break;
-        case "coordinates":
-          if (point.coordinates) {
-            marker.setPosition(point.coordinates);
-            marker.setzIndex(point.coordinates[2]);
-            marker.show();
-            status = 2;
-          } else {
-            marker.hide();
-            status = 0;
-          }
-          break;
-        case "src":
-          keys.add("icon");
-          break;
-        case "size":
-          keys.add("icon");
-          break;
-        case "center":
-          marker.setAnchor(point.center);
-          break;
-        case "rotation":
-          marker.setAngle(point.rotation * RD);
-          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;
-      }
-    });
-  };
-
-  const onDestroy = () => {
-    marker.remove();
-    point.event.off("update", onUpdate);
-    point.event.off("destroy", onDestroy);
-  };
-}
+import { Point } from "../basic/Point";
+import { AMap } from "./AMap";
+
+export function drawPoint(map: AMap, point: Point<unknown>) {
+  const { viewer, event, LbsAMap } = map;
+  let status = 0;
+  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,
+    bubble: true,
+    extData: {
+      userdata: point.userdata,
+      cursor: point.cursor,
+      silent: point.silent,
+      target: point,
+    },
+    offset: pointOffset,
+  });
+  setIcon();
+  viewer.add([marker]);
+
+  if (point.coordinates) {
+    status = 2;
+    marker.setPosition(point.coordinates);
+    if (point.show) {
+      marker.show();
+    } else {
+      marker.hide();
+    }
+  }
+
+  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 onClick = () => {
+    if (status == 1) {
+      status = 2;
+      skip++;
+      point.coordinates = event.geography;
+      point.event.trigger("pointer-in");
+    }
+  };
+
+  const onUpdate = (e: Set<string>) => {
+    if (skip) {
+      skip--;
+      return;
+    }
+    e.forEach((key) => {
+      switch (key) {
+        case "show":
+          if (status) {
+            if (point.show) {
+              marker.show();
+            } else {
+              marker.hide();
+            }
+          }
+          break;
+        case "editable":
+          marker.setDraggable(point.editable);
+          break;
+        case "coordinates":
+          if (point.coordinates) {
+            marker.setPosition(point.coordinates);
+            marker.setzIndex(point.coordinates[2]);
+            marker.show();
+            status = 2;
+          } else {
+            marker.hide();
+            status = 0;
+          }
+          break;
+        case "src":
+          setIcon();
+          break;
+        case "size":
+          setIcon();
+          break;
+        case "center":
+          marker.setAnchor(point.center);
+          break;
+        case "rotation":
+          marker.setAngle(point.rotation);
+          break;
+        default:
+          throw new Error(`${key} 还不支持修改`);
+      }
+    });
+  };
+
+  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);
+}