fix(map): fix roam after projection

ywengineer · Jan 10, 2022 · d9ba7c2 · d9ba7c2
1 parent eb515b3
commit d9ba7c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/action/roamHelper.ts b/src/action/roamHelper.ts
@@ -48,7 +48,9 @@ export function updateCenterAndZoom(
     const center = view.getCenter();
     let zoom = payload.zoom;
 
-    const point = view.dataToPoint(center);
+    const point = (view as Geo).projectedToPoint
+        ? (view as Geo).projectedToPoint(center)
+        : view.dataToPoint(center);
 
     if (payload.dx != null && payload.dy != null) {
         point[0] -= payload.dx;

diff --git a/src/coord/geo/Geo.ts b/src/coord/geo/Geo.ts
@@ -198,17 +198,17 @@ class Geo extends View {
         }
         if (data) {
             const projection = this.projection;
-            return super.dataToPoint(
-                projection ? projection.project(data) : data,
-                noRoam, out
-            );
+            if (projection) {
+                data = projection.project(data);
+            }
+            return this.projectedToPoint(data);
         }
     }
 
     pointToData(point: number[]) {
         const projection = this.projection;
         if (projection) {
-            point = projection.project(point);
+            point = projection.unproject(point);
         }
         return this.pointToProjected(point);
     }
@@ -220,6 +220,10 @@ class Geo extends View {
         return super.pointToData(point);
     }
 
+    projectedToPoint(projected: number[], noRoam?: boolean, out?: number[]) {
+        return super.dataToPoint(projected, noRoam, out);
+    }
+
     convertToPixel(ecModel: GlobalModel, finder: ParsedModelFinder, value: number[]): number[] {
         const coordSys = getCoordSys(finder);
         return coordSys === this ? coordSys.dataToPoint(value) : null;