v0.5.0

Kalvar · Aug 13, 2018 · 5960097 · 5960097
1 parent e4ad6d2
commit 5960097
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 14 deletions.
diff --git a/demo/js/bundle.js b/demo/js/bundle.js
@@ -1447,11 +1447,14 @@
    * @return {Number}
    */
   function nextPos(pos, resultEvents, processed, origIndex) {
+    var p, p1;
     var newPos = pos + 1;
     var length = resultEvents.length;
-    if (newPos > length - 1) { return pos - 1; }
-    var p  = resultEvents[pos].point;
-    var p1 = resultEvents[newPos].point;
+
+    p  = resultEvents[pos].point;
+
+    if (newPos < length)
+      { p1 = resultEvents[newPos].point; }
 
 
     // while in range and not the current one by value
@@ -1857,6 +1860,12 @@
     case 'fatal2':
       file = 'fatal2.geojson';
       break;
+    case 'fatal3':
+      file = 'fatal3.geojson';
+      break;
+    case 'fatal4':
+      file = 'fatal4.geojson';
+      break;
     case 'rectangles':
       file = 'rectangles.geojson';
       break;

diff --git a/demo/js/index.js b/demo/js/index.js
@@ -76,6 +76,12 @@ switch (mode) {
   case 'fatal2':
     file = 'fatal2.geojson';
     break;
+  case 'fatal3':
+    file = 'fatal3.geojson';
+    break;
+  case 'fatal4':
+    file = 'fatal4.geojson';
+    break;
   case 'rectangles':
     file = 'rectangles.geojson';
     break;

diff --git a/dist/martinez.min.js b/dist/martinez.min.js
diff --git a/dist/martinez.umd.js b/dist/martinez.umd.js
diff --git a/dist/martinez.umd.js.map b/dist/martinez.umd.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "martinez-polygon-clipping",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "description": "Martinez polygon clipping algorithm, does boolean operation on polygons (multipolygons, polygons with holes etc): intersection, union, difference, xor",
   "main": "dist/martinez.umd.js",
   "browser": "dist/martinez.umd.js",

diff --git a/test/fixtures/fatal3.geojson b/test/fixtures/fatal3.geojson
@@ -0,0 +1,7 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    { "type": "Feature", "properties": {}, "geometry": { "type": "Polygon", "coordinates": [[[180.60987101280907, 22.943242898435663], [280.6098710128091, 22.943242898435663], [280.6098710128091, 62.94324289843566], [180.60987101280907, 62.94324289843566], [180.60987101280907, 22.943242898435663]]] } },
+    { "type": "Feature", "properties": {}, "geometry": { "type": "Polygon", "coordinates": [[[-5.65625, 110.828125], [-7.53125, 202.234375], [366.0625, 202.234375], [356.6875, 65.828125], [260.125, 59.265625], [253.09375, 40.984375], [189.34375, 19.890625], [141.0625, 36.765625], [111.53125, 6.765625], [73.5625, 36.765625], [67.46875, 10.984375], [41.21875, 10.515625], [36.0625, 42.390625], [65.59375, 53.171875], [-5.65625, 110.828125]]] } }
+  ]
+}
diff --git a/test/fixtures/fatal4.geojson b/test/fixtures/fatal4.geojson
@@ -0,0 +1,6 @@
+{"type":"FeatureCollection",
+"features":[
+  {"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[3.846028904999335,7.51285572161238],[13.846028904999335,7.51285572161238],[13.846028904999335,11.512855721612379],[3.846028904999335,11.512855721612379],[3.846028904999335,7.51285572161238]]]}},
+  {"type":"Feature","properties":{},"geometry":{"type":"Polygon","coordinates":[[[-0.565625,11.0828125],[-0.753125,20.2234375],[36.60625,20.2234375],[35.66875,6.5828125],[26.0125,5.9265625],[25.309375,4.0984375],[18.934375,1.9890625],[14.10625,3.6765625],[11.153125,0.6765625],[7.35625,3.6765625],[6.746875,1.0984375],[4.121875,1.0515625],[3.60625,4.2390625],[6.559375,5.3171875],[-0.565625,11.0828125]]]}}
+  ]
+}