Merge pull request #1234 from georust/mkirk/i-overlay

Back BooleanOps with i_overlay to avoid crashes from floating point collapse
georust · Oct 28, 2024 · 818344b · 818344b
2 parents aa6964d + 4915dfc
commit 818344b
Show file tree

Hide file tree

Showing 18 changed files with 883 additions and 1,336 deletions.
diff --git a/geo-bool-ops-benches/Cargo.toml b/geo-bool-ops-benches/Cargo.toml
@@ -5,6 +5,10 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+# If you want to bench against the `geo-booleanop` crate as a comparison, enable this feature.
+bench-foreign-booleanop = []
+
 [dependencies]
 geo = { path = "../geo" }
 geo-types = { path = "../geo-types" }

diff --git a/geo-bool-ops-benches/benches/boolean_ops.rs b/geo-bool-ops-benches/benches/boolean_ops.rs
@@ -1,12 +1,8 @@
 use std::f64::consts::PI;
 
 use criterion::{measurement::Measurement, *};
-use geo::{
-    algorithm::{BooleanOps, Rotate},
-    Relate,
-};
+use geo::algorithm::{BooleanOps, Rotate};
 
-use geo_booleanop::boolean::BooleanOp as OtherBooleanOp;
 use rand::{thread_rng, Rng};
 use rand_distr::Standard;
 
@@ -60,33 +56,39 @@ fn run_complex<T: Measurement>(c: &mut Criterion<T>) {
             );
         });
 
-        group.bench_with_input(
-            BenchmarkId::new("rgbops::intersection", steps),
-            &(),
-            |b, _| {
+        #[cfg(feature = "bench-foreign-booleanop")]
+        {
+            use geo::algorithm::Relate;
+            use geo_booleanop::boolean::BooleanOp as OtherBooleanOp;
+
+            group.bench_with_input(
+                BenchmarkId::new("rgbops::intersection", steps),
+                &(),
+                |b, _| {
+                    b.iter_batched(
+                        polys.sampler(),
+                        |(_, _, poly, poly2)| OtherBooleanOp::intersection(poly, poly2),
+                        BatchSize::SmallInput,
+                    );
+                },
+            );
+
+            group.bench_with_input(BenchmarkId::new("rgbops::union", steps), &(), |b, _| {
                 b.iter_batched(
                     polys.sampler(),
-                    |(_, _, poly, poly2)| OtherBooleanOp::intersection(poly, poly2),
+                    |(_, _, poly, poly2)| OtherBooleanOp::union(poly, poly2),
                     BatchSize::SmallInput,
                 );
-            },
-        );
+            });
 
-        group.bench_with_input(BenchmarkId::new("rgbops::union", steps), &(), |b, _| {
-            b.iter_batched(
-                polys.sampler(),
-                |(_, _, poly, poly2)| OtherBooleanOp::union(poly, poly2),
-                BatchSize::SmallInput,
-            );
-        });
-
-        group.bench_with_input(BenchmarkId::new("geo::relate", steps), &(), |b, _| {
-            b.iter_batched(
-                polys.sampler(),
-                |(poly, poly2, _, _)| poly.relate(poly2).is_intersects(),
-                BatchSize::SmallInput,
-            );
-        });
+            group.bench_with_input(BenchmarkId::new("geo::relate", steps), &(), |b, _| {
+                b.iter_batched(
+                    polys.sampler(),
+                    |(poly, poly2, _, _)| poly.relate(poly2).is_intersects(),
+                    BatchSize::SmallInput,
+                );
+            });
+        }
     });
 }
 

diff --git a/geo/CHANGES.md b/geo/CHANGES.md
@@ -127,6 +127,8 @@
   * <https://github.com/georust/geo/pull/1148>
 * Point in `Triangle` and `Rect` performance improvemnets
   * <https://github.com/georust/geo/pull/1057>
+* Fix crashes in `BooleanOps`
+  * <https://github.com/georust/geo/pull/1234>
 
 ## 0.27.0
 

diff --git a/geo/Cargo.toml b/geo/Cargo.toml
@@ -30,6 +30,7 @@ proj = { version = "0.27.0", optional = true }
 robust = "1.1.0"
 rstar = "0.12.0"
 serde = { version = "1.0", optional = true, features = ["derive"] }
+i_overlay = "1.7.2"
 
 [dev-dependencies]
 approx = ">= 0.4.0, < 0.6.0"