Add option to return false instead of throwing for unsupported geomet…

…ries.
dpmcmlxxvi · May 19, 2019 · 8f1fdea · 8f1fdea
1 parent 5e1df4e
commit 8f1fdea
Show file tree

Hide file tree

Showing 91 changed files with 89 additions and 38 deletions.
diff --git a/lib/de9im.esm.js b/lib/de9im.esm.js
diff --git a/lib/de9im.esm.js.map b/lib/de9im.esm.js.map
diff --git a/lib/de9im.umd.js b/lib/de9im.umd.js
diff --git a/lib/de9im.umd.js.map b/lib/de9im.umd.js.map
diff --git a/src/contains/index.js b/src/contains/index.js
@@ -5,9 +5,11 @@ import within from '../within';
  * @description Check if geojson #1 contains geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if contained otherwise false.
  */
-const contains = (geojson1, geojson2) => {
+const contains = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -20,7 +22,10 @@ const contains = (geojson1, geojson2) => {
     case 'Polygon-Polygon':
       return within(geojson2, geojson1);
     default:
-      throw new Error(`${type1} contains ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} contains ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/src/coveredby/index.js b/src/coveredby/index.js
@@ -7,9 +7,11 @@ import util from '../util';
  * @description Check if geojson #1 is coveredby geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if coveredby otherwise false.
  */
-const coveredby = (geojson1, geojson2) => {
+const coveredby = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -27,7 +29,10 @@ const coveredby = (geojson1, geojson2) => {
     case 'Polygon-Polygon':
       return polygon.coveredbyPolygon(geojson1, geojson2);
     default:
-      throw new Error(`${type1} coveredby ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} coveredby ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/src/covers/index.js b/src/covers/index.js
@@ -5,9 +5,11 @@ import util from '../util';
  * @description Check if geojson #1 covers geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if covers otherwise false.
  */
-const covers = (geojson1, geojson2) => {
+const covers = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -20,7 +22,10 @@ const covers = (geojson1, geojson2) => {
     case 'Polygon-Polygon':
       return coveredby(geojson2, geojson1);
     default:
-      throw new Error(`${type1} covers ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} covers ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/src/crosses/index.js b/src/crosses/index.js
@@ -7,9 +7,11 @@ import util from '../util';
  * @description Check if geojson #1 crosses geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if crosses otherwise false.
  */
-const crosses = (geojson1, geojson2) => {
+const crosses = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -29,7 +31,10 @@ const crosses = (geojson1, geojson2) => {
     case 'Polygon-Point':
       return polygon.crossesPoint(geojson1, geojson2);
     default:
-      throw new Error(`${type1} crosses ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} crosses ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/src/disjoint/index.js b/src/disjoint/index.js
@@ -5,9 +5,11 @@ import util from '../util';
  * @description Check if geojson #1 is disjoint geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if disjoint otherwise false.
  */
-const disjoint = (geojson1, geojson2) => {
+const disjoint = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -23,7 +25,10 @@ const disjoint = (geojson1, geojson2) => {
     case 'Polygon-Polygon':
       return intersects(geojson1, geojson2) === false;
     default:
-      throw new Error(`${type1} disjoint ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} disjoint ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/src/equals/index.js b/src/equals/index.js
@@ -6,9 +6,11 @@ import within from '../within';
  * @description Check if geojson #1 equals geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if equals otherwise false.
  */
-const equals = (geojson1, geojson2) => {
+const equals = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -18,7 +20,10 @@ const equals = (geojson1, geojson2) => {
     case 'Polygon-Polygon':
       return within(geojson1, geojson2) && contains(geojson1, geojson2);
     default:
-      throw new Error(`${type1} equals ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} equals ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/src/intersects/index.js b/src/intersects/index.js
@@ -7,9 +7,11 @@ import util from '../util';
  * @description Check if geojson #1 intersects geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if intersects otherwise false.
  */
-const intersects = (geojson1, geojson2) => {
+const intersects = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -33,7 +35,10 @@ const intersects = (geojson1, geojson2) => {
     case 'Polygon-Polygon':
       return polygon.intersectsPolygon(geojson1, geojson2);
     default:
-      throw new Error(`${type1} intersects ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} intersects ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/src/overlaps/index.js b/src/overlaps/index.js
@@ -7,9 +7,11 @@ import util from '../util';
  * @description Check if geojson #1 overlaps geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if overlaps otherwise false.
  */
-const overlaps = (geojson1, geojson2) => {
+const overlaps = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -21,7 +23,10 @@ const overlaps = (geojson1, geojson2) => {
     case 'Polygon-Polygon':
       return polygon.overlapsPolygon(geojson1, geojson2);
     default:
-      throw new Error(`${type1} overlaps ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} overlaps ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/src/touches/index.js b/src/touches/index.js
@@ -7,9 +7,11 @@ import util from '../util';
  * @description Check if geojson #1 touches geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if touches otherwise false.
  */
-const touches = (geojson1, geojson2) => {
+const touches = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -31,7 +33,10 @@ const touches = (geojson1, geojson2) => {
     case 'Polygon-Polygon':
       return polygon.touchesPolygon(geojson1, geojson2);
     default:
-      throw new Error(`${type1} touches ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} touches ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/src/within/index.js b/src/within/index.js
@@ -7,9 +7,11 @@ import util from '../util';
  * @description Check if geojson #1 is within geojson #2.
  * @param {GeoJSON} geojson1 GeoJSON #1.
  * @param {GeoJSON} geojson2 GeoJSON #2.
+ * @param {Boolean} [error=true] If true unsupported geometries throw an
+ *                               error, otherwise they return false.
  * @return {Boolean} True if within otherwise false.
  */
-const within = (geojson1, geojson2) => {
+const within = (geojson1, geojson2, error=true) => {
   const type1 = util.invariant.type(geojson1);
   const type2 = util.invariant.type(geojson2);
   const type = `${type1}-${type2}`;
@@ -27,7 +29,10 @@ const within = (geojson1, geojson2) => {
     case 'Polygon-Polygon':
       return polygon.withinPolygon(geojson1, geojson2);
     default:
-      throw new Error(`${type1} within ${type2} not supported.`);
+      if (error) {
+        throw new Error(`${type1} within ${type2} not supported.`);
+      }
+      return false;
   }
 };
 

diff --git a/...eStringDoesNotContainAnyPolygon-1.geojson → ...eStringDoesNotContainAnyPolygon-1.geojson b/...eStringDoesNotContainAnyPolygon-1.geojson → ...eStringDoesNotContainAnyPolygon-1.geojson
diff --git a/...ointDoesNotContainAnyLineString-1.geojson → ...ointDoesNotContainAnyLineString-1.geojson b/...ointDoesNotContainAnyLineString-1.geojson → ...ointDoesNotContainAnyLineString-1.geojson
diff --git a/...n/PointDoesNotContainAnyPolygon-1.geojson → ...n/PointDoesNotContainAnyPolygon-1.geojson b/...n/PointDoesNotContainAnyPolygon-1.geojson → ...n/PointDoesNotContainAnyPolygon-1.geojson
diff --git a/...ineStringIsNotCoveredbyAnyPoint-1.geojson → ...ineStringIsNotCoveredbyAnyPoint-1.geojson b/...ineStringIsNotCoveredbyAnyPoint-1.geojson → ...ineStringIsNotCoveredbyAnyPoint-1.geojson
diff --git a/...ygonIsNotCoveredbyAnyLineString-1.geojson → ...ygonIsNotCoveredbyAnyLineString-1.geojson b/...ygonIsNotCoveredbyAnyLineString-1.geojson → ...ygonIsNotCoveredbyAnyLineString-1.geojson
diff --git a/...t/PolygonIsNotCoveredbyAnyPoint-1.geojson → ...t/PolygonIsNotCoveredbyAnyPoint-1.geojson b/...t/PolygonIsNotCoveredbyAnyPoint-1.geojson → ...t/PolygonIsNotCoveredbyAnyPoint-1.geojson
diff --git a/...ineStringDoesNotCoverAnyPolygon-1.geojson → ...ineStringDoesNotCoverAnyPolygon-1.geojson b/...ineStringDoesNotCoverAnyPolygon-1.geojson → ...ineStringDoesNotCoverAnyPolygon-1.geojson
diff --git a/.../PointDoesNotCoverAnyLineString-1.geojson → .../PointDoesNotCoverAnyLineString-1.geojson b/.../PointDoesNotCoverAnyLineString-1.geojson → .../PointDoesNotCoverAnyLineString-1.geojson
diff --git a/...gon/PointDoesNotCoverAnyPolygon-1.geojson → ...gon/PointDoesNotCoverAnyPolygon-1.geojson b/...gon/PointDoesNotCoverAnyPolygon-1.geojson → ...gon/PointDoesNotCoverAnyPolygon-1.geojson
diff --git a/.../PointDoesNotCrossDisjointPoint-1.geojson → .../PointDoesNotCrossDisjointPoint-1.geojson b/.../PointDoesNotCrossDisjointPoint-1.geojson → .../PointDoesNotCrossDisjointPoint-1.geojson
diff --git a/...int/PointDoesNotCrossEqualPoint-1.geojson → ...int/PointDoesNotCrossEqualPoint-1.geojson b/...int/PointDoesNotCrossEqualPoint-1.geojson → ...int/PointDoesNotCrossEqualPoint-1.geojson
diff --git a/...NotCrossBoundaryExteriorPolygon-1.geojson → ...NotCrossBoundaryExteriorPolygon-1.geojson b/...NotCrossBoundaryExteriorPolygon-1.geojson → ...NotCrossBoundaryExteriorPolygon-1.geojson
diff --git a/...NotCrossBoundaryInteriorPolygon-1.geojson → ...NotCrossBoundaryInteriorPolygon-1.geojson b/...NotCrossBoundaryInteriorPolygon-1.geojson → ...NotCrossBoundaryInteriorPolygon-1.geojson
diff --git a/...NotCrossBoundaryInteriorPolygon-2.geojson → ...NotCrossBoundaryInteriorPolygon-2.geojson b/...NotCrossBoundaryInteriorPolygon-2.geojson → ...NotCrossBoundaryInteriorPolygon-2.geojson
diff --git a/...PolygonDoesNotCrossEqualPolygon-1.geojson → ...PolygonDoesNotCrossEqualPolygon-1.geojson b/...PolygonDoesNotCrossEqualPolygon-1.geojson → ...PolygonDoesNotCrossEqualPolygon-1.geojson
diff --git a/...DoesNotCrossExteriorHolePolygon-1.geojson → ...DoesNotCrossExteriorHolePolygon-1.geojson b/...DoesNotCrossExteriorHolePolygon-1.geojson → ...DoesNotCrossExteriorHolePolygon-1.geojson
diff --git a/...ygonDoesNotCrossExteriorPolygon-1.geojson → ...ygonDoesNotCrossExteriorPolygon-1.geojson b/...ygonDoesNotCrossExteriorPolygon-1.geojson → ...ygonDoesNotCrossExteriorPolygon-1.geojson
diff --git a/...ygonDoesNotCrossInteriorPolygon-1.geojson → ...ygonDoesNotCrossInteriorPolygon-1.geojson b/...ygonDoesNotCrossInteriorPolygon-1.geojson → ...ygonDoesNotCrossInteriorPolygon-1.geojson
diff --git a/...nDoesNotCrossOverlappingPolygon-1.geojson → ...nDoesNotCrossOverlappingPolygon-1.geojson b/...nDoesNotCrossOverlappingPolygon-1.geojson → ...nDoesNotCrossOverlappingPolygon-1.geojson
diff --git a/...nDoesNotCrossOverlappingPolygon-2.geojson → ...nDoesNotCrossOverlappingPolygon-2.geojson b/...nDoesNotCrossOverlappingPolygon-2.geojson → ...nDoesNotCrossOverlappingPolygon-2.geojson
diff --git a/...nDoesNotCrossOverlappingPolygon-3.geojson → ...nDoesNotCrossOverlappingPolygon-3.geojson b/...nDoesNotCrossOverlappingPolygon-3.geojson → ...nDoesNotCrossOverlappingPolygon-3.geojson
diff --git a/...NotDisjointMixedMultiLineString-1.geojson → ...tDisjointMixedFeatureCollection-1.geojson b/...NotDisjointMixedMultiLineString-1.geojson → ...tDisjointMixedFeatureCollection-1.geojson
diff --git a/...neStringIsNotEqualBoundaryPoint-1.geojson → ...neStringIsNotEqualBoundaryPoint-1.geojson b/...neStringIsNotEqualBoundaryPoint-1.geojson → ...neStringIsNotEqualBoundaryPoint-1.geojson
diff --git a/...NotEqualBoundaryInteriorPolygon-1.geojson → ...NotEqualBoundaryInteriorPolygon-1.geojson b/...NotEqualBoundaryInteriorPolygon-1.geojson → ...NotEqualBoundaryInteriorPolygon-1.geojson
diff --git a/...NotEqualBoundaryInteriorPolygon-2.geojson → ...NotEqualBoundaryInteriorPolygon-2.geojson b/...NotEqualBoundaryInteriorPolygon-2.geojson → ...NotEqualBoundaryInteriorPolygon-2.geojson
diff --git a/...NotEqualBoundaryInteriorPolygon-3.geojson → ...NotEqualBoundaryInteriorPolygon-3.geojson b/...NotEqualBoundaryInteriorPolygon-3.geojson → ...NotEqualBoundaryInteriorPolygon-3.geojson
diff --git a/...StringIsNotEqualBoundaryPolygon-1.geojson → ...StringIsNotEqualBoundaryPolygon-1.geojson b/...StringIsNotEqualBoundaryPolygon-1.geojson → ...StringIsNotEqualBoundaryPolygon-1.geojson
diff --git a/...StringIsNotEqualExteriorPolygon-1.geojson → ...StringIsNotEqualExteriorPolygon-1.geojson b/...StringIsNotEqualExteriorPolygon-1.geojson → ...StringIsNotEqualExteriorPolygon-1.geojson
diff --git a/...StringIsNotEqualInteriorPolygon-1.geojson → ...StringIsNotEqualInteriorPolygon-1.geojson b/...StringIsNotEqualInteriorPolygon-1.geojson → ...StringIsNotEqualInteriorPolygon-1.geojson
diff --git a/...ngIsNotEqualIntersectingPolygon-1.geojson → ...ngIsNotEqualIntersectingPolygon-1.geojson b/...ngIsNotEqualIntersectingPolygon-1.geojson → ...ngIsNotEqualIntersectingPolygon-1.geojson
diff --git a/...ngIsNotEqualIntersectingPolygon-2.geojson → ...ngIsNotEqualIntersectingPolygon-2.geojson b/...ngIsNotEqualIntersectingPolygon-2.geojson → ...ngIsNotEqualIntersectingPolygon-2.geojson
diff --git a/...ngIsNotEqualIntersectingPolygon-3.geojson → ...ngIsNotEqualIntersectingPolygon-3.geojson b/...ngIsNotEqualIntersectingPolygon-3.geojson → ...ngIsNotEqualIntersectingPolygon-3.geojson
diff --git a/...intIsNotEqualBoundaryLineString-1.geojson → ...intIsNotEqualBoundaryLineString-1.geojson b/...intIsNotEqualBoundaryLineString-1.geojson → ...intIsNotEqualBoundaryLineString-1.geojson
diff --git a/...intIsNotEqualDisjointLineString-1.geojson → ...intIsNotEqualDisjointLineString-1.geojson b/...intIsNotEqualDisjointLineString-1.geojson → ...intIsNotEqualDisjointLineString-1.geojson
diff --git a/...intIsNotEqualInteriorLineString-1.geojson → ...intIsNotEqualInteriorLineString-1.geojson b/...intIsNotEqualInteriorLineString-1.geojson → ...intIsNotEqualInteriorLineString-1.geojson
diff --git a/.../PointIsNotEqualBoundaryPolygon-1.geojson → .../PointIsNotEqualBoundaryPolygon-1.geojson b/.../PointIsNotEqualBoundaryPolygon-1.geojson → .../PointIsNotEqualBoundaryPolygon-1.geojson
diff --git a/...ntIsNotEqualExteriorHolePolygon-1.geojson → ...ntIsNotEqualExteriorHolePolygon-1.geojson b/...ntIsNotEqualExteriorHolePolygon-1.geojson → ...ntIsNotEqualExteriorHolePolygon-1.geojson
diff --git a/.../PointIsNotEqualExteriorPolygon-1.geojson → .../PointIsNotEqualExteriorPolygon-1.geojson b/.../PointIsNotEqualExteriorPolygon-1.geojson → .../PointIsNotEqualExteriorPolygon-1.geojson
diff --git a/.../PointIsNotEqualInteriorPolygon-1.geojson → .../PointIsNotEqualInteriorPolygon-1.geojson b/.../PointIsNotEqualInteriorPolygon-1.geojson → .../PointIsNotEqualInteriorPolygon-1.geojson
diff --git a/...sNotEqualIntersectingLineString-1.geojson → ...sNotEqualIntersectingLineString-1.geojson b/...sNotEqualIntersectingLineString-1.geojson → ...sNotEqualIntersectingLineString-1.geojson
diff --git a/.../PolygonIsNotEqualBoundaryPoint-1.geojson → .../PolygonIsNotEqualBoundaryPoint-1.geojson b/.../PolygonIsNotEqualBoundaryPoint-1.geojson → .../PolygonIsNotEqualBoundaryPoint-1.geojson
diff --git a/...otIntersectMixedMultiLineString-1.geojson → ...ctionDoesNotIntersectMultiPoint-1.geojson b/...otIntersectMixedMultiLineString-1.geojson → ...ctionDoesNotIntersectMultiPoint-1.geojson
diff --git a/...ringDoesNotOverlapBoundaryPoint-1.geojson → ...ringDoesNotOverlapBoundaryPoint-1.geojson b/...ringDoesNotOverlapBoundaryPoint-1.geojson → ...ringDoesNotOverlapBoundaryPoint-1.geojson
diff --git a/...ngDoesNotOverlapContainingPoint-1.geojson → ...ngDoesNotOverlapContainingPoint-1.geojson b/...ngDoesNotOverlapContainingPoint-1.geojson → ...ngDoesNotOverlapContainingPoint-1.geojson
diff --git a/...ringDoesNotOverlapDisjointPoint-1.geojson → ...ringDoesNotOverlapDisjointPoint-1.geojson b/...ringDoesNotOverlapDisjointPoint-1.geojson → ...ringDoesNotOverlapDisjointPoint-1.geojson
diff --git a/...tOverlapBoundaryInteriorPolygon-1.geojson → ...tOverlapBoundaryInteriorPolygon-1.geojson b/...tOverlapBoundaryInteriorPolygon-1.geojson → ...tOverlapBoundaryInteriorPolygon-1.geojson
diff --git a/...tOverlapBoundaryInteriorPolygon-2.geojson → ...tOverlapBoundaryInteriorPolygon-2.geojson b/...tOverlapBoundaryInteriorPolygon-2.geojson → ...tOverlapBoundaryInteriorPolygon-2.geojson
diff --git a/...tOverlapBoundaryInteriorPolygon-3.geojson → ...tOverlapBoundaryInteriorPolygon-3.geojson b/...tOverlapBoundaryInteriorPolygon-3.geojson → ...tOverlapBoundaryInteriorPolygon-3.geojson
diff --git a/...ngDoesNotOverlapBoundaryPolygon-1.geojson → ...ngDoesNotOverlapBoundaryPolygon-1.geojson b/...ngDoesNotOverlapBoundaryPolygon-1.geojson → ...ngDoesNotOverlapBoundaryPolygon-1.geojson
diff --git a/...esNotOverlapExteriorHolePolygon-1.geojson → ...esNotOverlapExteriorHolePolygon-1.geojson b/...esNotOverlapExteriorHolePolygon-1.geojson → ...esNotOverlapExteriorHolePolygon-1.geojson
diff --git a/...ngDoesNotOverlapExteriorPolygon-1.geojson → ...ngDoesNotOverlapExteriorPolygon-1.geojson b/...ngDoesNotOverlapExteriorPolygon-1.geojson → ...ngDoesNotOverlapExteriorPolygon-1.geojson
diff --git a/...ngDoesNotOverlapInteriorPolygon-1.geojson → ...ngDoesNotOverlapInteriorPolygon-1.geojson b/...ngDoesNotOverlapInteriorPolygon-1.geojson → ...ngDoesNotOverlapInteriorPolygon-1.geojson
diff --git a/...esNotOverlapIntersectingPolygon-1.geojson → ...esNotOverlapIntersectingPolygon-1.geojson b/...esNotOverlapIntersectingPolygon-1.geojson → ...esNotOverlapIntersectingPolygon-1.geojson
diff --git a/...esNotOverlapIntersectingPolygon-2.geojson → ...esNotOverlapIntersectingPolygon-2.geojson b/...esNotOverlapIntersectingPolygon-2.geojson → ...esNotOverlapIntersectingPolygon-2.geojson
diff --git a/...esNotOverlapIntersectingPolygon-3.geojson → ...esNotOverlapIntersectingPolygon-3.geojson b/...esNotOverlapIntersectingPolygon-3.geojson → ...esNotOverlapIntersectingPolygon-3.geojson
diff --git a/...oesNotOverlapBoundaryLineString-1.geojson → ...oesNotOverlapBoundaryLineString-1.geojson b/...oesNotOverlapBoundaryLineString-1.geojson → ...oesNotOverlapBoundaryLineString-1.geojson
diff --git a/...oesNotOverlapDisjointLineString-1.geojson → ...oesNotOverlapDisjointLineString-1.geojson b/...oesNotOverlapDisjointLineString-1.geojson → ...oesNotOverlapDisjointLineString-1.geojson
diff --git a/...oesNotOverlapInteriorLineString-1.geojson → ...oesNotOverlapInteriorLineString-1.geojson b/...oesNotOverlapInteriorLineString-1.geojson → ...oesNotOverlapInteriorLineString-1.geojson
diff --git a/...ntDoesNotOverlapBoundaryPolygon-1.geojson → ...ntDoesNotOverlapBoundaryPolygon-1.geojson b/...ntDoesNotOverlapBoundaryPolygon-1.geojson → ...ntDoesNotOverlapBoundaryPolygon-1.geojson
diff --git a/...esNotOverlapExteriorHolePolygon-1.geojson → ...esNotOverlapExteriorHolePolygon-1.geojson b/...esNotOverlapExteriorHolePolygon-1.geojson → ...esNotOverlapExteriorHolePolygon-1.geojson
diff --git a/...ntDoesNotOverlapExteriorPolygon-1.geojson → ...ntDoesNotOverlapExteriorPolygon-1.geojson b/...ntDoesNotOverlapExteriorPolygon-1.geojson → ...ntDoesNotOverlapExteriorPolygon-1.geojson
diff --git a/...ntDoesNotOverlapInteriorPolygon-1.geojson → ...ntDoesNotOverlapInteriorPolygon-1.geojson b/...ntDoesNotOverlapInteriorPolygon-1.geojson → ...ntDoesNotOverlapInteriorPolygon-1.geojson
diff --git a/...oesNotOverlapBoundaryLineString-1.geojson → ...oesNotOverlapBoundaryLineString-1.geojson b/...oesNotOverlapBoundaryLineString-1.geojson → ...oesNotOverlapBoundaryLineString-1.geojson
diff --git a/...sNotOverlapContainingLineString-1.geojson → ...sNotOverlapContainingLineString-1.geojson b/...sNotOverlapContainingLineString-1.geojson → ...sNotOverlapContainingLineString-1.geojson
diff --git a/...oesNotOverlapDisjointLineString-1.geojson → ...oesNotOverlapDisjointLineString-1.geojson b/...oesNotOverlapDisjointLineString-1.geojson → ...oesNotOverlapDisjointLineString-1.geojson
diff --git a/...otOverlapIntersectingLineString-1.geojson → ...otOverlapIntersectingLineString-1.geojson b/...otOverlapIntersectingLineString-1.geojson → ...otOverlapIntersectingLineString-1.geojson
diff --git a/...ygonDoesNotOverlapBoundaryPoint-1.geojson → ...ygonDoesNotOverlapBoundaryPoint-1.geojson b/...ygonDoesNotOverlapBoundaryPoint-1.geojson → ...ygonDoesNotOverlapBoundaryPoint-1.geojson
diff --git a/...onDoesNotOverlapContainingPoint-1.geojson → ...onDoesNotOverlapContainingPoint-1.geojson b/...onDoesNotOverlapContainingPoint-1.geojson → ...onDoesNotOverlapContainingPoint-1.geojson
diff --git a/...ygonDoesNotOverlapDisjointPoint-1.geojson → ...ygonDoesNotOverlapDisjointPoint-1.geojson b/...ygonDoesNotOverlapDisjointPoint-1.geojson → ...ygonDoesNotOverlapDisjointPoint-1.geojson
diff --git a/...tDoesNotTouchDisjointMultiPoint-1.geojson → ...tDoesNotTouchDisjointMultiPoint-1.geojson b/...tDoesNotTouchDisjointMultiPoint-1.geojson → ...tDoesNotTouchDisjointMultiPoint-1.geojson
diff --git a/...ointDoesNotTouchEqualMultiPoint-1.geojson → ...ointDoesNotTouchEqualMultiPoint-1.geojson b/...ointDoesNotTouchEqualMultiPoint-1.geojson → ...ointDoesNotTouchEqualMultiPoint-1.geojson
diff --git a/.../PointDoesNotTouchDisjointPoint-1.geojson → .../PointDoesNotTouchDisjointPoint-1.geojson b/.../PointDoesNotTouchDisjointPoint-1.geojson → .../PointDoesNotTouchDisjointPoint-1.geojson
diff --git a/...int/PointDoesNotTouchEqualPoint-1.geojson → ...int/PointDoesNotTouchEqualPoint-1.geojson b/...int/PointDoesNotTouchEqualPoint-1.geojson → ...int/PointDoesNotTouchEqualPoint-1.geojson
diff --git a/...t/LineStringIsNotWithinAnyPoint-1.geojson → ...t/LineStringIsNotWithinAnyPoint-1.geojson b/...t/LineStringIsNotWithinAnyPoint-1.geojson → ...t/LineStringIsNotWithinAnyPoint-1.geojson
diff --git a/...PolygonIsNotWithinAnyLineString-1.geojson → ...PolygonIsNotWithinAnyLineString-1.geojson b/...PolygonIsNotWithinAnyLineString-1.geojson → ...PolygonIsNotWithinAnyLineString-1.geojson
diff --git a/...oint/PolygonIsNotWithinAnyPoint-1.geojson → ...oint/PolygonIsNotWithinAnyPoint-1.geojson b/...oint/PolygonIsNotWithinAnyPoint-1.geojson → ...oint/PolygonIsNotWithinAnyPoint-1.geojson
diff --git a/test/de9im.test.js b/test/de9im.test.js
@@ -9,8 +9,8 @@ const ext = '*.geojson';
 // Test each predicate function
 Object.keys(de9im).forEach((predicate) => {
   test('de9im-' + predicate, (t) => {
-    // Test true and false fixtures
-    ['true', 'false'].forEach((type) => {
+    // Test true, false, and throws fixtures
+    ['true', 'false', 'throws'].forEach((type) => {
       const pattern = path.join(__dirname, 'data', 'de9im', predicate, type,
           '**', ext);
       glob.sync(pattern).forEach((filepath) => {
@@ -20,19 +20,20 @@ Object.keys(de9im).forEach((predicate) => {
         const feature1 = geojson.features[0];
         const feature2 = geojson.features[1];
 
-        let result = null;
-        try {
-          result = de9im[predicate](feature1, feature2);
-        } catch (e) {
-          if (e.message.includes('not supported')) {
-            result = false;
-          }
-        }
-
-        // Test for given true/false type.
+        // Test for given true/false/throws type.
         const message = '[' + type + '] ' + name;
-        const ok = t[type];
-        ok(result, message);
+        switch (type) {
+          case 'true':
+            t.ok(de9im[predicate](feature1, feature2), message);
+            break;
+          case 'false':
+            t.notOk(de9im[predicate](feature1, feature2), message);
+            break;
+          case 'throws':
+            t.throws(() => de9im[predicate](feature1, feature2), message);
+            t.notOk(de9im[predicate](feature1, feature2, false), message);
+            break;
+        }
       });
     });
     t.end();