@hzab/map-combine 0.3.1-alpha.1 → 0.4.1

package/src/amap/AMapEvent.ts

@@ -1,49 +1,54 @@
-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();
-
-  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 { 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");
+  });
+}

package/src/amap/AMapPolygon.ts

@@ -1,195 +1,195 @@
-import { AMap } from "./AMap";
-import { Polygon } from "../basic/Polygon";
-
-export function drawPolygon(map: AMap, polygon: Polygon<unknown>) {
-  const { event, viewer, LbsAMap } = map;
-
-  let status = 0;
-  let skip = 0;
-  let target = null;
-  let aMapPolygonEditor = null;
-
-  const _event = {
-    cursor: polygon.cursor,
-    silent: polygon.silent,
-    onPointerIn() {
-      status == 2 && polygon.event.trigger("pointer-in");
-    },
-    onPointerOut() {
-      status == 2 && polygon.event.trigger("pointer-out");
-    },
-    onLClick() {
-      status == 2 && polygon.event.trigger("left-click");
-    },
-    onRClick(e) {
-      event.canvas = [e.pixel.x, e.pixel.y];
-      if (polygon.menu) {
-        map.menu.show(polygon.menu);
-      }
-      status == 2 && polygon.event.trigger("right-click");
-    },
-    onDbClick() {
-      polygon.editable &&
-        status == 2 &&
-        setTimeout(() => {
-          aMapPolygonEditor.setTarget(target);
-          aMapPolygonEditor.open();
-          polygon.event.trigger("start-edit");
-        });
-    },
-  };
-
-  const bindEvent = (graphical) => {
-    graphical.on("click", _event.onLClick);
-    graphical.on("rightclick", _event.onRClick);
-    graphical.on("dblclick", _event.onDbClick);
-    graphical.on("mouseover", _event.onPointerIn);
-    graphical.on("mouseout", _event.onPointerOut);
-  };
-
-  aMapPolygonEditor = new LbsAMap.PolygonEditor(viewer, undefined, {
-    createOptions: {
-      strokeColor: polygon.stroke,
-      strokeWeight: polygon.lineWidth,
-      fillOpacity: 0.4,
-      fillColor: polygon.fill,
-      strokeStyle: polygon.dash ? "dashed" : "solid",
-      strokeDasharray: [10, 10],
-    },
-    editOptions: {
-      strokeColor: polygon.stroke,
-      strokeWeight: polygon.lineWidth,
-      fillOpacity: 0.4,
-      fillColor: polygon.fill,
-      strokeStyle: polygon.dash ? "dashed" : "solid",
-      strokeDasharray: [10, 10],
-    },
-  });
-
-  aMapPolygonEditor.on("add", (e) => {
-    status = 3;
-    target = e.target;
-    bindEvent(target);
-    // polygon.event.trigger("data-loaded");
-  });
-  if (polygon.coordinates) {
-    status = 2;
-    target = new LbsAMap.Polygon({
-      path: polygon.coordinates,
-      strokeColor: polygon.stroke,
-      strokeWeight: polygon.lineWidth,
-      fillOpacity: 0.4,
-      fillColor: polygon.fill,
-      strokeStyle: polygon.dash ? "dashed" : "solid",
-      strokeDasharray: [10, 10],
-    });
-    viewer.add(target);
-    bindEvent(target);
-  } else {
-    aMapPolygonEditor.close();
-    aMapPolygonEditor.setTarget();
-    aMapPolygonEditor.open();
-  }
-  const onUpdate = (e: Set<string>) => {
-    if (skip) {
-      skip--;
-      return;
-    }
-
-    e.forEach((key) => {
-      switch (key) {
-        case "show":
-          if (polygon.show) {
-            target.show();
-          } else {
-            target.hide();
-          }
-          break;
-        case "editable":
-          break;
-        case "coordinates":
-          if (polygon.coordinates) {
-            target.setPath(polygon.coordinates);
-            target.setzIndex(polygon.coordinates[2]);
-            target.show();
-            status = 2;
-          } else {
-            target.hide();
-            status = 0;
-          }
-          break;
-
-        case "lineWidth":
-          target.setOptions({
-            strokeWeight: polygon.lineWidth,
-          });
-          break;
-        case "fill":
-          target.setOptions({
-            fillColor: polygon.fill,
-          });
-          break;
-        case "stroke":
-          target.setOptions({
-            strokeColor: polygon.stroke,
-          });
-          break;
-        case "dash":
-          target.setOptions({
-            strokeStyle: polygon.dash ? "dashed" : "solid",
-          });
-          break;
-        default:
-          throw new Error(`${key} 还不支持修改`);
-      }
-    });
-  };
-  const onDbClick = () => {
-    switch (status) {
-      case 1:
-        status = 2;
-        skip++;
-        polygon.coordinates = target.getPath().map((item) => [item.lng, item.lat]);
-        polygon.event.trigger("data-loaded");
-        polygon.event.trigger("pointer-in");
-        break;
-      case 3:
-        polygon.event.trigger("stop-edit");
-        aMapPolygonEditor.setTarget();
-        aMapPolygonEditor.close();
-        break;
-    }
-  };
-  const onStartEdit = () => {
-    switch (status) {
-      case 2:
-        status = 3;
-        break;
-    }
-  };
-
-  const onStopEdit = () => {
-    if (status == 3) {
-      status = 2;
-      skip++;
-      polygon.coordinates = target.getPath().map((item) => [item.lng, item.lat]);
-    }
-  };
-
-  const onDestroy = () => {
-    viewer.remove(target);
-    aMapPolygonEditor.close();
-    aMapPolygonEditor.setTarget();
-    event.off("double-click", onDbClick);
-    polygon.event.off("update", onUpdate);
-    polygon.event.off("start-edit", onStartEdit);
-    polygon.event.off("stop-edit", onStopEdit);
-    polygon.event.off("destroy", onDestroy);
-  };
-
-  event.on("double-click", onDbClick);
-  polygon.event.on("update", onUpdate);
-  polygon.event.on("start-edit", onStartEdit);
-  polygon.event.on("stop-edit", onStopEdit);
-  polygon.event.on("destroy", onDestroy);
-}
+import { AMap } from "./AMap";
+import { Polygon } from "../basic/Polygon";
+
+export function drawPolygon(map: AMap, polygon: Polygon<unknown>) {
+  const { event, viewer, LbsAMap } = map;
+
+  let status = 0;
+  let skip = 0;
+  let target = null;
+  let aMapPolygonEditor = null;
+
+  const _event = {
+    cursor: polygon.cursor,
+    silent: polygon.silent,
+    onPointerIn() {
+      status == 2 && polygon.event.trigger("pointer-in");
+    },
+    onPointerOut() {
+      status == 2 && polygon.event.trigger("pointer-out");
+    },
+    onLClick() {
+      status == 2 && polygon.event.trigger("left-click");
+    },
+    onRClick(e) {
+      event.canvas = [e.pixel.x, e.pixel.y];
+      if (polygon.menu) {
+        map.menu.show(polygon.menu);
+      }
+      status == 2 && polygon.event.trigger("right-click");
+    },
+    onDbClick() {
+      polygon.editable &&
+        status == 2 &&
+        setTimeout(() => {
+          aMapPolygonEditor.setTarget(target);
+          aMapPolygonEditor.open();
+          polygon.event.trigger("start-edit");
+        });
+    },
+  };
+
+  const bindEvent = (graphical) => {
+    graphical.on("click", _event.onLClick);
+    graphical.on("rightclick", _event.onRClick);
+    graphical.on("dblclick", _event.onDbClick);
+    graphical.on("mouseover", _event.onPointerIn);
+    graphical.on("mouseout", _event.onPointerOut);
+  };
+
+  aMapPolygonEditor = new LbsAMap.PolygonEditor(viewer, undefined, {
+    createOptions: {
+      strokeColor: polygon.stroke,
+      strokeWeight: polygon.lineWidth,
+      fillOpacity: 0.4,
+      fillColor: polygon.fill,
+      strokeStyle: polygon.dash ? "dashed" : "solid",
+      strokeDasharray: [10, 10],
+    },
+    editOptions: {
+      strokeColor: polygon.stroke,
+      strokeWeight: polygon.lineWidth,
+      fillOpacity: 0.4,
+      fillColor: polygon.fill,
+      strokeStyle: polygon.dash ? "dashed" : "solid",
+      strokeDasharray: [10, 10],
+    },
+  });
+
+  aMapPolygonEditor.on("add", (e) => {
+    status = 3;
+    target = e.target;
+    bindEvent(target);
+    // polygon.event.trigger("data-loaded");
+  });
+  if (polygon.coordinates) {
+    status = 2;
+    target = new LbsAMap.Polygon({
+      path: polygon.coordinates,
+      strokeColor: polygon.stroke,
+      strokeWeight: polygon.lineWidth,
+      fillOpacity: 0.4,
+      fillColor: polygon.fill,
+      strokeStyle: polygon.dash ? "dashed" : "solid",
+      strokeDasharray: [10, 10],
+    });
+    viewer.add(target);
+    bindEvent(target);
+  } else {
+    aMapPolygonEditor.close();
+    aMapPolygonEditor.setTarget();
+    aMapPolygonEditor.open();
+  }
+  const onUpdate = (e: Set<string>) => {
+    if (skip) {
+      skip--;
+      return;
+    }
+
+    e.forEach((key) => {
+      switch (key) {
+        case "show":
+          if (polygon.show) {
+            target.show();
+          } else {
+            target.hide();
+          }
+          break;
+        case "editable":
+          break;
+        case "coordinates":
+          if (polygon.coordinates) {
+            target.setPath(polygon.coordinates);
+            target.setzIndex(polygon.coordinates[2]);
+            target.show();
+            status = 2;
+          } else {
+            target.hide();
+            status = 0;
+          }
+          break;
+
+        case "lineWidth":
+          target.setOptions({
+            strokeWeight: polygon.lineWidth,
+          });
+          break;
+        case "fill":
+          target.setOptions({
+            fillColor: polygon.fill,
+          });
+          break;
+        case "stroke":
+          target.setOptions({
+            strokeColor: polygon.stroke,
+          });
+          break;
+        case "dash":
+          target.setOptions({
+            strokeStyle: polygon.dash ? "dashed" : "solid",
+          });
+          break;
+        default:
+          throw new Error(`${key} 还不支持修改`);
+      }
+    });
+  };
+  const onDbClick = () => {
+    switch (status) {
+      case 1:
+        status = 2;
+        skip++;
+        polygon.coordinates = target.getPath().map((item) => [item.lng, item.lat]);
+        polygon.event.trigger("data-loaded");
+        polygon.event.trigger("pointer-in");
+        break;
+      case 3:
+        polygon.event.trigger("stop-edit");
+        aMapPolygonEditor.setTarget();
+        aMapPolygonEditor.close();
+        break;
+    }
+  };
+  const onStartEdit = () => {
+    switch (status) {
+      case 2:
+        status = 3;
+        break;
+    }
+  };
+
+  const onStopEdit = () => {
+    if (status == 3) {
+      status = 2;
+      skip++;
+      polygon.coordinates = target.getPath().map((item) => [item.lng, item.lat]);
+    }
+  };
+
+  const onDestroy = () => {
+    viewer.remove(target);
+    aMapPolygonEditor.close();
+    aMapPolygonEditor.setTarget();
+    event.off("double-click", onDbClick);
+    polygon.event.off("update", onUpdate);
+    polygon.event.off("start-edit", onStartEdit);
+    polygon.event.off("stop-edit", onStopEdit);
+    polygon.event.off("destroy", onDestroy);
+  };
+
+  event.on("double-click", onDbClick);
+  polygon.event.on("update", onUpdate);
+  polygon.event.on("start-edit", onStartEdit);
+  polygon.event.on("stop-edit", onStopEdit);
+  polygon.event.on("destroy", onDestroy);
+}