Merge pull request #139 from JeroenGar/bump/jagua-rs

bump/jagua-rs

Author: JeroenGar

Cargo.toml

@@ -14,7 +14,7 @@ name = "bench"
 path = "src/bench.rs"
 
 [dependencies]
-jagua-rs = { features = ["spp"], git = "https://github.com/JeroenGar/jagua-rs.git", rev = "ba38bcae9ed3ab41a9e93a1894e2b01ea87c6619"}
+jagua-rs = { features = ["spp"], git = "https://github.com/JeroenGar/jagua-rs.git", rev = "06b4915aac55c944d966aaf5c6b472a7fd699c6e"}
 #jagua-rs = { features = ["spp"], path = "../jagua-rs/jagua-rs" }
 rand = "0.10"
 rand_distr = "0.6"
@@ -39,7 +39,7 @@ anyhow = "1.0"
 getrandom = { version = "0.4", features = ["wasm_js"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-ctrlc = "3.4"
+ctrlc = "3.5"
 
 [features]
 live_svg = []

src/config.rs

@@ -20,10 +20,10 @@ pub struct SparrowConfig {
     /// Disabled if `None`.
     /// See [`jagua_rs::io::parser::Parser::new`] for more details.
     pub min_item_separation: Option<f32>,
-    /// Defines the maximum distance between two vertices of a polygon to consider it a narrow concavity (which will be closed).
+    /// Defines a maximum distance and area of a concavity to be considered "narrow" (which will be closed).
     /// Disabled if `None`.
     /// See [`jagua_rs::io::parser::Parser::new`] for more details.
-    pub narrow_concavity_cutoff_ratio: Option<f32>,
+    pub narrow_concavity_cutoff_ratio: Option<(f32, f32)>,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -98,6 +98,6 @@ pub const DEFAULT_SPARROW_CONFIG: SparrowConfig = SparrowConfig {
         },
     },
     poly_simpl_tolerance: Some(0.001),
-    narrow_concavity_cutoff_ratio: Some(0.01),
+    narrow_concavity_cutoff_ratio: Some((0.01, 0.01)),
     min_item_separation: None,
 };