Fix a race condition in pass 1 (#121)

* fix a race condition in pass 1 * fix uglify
mapbox · Sep 17, 2019 · 005252c · 005252c
1 parent 0bcf062
commit 005252c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "test": "eslint src test/test.js && tape test/test.js",
     "watch": "mkdirp dist && watchify -v -d src/earcut.js -s earcut -o dist/earcut.dev.js",
     "build-dev": "mkdirp dist && browserify -d src/earcut.js -s earcut > dist/earcut.dev.js",
-    "build-min": "mkdirp dist && browserify src/earcut.js -s earcut | uglifyjs -c warnings=false -m > dist/earcut.min.js",
+    "build-min": "mkdirp dist && browserify src/earcut.js -s earcut | uglifyjs -c -m > dist/earcut.min.js",
     "prepare": "npm run build-dev && npm run build-min",
     "cov": "istanbul cover test/*.js",
     "coveralls": "istanbul cover test/*.js && coveralls < ./coverage/lcov.info"

diff --git a/src/earcut.js b/src/earcut.js
@@ -231,7 +231,7 @@ function cureLocalIntersections(start, triangles, dim) {
         p = p.next;
     } while (p !== start);
 
-    return p;
+    return filterPoints(p);
 }
 
 // try splitting polygon into two and triangulate them independently

diff --git a/test/expected.json b/test/expected.json
@@ -32,7 +32,8 @@
         "bad-diagonals": 7,
         "issue83": 0,
         "issue107": 0,
-        "issue111": 19
+        "issue111": 19,
+        "boxy": 56
     },
     "errors": {
         "dude": 2e-15,

diff --git a/test/fixtures/boxy.json b/test/fixtures/boxy.json
@@ -0,0 +1 @@
+[[[3432,2779],[3432,2794],[3450,2794],[3450,2825],[3413,2825],[3413,2856],[3395,2856],[3395,2871],[3377,2871],[3377,2856],[3359,2856],[3359,2840],[3341,2840],[3341,2871],[3322,2871],[3322,2887],[3249,2887],[3249,2871],[3268,2871],[3268,2840],[3304,2840],[3304,2825],[3322,2825],[3322,2810],[3304,2810],[3304,2794],[3322,2794],[3322,2779],[3341,2779],[3341,2733],[3359,2733],[3359,2687],[3395,2687],[3395,2702],[3432,2702],[3432,2717],[3450,2717],[3450,2733],[3486,2733],[3486,2748],[3468,2748],[3468,2763],[3450,2763],[3450,2779],[3432,2779]],[[3359,2794],[3341,2794],[3341,2810],[3395,2810],[3395,2794],[3377,2794],[3377,2779],[3359,2779],[3359,2794]],[[3432,2779],[3432,2748],[3413,2748],[3413,2779],[3432,2779]],[[3377,2779],[3395,2779],[3395,2748],[3377,2748],[3377,2779]],[[3377,2717],[3395,2717],[3395,2702],[3377,2702],[3377,2717]]]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[[[3432,2779],[3432,2794],[3450,2794],[3450,2825],[3413,2825],[3413,2856],[3395,2856],[3395,2871],[3377,2871],[3377,2856],[3359,2856],[3359,2840],[3341,2840],[3341,2871],[3322,2871],[3322,2887],[3249,2887],[3249,2871],[3268,2871],[3268,2840],[3304,2840],[3304,2825],[3322,2825],[3322,2810],[3304,2810],[3304,2794],[3322,2794],[3322,2779],[3341,2779],[3341,2733],[3359,2733],[3359,2687],[3395,2687],[3395,2702],[3432,2702],[3432,2717],[3450,2717],[3450,2733],[3486,2733],[3486,2748],[3468,2748],[3468,2763],[3450,2763],[3450,2779],[3432,2779]],[[3359,2794],[3341,2794],[3341,2810],[3395,2810],[3395,2794],[3377,2794],[3377,2779],[3359,2779],[3359,2794]],[[3432,2779],[3432,2748],[3413,2748],[3413,2779],[3432,2779]],[[3377,2779],[3395,2779],[3395,2748],[3377,2748],[3377,2779]],[[3377,2717],[3395,2717],[3395,2702],[3377,2702],[3377,2717]]]