@hzab/map-combine 0.3.0-beta → 1.0.0-alpha.0

package/src/amap/AMapPolyline.ts

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

package/src/basic/MapCombine.ts

@@ -28,6 +28,8 @@ export abstract class MapCombine {
   abstract get zoom(): number;
   abstract set zoom(val);
 
+  loadPromise: Promise<this> = Promise.resolve(this);
+
   bussinesses = new Map<string, BasicBusiness<BasicBusinessOption>>();
 
   /** 地图是否存在 */