fix another edge case with touching holes (#125)

closes #56
mapbox · Sep 19, 2019 · 62d3834 · 62d3834
1 parent 4768bd9
commit 62d3834
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/earcut.js b/src/earcut.js
@@ -359,10 +359,7 @@ function findHoleBridge(hole, outerNode) {
 
 // whether sector in vertex m contains sector in vertex p in the same coordinates
 function sectorContainsSector(m, p) {
-    return (
-        (area(m.prev, m, p.prev) < 0 || area(p.prev, m, m.next) < 0) &&
-        (area(m.prev, m, p.next) < 0 || area(p.next, m, m.next) < 0)
-    );
+    return area(m.prev, m, p.prev) < 0 && area(p.next, m, m.next) < 0;
 }
 
 // interlink polygon nodes in z-order

diff --git a/test/expected.json b/test/expected.json
@@ -39,6 +39,7 @@
         "hourglass": 2,
         "touching2": 8,
         "touching3": 15,
+        "touching4": 20,
         "rain": 2681
     },
     "errors": {

diff --git a/test/fixtures/touching4.json b/test/fixtures/touching4.json
@@ -0,0 +1 @@
+[[[11,10],[0,10],[0,0],[11,0]],[[7,6],[7,9],[10,9]],[[7,5],[10,2],[10,5]],[[6,9],[1,4],[1,9]],[[1,1],[1,4],[4,1]]]
diff --git a/viz/viz.js b/viz/viz.js