Revert self intersection behavior: line-intersect (#2742)

Changed ignoreSelfIntersections to default to true, reverting to previous v6.5.0 behaviour. This unannounced breaking change was unintentionally released in v7.0.0. --------- Co-authored-by: James Beard <[email protected]>
Turfjs · Dec 14, 2024 · e7a28da · e7a28da
1 parent 42ad7b8
commit e7a28da
Show file tree

Hide file tree

Showing 11 changed files with 384 additions and 11 deletions.
diff --git a/packages/turf-line-intersect/README.md b/packages/turf-line-intersect/README.md
@@ -13,7 +13,7 @@ Takes any LineString or Polygon GeoJSON and returns the intersecting point(s).
 *   `options` **[Object][2]** Optional parameters (optional, default `{}`)
 
     *   `options.removeDuplicates` **[boolean][3]** remove duplicate intersections (optional, default `true`)
-    *   `options.ignoreSelfIntersections` **[boolean][3]** ignores self-intersections on input features (optional, default `false`)
+    *   `options.ignoreSelfIntersections` **[boolean][3]** ignores self-intersections on input features (optional, default `true`)
 
 ### Examples
 

diff --git a/packages/turf-line-intersect/index.ts b/packages/turf-line-intersect/index.ts
@@ -19,7 +19,7 @@ import { sweeplineIntersections as findIntersections } from "./lib/sweepline-int
  * @param {GeoJSON} line2 any LineString or Polygon
  * @param {Object} [options={}] Optional parameters
  * @param {boolean} [options.removeDuplicates=true] remove duplicate intersections
- * @param {boolean} [options.ignoreSelfIntersections=false] ignores self-intersections on input features
+ * @param {boolean} [options.ignoreSelfIntersections=true] ignores self-intersections on input features
  * @returns {FeatureCollection<Point>} point(s) that intersect both
  * @example
  * var line1 = turf.lineString([[126, -11], [129, -21]]);
@@ -40,7 +40,7 @@ function lineIntersect<
     ignoreSelfIntersections?: boolean;
   } = {}
 ): FeatureCollection<Point> {
-  const { removeDuplicates = true, ignoreSelfIntersections = false } = options;
+  const { removeDuplicates = true, ignoreSelfIntersections = true } = options;
   let features: Feature<G1 | G2>[] = [];
   if (line1.type === "FeatureCollection")
     features = features.concat(line1.features);

diff --git a/packages/turf-line-intersect/test.ts b/packages/turf-line-intersect/test.ts
@@ -4,13 +4,9 @@ import path from "path";
 import { loadJsonFileSync } from "load-json-file";
 import { writeJsonFileSync } from "write-json-file";
 import { truncate } from "@turf/truncate";
-import {
-  featureCollection,
-  // geometryCollection,
-  lineString,
-  polygon,
-} from "@turf/helpers";
+import { featureCollection, lineString, polygon } from "@turf/helpers";
 import { lineIntersect } from "./index.js";
+import { Feature, LineString, Point } from "geojson";
 
 const directories = {
   in: path.join("test", "in") + path.sep,
@@ -21,14 +17,18 @@ const fixtures = fs.readdirSync(directories.in).map((filename) => {
   return {
     filename,
     name: path.parse(filename).name,
-    geojson: loadJsonFileSync(directories.in + filename),
+    geojson: loadJsonFileSync(
+      directories.in + filename
+    ) as GeoJSON.FeatureCollection<LineString>,
   };
 });
 
 test("turf-line-intersect", (t) => {
   for (const { filename, name, geojson } of fixtures) {
     const [line1, line2] = geojson.features;
-    const results = truncate(lineIntersect(line1, line2));
+    const results: GeoJSON.FeatureCollection<LineString | Point> = truncate(
+      lineIntersect(line1, line2)
+    );
     results.features.push(line1);
     results.features.push(line2);
 
@@ -132,3 +132,52 @@ test("turf-line-intersect - polygon support #586", (t) => {
   t.equal(results.features.length, 1, "should return single point");
   t.end();
 });
+
+/**
+ * ensures that the self intersection param behaves as expected -
+ * since it cannot be verified in the fixture format.
+ */
+test("turf-line-intersect - self intersection behavior", (t) => {
+  const line1: Feature<LineString> = {
+    type: "Feature",
+    properties: {},
+    geometry: {
+      type: "LineString",
+      coordinates: [
+        [0, 0],
+        [0, 2],
+        [2, 1],
+        [-1, 1],
+      ],
+    },
+  };
+  const line2: Feature<LineString> = {
+    type: "Feature",
+    properties: {},
+    geometry: {
+      type: "LineString",
+      coordinates: [
+        [3, 3],
+        [4, 4],
+        [5, 5],
+      ],
+    },
+  };
+
+  const ignored = lineIntersect(line1, line2);
+  t.equal(
+    ignored.features.length,
+    0,
+    "self intersections should be ignored by default"
+  );
+
+  const included = lineIntersect(line1, line2, {
+    ignoreSelfIntersections: false,
+  });
+  t.equal(
+    included.features.length,
+    1,
+    "self intersections should be included when ignoreSelfIntersections set to false"
+  );
+  t.end();
+});
diff --git a/packages/turf-line-intersect/test/in/self-intersecting-line.geojson b/packages/turf-line-intersect/test/in/self-intersecting-line.geojson
@@ -0,0 +1,30 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [0, 0],
+          [0, 2],
+          [2, 1],
+          [-1, 1]
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [3, 3],
+          [4, 4],
+          [5, 5]
+        ]
+      }
+    }
+  ]
+}
diff --git a/packages/turf-line-intersect/test/in/self-intersecting-multiline.geojson b/packages/turf-line-intersect/test/in/self-intersecting-multiline.geojson
@@ -0,0 +1,36 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "MultiLineString",
+        "coordinates": [
+          [
+            [0, 0],
+            [1, 2],
+            [0, 4]
+          ],
+          [
+            [1, 0],
+            [0, 2],
+            [1, 4]
+          ]
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [3, 3],
+          [4, 4],
+          [5, 5]
+        ]
+      }
+    }
+  ]
+}
diff --git a/packages/turf-line-intersect/test/in/self-intersecting-multipoly.geojson b/packages/turf-line-intersect/test/in/self-intersecting-multipoly.geojson
@@ -0,0 +1,52 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {
+        "fill": "#ed333b",
+        "fill-opacity": 0.5
+      },
+      "geometry": {
+        "coordinates": [
+          [
+            [
+              [2.8208987964653716, 5.206515064293427],
+              [2.8208987964653716, -4.530167455797994],
+              [6.383916833323553, -4.530167455797994],
+              [6.383916833323553, 5.206515064293427],
+              [2.8208987964653716, 5.206515064293427]
+            ]
+          ],
+          [
+            [
+              [-0.33343506038161763, 3.67541603033537],
+              [-0.33343506038161763, 2.1793088174136273],
+              [8.775841349855597, 2.1793088174136273],
+              [8.775841349855597, 3.67541603033537],
+              [-0.33343506038161763, 3.67541603033537]
+            ]
+          ]
+        ],
+        "type": "MultiPolygon"
+      },
+      "id": 0
+    },
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "coordinates": [
+          [
+            [-7.951422534380413, 5.231149187754099],
+            [-7.951422534380413, -4.552832252613101],
+            [-5.701165954657256, -4.552832252613101],
+            [-5.701165954657256, 5.231149187754099],
+            [-7.951422534380413, 5.231149187754099]
+          ]
+        ],
+        "type": "Polygon"
+      }
+    }
+  ]
+}
diff --git a/packages/turf-line-intersect/test/in/self-intersecting-poly.geojson b/packages/turf-line-intersect/test/in/self-intersecting-poly.geojson
@@ -0,0 +1,44 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "coordinates": [
+          [
+            [-0.8680870854922205, 3.0368343508535673],
+            [-1.321147431010786, 5.333329344976903],
+            [1.0099462525165848, 5.611566335081363],
+            [0.47439299724965167, -1.9282285399474688],
+            [3.2162894164922875, -1.8166964568157766],
+            [2.707220996335252, 7.192842763774053],
+            [-3.8645185945755713, 6.519248925309753],
+            [-3.8571038955967083, 0.3483632770754781],
+            [-0.5093053180867742, 0.39824548653076874],
+            [4.4119165583018685, 0.21046777461485533],
+            [3.9804563423212755, 3.7937082620644844],
+            [-0.8680870854922205, 3.0368343508535673]
+          ]
+        ],
+        "type": "Polygon"
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "coordinates": [
+          [
+            [-7.4564971746842446, 6.278543929857676],
+            [-13.631981273628753, 6.323585458965155],
+            [-12.43687692686214, -2.589094309688946],
+            [-6.376915352576532, -3.0767722870515115],
+            [-7.4564971746842446, 6.278543929857676]
+          ]
+        ],
+        "type": "Polygon"
+      }
+    }
+  ]
+}
diff --git a/packages/turf-line-intersect/test/out/self-intersecting-line.geojson b/packages/turf-line-intersect/test/out/self-intersecting-line.geojson
@@ -0,0 +1,30 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [0, 0],
+          [0, 2],
+          [2, 1],
+          [-1, 1]
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [3, 3],
+          [4, 4],
+          [5, 5]
+        ]
+      }
+    }
+  ]
+}
diff --git a/packages/turf-line-intersect/test/out/self-intersecting-multiline.geojson b/packages/turf-line-intersect/test/out/self-intersecting-multiline.geojson
@@ -0,0 +1,36 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "MultiLineString",
+        "coordinates": [
+          [
+            [0, 0],
+            [1, 2],
+            [0, 4]
+          ],
+          [
+            [1, 0],
+            [0, 2],
+            [1, 4]
+          ]
+        ]
+      }
+    },
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "LineString",
+        "coordinates": [
+          [3, 3],
+          [4, 4],
+          [5, 5]
+        ]
+      }
+    }
+  ]
+}