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

package/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 feat: 点线面 height 设置
 fix: openlayer getFromLonLat this 指向修复
+break: PointAggregation datas 改为数组对象
+fix: cesium flyTo height 计算
+feat: map.bussinesses onFrame 事件回调
 
 # @hzab/map-combine@0.4.1
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/map-combine",
-  "version": "0.4.2-alpha.1",
+  "version": "0.4.2-alpha.3",
   "description": "地图组件",
   "main": "src",
   "scripts": {

package/src/amap/AMapEvent.ts

@@ -1,54 +1,55 @@
-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 { 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");
+  });
+
+  viewer.on("dblclick", (e) => {
+    map.event.trigger("double-click");
+  });
+}

package/src/amap/AMapPoint.ts

@@ -1,143 +1,149 @@
-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";
+
+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");
+      }
+    },
+  };
+
+  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),
+      height: point.coordinates[2] ?? point.height,
+    });
+    viewer.off("click", eventMarker);
+  };
+
+  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();
+    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);
+  };
+}