fix(san-key): 贝塞尔曲线的方向不对 (#3023)

antvis · Nov 20, 2020 · 0210319 · 0210319
1 parent fcf024e
commit 0210319
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/src/geometry/shape/edge/util.ts b/src/geometry/shape/edge/util.ts
@@ -9,24 +9,12 @@ import { Point } from '../../../interface';
  * @returns
  */
 export function getCPath(from: Point, to: Point) {
-  const points = [];
-  points.push({
-    x: from.x,
-    y: (from.y * 1) / 2 + (to.y * 1) / 2,
-  });
-
-  points.push({
-    x: to.x,
-    y: (from.y * 1) / 2 + (to.y * 1) / 2,
-  });
-  points.push(to);
-
-  const sub = ['C'];
-  each(points, (point) => {
-    sub.push(point.x, point.y);
-  });
-
-  return sub;
+  return [
+    'C',
+    (from.x * 1) / 2 + (to.x * 1) / 2, from.y,
+    (from.x * 1) / 2 + (to.x * 1) / 2, to.y,
+    to.x, to.y,
+  ];
 }
 
 /**

diff --git a/tests/unit/geometry/shape/util/c-path-spec.ts b/tests/unit/geometry/shape/util/c-path-spec.ts
@@ -0,0 +1,10 @@
+import { getCPath } from '../../../../../src/geometry/shape/edge/util';
+
+describe('getCPath', () => {
+  test('getCPath', () => {
+    expect(getCPath({ x: 10, y: 10 }, { x: 100, y: 100 })).toEqual(['C', 55, 10 ,55, 100, 100, 100]);
+    expect(getCPath({ x: 10, y: 100 }, { x: 100, y: 10 })).toEqual(['C', 55, 100 ,55, 10, 100, 10]);
+    expect(getCPath({ x: 100, y: 100 }, { x: 10, y: 10 })).toEqual(['C', 55, 100 ,55, 10, 10, 10]);
+    expect(getCPath({ x: 100, y: 10 }, { x: 10, y: 100 })).toEqual(['C', 55, 10 ,55, 100, 10, 100]);
+  });
+});