Fixed issue where a polygon that got cleaned down to a single line se…

…gment was causing errors - started checking number of points before doing other tests. Replaced our own booleanEquals with external geojsonEquality. booleanEquals uses cleanCoords, which we're using to check ... cleanCoords. Fixed a couple of linting issues.

packages/turf-boolean-disjoint/index.ts

@@ -65,7 +65,6 @@ function booleanDisjoint(
 function disjoint(geom1: any, geom2: any, ignoreSelfIntersections: boolean) {
   switch (geom1.type) {
     case "Point":
-      /* eslint-disable @typescript-eslint/no-unused-vars */
       switch (geom2.type) {
         case "Point":
           return !compareCoords(geom1.coordinates, geom2.coordinates);

packages/turf-clean-coords/index.ts

@@ -149,7 +149,7 @@ function cleanLine(line: Position[], type: string) {
     if (
       booleanPointOnLine(
         newPoints[0],
-        lineString([newPoints[1], points[newPoints.length - 2]])
+        lineString([newPoints[1], newPoints[newPoints.length - 2]])
       )
     ) {
       newPoints.shift(); // Discard starting point.
@@ -158,12 +158,12 @@ function cleanLine(line: Position[], type: string) {
     }
 
     // (Multi)Polygons must have at least 4 points and be closed.
-    if (!equals(newPoints[0], newPoints[newPoints.length - 1])) {
-      throw new Error("invalid polygon, first and last points not equal");
-    }
     if (newPoints.length < 4) {
       throw new Error("invalid polygon, fewer than 4 points");
     }
+    if (!equals(newPoints[0], newPoints[newPoints.length - 1])) {
+      throw new Error("invalid polygon, first and last points not equal");
+    }
   }
 
   return newPoints;

packages/turf-clean-coords/package.json

@@ -55,11 +55,11 @@
     "test:types": "tsc --esModuleInterop --module node16 --moduleResolution node16 --noEmit --strict types.ts"
   },
   "devDependencies": {
-    "@turf/boolean-equal": "workspace:^",
     "@turf/truncate": "workspace:^",
     "@types/benchmark": "^2.1.5",
     "@types/tape": "^4.13.4",
     "benchmark": "^2.1.4",
+    "geojson-equality-ts": "^1.0.2",
     "load-json-file": "^7.0.1",
     "npm-run-all": "^4.1.5",
     "tape": "^5.9.0",

packages/turf-clean-coords/test.ts

@@ -1,10 +1,10 @@
 import fs from "fs";
 import test from "tape";
 import path from "path";
+import { geojsonEquality } from "geojson-equality-ts";
 import { fileURLToPath } from "url";
 import { loadJsonFileSync } from "load-json-file";
 import { truncate } from "@turf/truncate";
-import { booleanEqual } from "@turf/boolean-equal";
 import {
   point,
   multiPoint,
@@ -40,7 +40,7 @@ test("turf-clean-coords", (t) => {
     if (process.env.REGEN)
       writeJsonFileSync(directories.out + filename, results);
     t.true(
-      booleanEqual(results, loadJsonFileSync(directories.out + filename)),
+      geojsonEquality(results, loadJsonFileSync(directories.out + filename)),
       name
     );
   });
@@ -257,7 +257,7 @@ test("turf-clean-coords - overly aggressive removal - issue 2740", (t) => {
 
 test("turf-clean-coords - start point protected - issue 2406", (t) => {
   t.true(
-    booleanEqual(
+    geojsonEquality(
       cleanCoords(
         polygon([
           [
@@ -286,3 +286,35 @@ test("turf-clean-coords - start point protected - issue 2406", (t) => {
 
   t.end();
 });
+
+test("turf-clean-coords - multipolygon - issue #918", (t) => {
+  // Copied from turf-simplify as (at heart) it's cleanCoords that's being
+  // tested here.
+  // simplify hangs on this input #918
+  t.throws(
+    () =>
+      cleanCoords(
+        multiPolygon([
+          [
+            [
+              [0, 90],
+              [0, 90],
+              [0, 90],
+              [0, 90],
+              [0, 90],
+              [0, 90],
+              [0, 90],
+              [0, 90],
+              [0, 90],
+              [0, 90],
+              [0, 90],
+            ],
+          ],
+        ])
+      ),
+    /invalid polygon/,
+    "invalid polygon"
+  );
+
+  t.end();
+});

packages/turf-meta/test.ts

@@ -532,7 +532,7 @@ test("null geometries", (t) => {
     0,
     "coordReduce"
   );
-  /* eslint-enable no-return-assign */
+
   t.end();
 });