Merge branch 'master' into fix-overlapping-edges-#35

mfogel · Jan 28, 2018 · 864c33d · 864c33d
2 parents ef808d5 + 4dd24ed
commit 864c33d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/segment_intersection.js b/src/segment_intersection.js
@@ -94,7 +94,15 @@ module.exports = function (a1, a2, b1, b2, noEndpointTouch) {
       // not on line segment b
       return null;
     }
-    return noEndpointTouch ? null : [toPoint(a1, s, va)];
+    if (s === 0 || s === 1) {
+      // on an endpoint of line segment a
+      return noEndpointTouch ? null : [toPoint(a1, s, va)];
+    }
+    if (t === 0 || t === 1) {
+      // on an endpoint of line segment b
+      return noEndpointTouch ? null : [toPoint(b1, t, vb)];
+    }
+    return [toPoint(a1, s, va)];
   }
 
   // If we've reached this point, then the lines are either parallel or the

diff --git a/test/edge_cases.test.js b/test/edge_cases.test.js
@@ -141,7 +141,7 @@ tap.test('Edge cases', function(main) {
         subject.geometry.coordinates,
         clipping.geometry.coordinates
       );
-      t.deepEqual(result, [[[[-1883,-8.5],[-1783,-8.5],[-1783,-3],[-1783,-2.999999999999999],[-1883,-3],[-1883,-8.5]]]]);
+      t.deepEqual(result, [[[[-1883,-8.5],[-1783,-8.5],[-1783,-3],[-1883,-3],[-1883,-8.5]]]]);
 
       t.end();
     });
@@ -151,7 +151,7 @@ tap.test('Edge cases', function(main) {
         subject.geometry.coordinates,
         clipping.geometry.coordinates
       );
-      t.deepEqual(result, [[[[-1883,-25],[-1783,-25],[-1783,-8.5],[-1783,-3],[-1783,-2.999999999999999],[-1783,75],[-1883,75],[-1883,-3],[-1883,-8.5],[-1883,-25]]]]);
+      t.deepEqual(result, [[[[-1883,-25],[-1783,-25],[-1783,-8.5],[-1783,-3],[-1783,75],[-1883,75],[-1883,-3],[-1883,-8.5],[-1883,-25]]]]);
 
       t.end();
     });

diff --git a/test/segment_intersection.test.js b/test/segment_intersection.test.js
@@ -7,6 +7,7 @@ tap.test('intersection', function (t) {
 
   t.strictSame(intersection([0, 0], [1, 1], [1, 0], [2, 2]), null, 'null if no intersections');
   t.strictSame(intersection([0, 0], [1, 1], [1, 0], [10, 2]), null, 'null if no intersections');
+  t.strictSame(intersection([2, 2], [3, 3], [0, 6], [2, 4]), null, 'null if no intersections');
 
   t.strictSame(intersection([0, 0], [1, 1], [1, 0], [0, 1]), [[0.5, 0.5]], '1 intersection');
   t.strictSame(intersection([0, 0], [1, 1], [0, 1], [0, 0]), [[0, 0]], 'shared point 1');
@@ -36,5 +37,7 @@ tap.test('intersection', function (t) {
   t.strictSame(intersection([0, 0], [1, 1], [0, 0], [1, 1], true), null, 'full overlap, skip touches');
   t.strictSame(intersection([1, 1], [0, 0], [0, 0], [1, 1], true), null, 'full overlap, orientation, skip touches');
 
+  t.strictSame(intersection([0, 0], [1, 1], [1, 0], [0, 1], true), [[0.5, 0.5]], '1 intersection, skip touches');
+
   t.end();
 });