fix(core): 修复 polyline 与多边形节点的交点不正确的问题

didi · Nov 7, 2024 · 9b1a4ab · 9b1a4ab
1 parent ae8bb8c
commit 9b1a4ab
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 27 deletions.
diff --git a/packages/core/__tests__/algorithm/egde.test.ts b/packages/core/__tests__/algorithm/egde.test.ts
@@ -1,4 +1,4 @@
-import { getCrossPointOfLine, isInSegment } from '../../src/algorithm/edge';
+import { getCrossPointOfLine, isInSegment } from '../../src/algorithm/edge'
 
 describe('algorithm/edge', () => {
   // one intersection
@@ -12,7 +12,7 @@ describe('algorithm/edge', () => {
         x: 10,
         y: 10,
       },
-    ];
+    ]
     const line2 = [
       {
         x: 10,
@@ -22,11 +22,11 @@ describe('algorithm/edge', () => {
         x: 0,
         y: 10,
       },
-    ];
+    ]
     expect(
       getCrossPointOfLine(line1[0], line1[1], line2[0], line2[1]),
-    ).toBeTruthy();
-  });
+    ).toBeTruthy()
+  })
   // multiple intersection
   test('multiple intersection', () => {
     const line1 = [
@@ -38,7 +38,7 @@ describe('algorithm/edge', () => {
         x: 10,
         y: 10,
       },
-    ];
+    ]
     const line2 = [
       {
         x: 0,
@@ -48,11 +48,11 @@ describe('algorithm/edge', () => {
         x: 10,
         y: 10,
       },
-    ];
+    ]
     expect(
       getCrossPointOfLine(line1[0], line1[1], line2[0], line2[1]),
-    ).toBeFalsy();
-  });
+    ).toBeFalsy()
+  })
   // no intersection
   test('intersection', () => {
     const line1 = [
@@ -64,7 +64,7 @@ describe('algorithm/edge', () => {
         x: 10,
         y: 10,
       },
-    ];
+    ]
     const line2 = [
       {
         x: 10,
@@ -74,18 +74,18 @@ describe('algorithm/edge', () => {
         x: 20,
         y: 10,
       },
-    ];
+    ]
     expect(
       getCrossPointOfLine(line1[0], line1[1], line2[0], line2[1]),
-    ).toBeFalsy();
-  });
+    ).toBeFalsy()
+  })
 
   test('in segment', () => {
     const point = {
       x: 0,
       y: 0,
-    };
-    const line = [
+    }
+    const line1 = [
       {
         x: -10,
         y: -10,
@@ -94,15 +94,28 @@ describe('algorithm/edge', () => {
         x: 10,
         y: 10,
       },
-    ];
-    expect(isInSegment(point, line[0], line[1])).toBeTruthy();
-  });
+    ]
+    const line2 = [
+      {
+        x: -10,
+        y: 10,
+      },
+      {
+        x: 10,
+        y: -10,
+      },
+    ]
+    expect(isInSegment(point, line1[0], line2[1])).toBeTruthy()
+    expect(isInSegment(point, line1[1], line2[0])).toBeTruthy()
+    expect(isInSegment(point, line2[0], line1[1])).toBeTruthy()
+    expect(isInSegment(point, line2[1], line1[0])).toBeTruthy()
+  })
   // not in segment
   test('not in segment', () => {
     const point = {
       x: 10,
       y: 0,
-    };
+    }
     const line = [
       {
         x: -10,
@@ -112,7 +125,7 @@ describe('algorithm/edge', () => {
         x: 10,
         y: 10,
       },
-    ];
-    expect(isInSegment(point, line[0], line[1])).toBeFalsy();
-  });
-});
+    ]
+    expect(isInSegment(point, line[0], line[1])).toBeFalsy()
+  })
+})
diff --git a/packages/core/src/algorithm/edge.ts b/packages/core/src/algorithm/edge.ts
@@ -60,10 +60,8 @@ export const isInSegment = (point: Point, start: Point, end: Point) => {
   const k = (endY - startY) / (endX - startX)
   const b = startY - k * startX
   return (
-    x >= startX &&
-    x <= endX &&
-    y >= startY &&
-    y <= endY &&
+    ((x >= startX && x <= endX) || (x <= startX && x >= endX)) &&
+    ((y >= startY && y <= endY) || (y <= startY && y >= endY)) &&
     Math.abs(y - k * x + b) < Number.EPSILON
   )
 }