fix: 无地图与 MapLibre 模式移动 Marker 出错 (#2509)

* fix: marker 拖动报错 * chore: add changeset
antvis · May 29, 2024 · aca779d · aca779d
1 parent 9060f49
commit aca779d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.changeset/five-singers-rush.md b/.changeset/five-singers-rush.md
@@ -0,0 +1,5 @@
+---
+'@antv/l7-component': patch
+---
+
+fix: 无地图与 MapLibre 模式移动 Marker 出错
diff --git a/examples/demos/components/marker.ts b/examples/demos/components/marker.ts
@@ -20,7 +20,10 @@ export const marker: TestCase = async (options) => {
       continue;
     }
 
-    const markerIns = new Marker().setLnglat({ lng: nodes[i].x * 1, lat: nodes[i].y });
+    const markerIns = new Marker({ draggable: true }).setLnglat({
+      lng: Number(nodes[i].x * 1),
+      lat: Number(nodes[i].y),
+    });
     scene.addMarker(markerIns);
   }
 

diff --git a/packages/component/src/control/mouseLocation.ts b/packages/component/src/control/mouseLocation.ts
@@ -39,6 +39,7 @@ export default class MouseLocation extends Control<IMouseLocationControlOption>
   }
   protected onMouseMove = (e: any) => {
     let position: Position = this.location;
+    // 适配不同底图，事件返回的数据名称不一致
     const lngLat: ILngLat | undefined = e.lngLat || e.lnglat;
     const { transform } = this.controlOption;
     if (lngLat) {

diff --git a/packages/component/src/marker.ts b/packages/component/src/marker.ts
@@ -295,14 +295,16 @@ export default class Marker extends EventEmitter {
   };
 
   private onMarkerDragMove = (e: any) => {
+    // 适配不同底图，事件返回的数据名称不一致
+    const lngLat: ILngLat = e.lngLat || e.lnglat;
     const { lng: preLng, lat: preLat } = this.preLngLat;
-    const { lng: curLng, lat: curLat } = e.lnglat;
+    const { lng: curLng, lat: curLat } = lngLat;
     const newLngLat = {
       lng: this.lngLat.lng + curLng - preLng,
       lat: this.lngLat.lat + curLat - preLat,
     };
     this.setLnglat(newLngLat);
-    this.preLngLat = e.lnglat;
+    this.preLngLat = lngLat;
     this.emit('dragging', newLngLat);
   };