Add voronoi #2

doc-E-brown · 2023-11-02T06:14:19Z

Add voronoi diagram functionality. This is a big PR and will require a walk-through and explanation.

Still TODO:

Prep for upstream PR: docs, changelog etc
Add returning of voronoi cells from voronoi components.

Signed-off-by: Ben Johnston <[email protected]>

geo/Cargo.toml

geo/CHANGES.md

geo/src/algorithm/triangulate_delaunay.rs

geo/src/algorithm/voronoi_diagram.rs

geo/Cargo.toml

geo/src/algorithm/voronoi_diagram.rs

jayvdb · 2023-11-07T06:54:16Z

geo/src/algorithm/voronoi_diagram.rs

+    // The centres of the delaunay circumcircles form the vertices of the
+    // voronoi diagram
+    let mut vertices: Vec<Coord<T>> = Vec::new();
+    for tri in delaunay_triangles.iter() {


.iter() looks redundant here

jayvdb · 2023-11-07T06:54:42Z

geo/src/algorithm/voronoi_diagram.rs

+
+    // Create the lines joining the vertices
+    let mut voronoi_lines: Vec<Line<T>> = Vec::new();
+    for neighbour in shared.neighbours.iter() {


again .iter() probably not needed

jayvdb · 2023-11-07T06:59:08Z

geo/src/algorithm/voronoi_diagram.rs

+    let mut voronoi_lines: Vec<Line<T>> = Vec::new();
+    for neighbour in shared.neighbours.iter() {
+        if let (Some(first_vertex), Some(second_vertex)) = (neighbour.0, neighbour.1) {
+            voronoi_lines.push(Line::new(vertices[first_vertex], vertices[second_vertex]));


this indexing of vertices makes me squeamish, but meh ... looks safe

jayvdb · 2023-11-07T06:59:23Z

geo/src/algorithm/voronoi_diagram.rs

+    f64: From<T>,
+{
+    let mut pts: Vec<Point<T>> = Vec::new();
+    for tri in triangles.iter() {


.iter() needed?

jayvdb · 2023-11-07T07:01:04Z

geo/src/algorithm/voronoi_diagram.rs

+    // These connections to infinity will be bounded later
+    // Add the connections from infinity
+    let mut num_neighbours: Vec<usize> = triangles.iter().map(|_| 0).collect();
+    neighbours.iter().for_each(|x| {


for x in neighbours.iter() { .. } or for x in neighbours { .. }

jayvdb · 2023-11-07T07:04:26Z

geo/src/algorithm/voronoi_diagram.rs

+        };
+        let m = -1. / slope;
+        // y = mx + b
+        let b = midpoint.y - m * midpoint.x;


let b = m.mul_add(-midpoint.x, midpoint.y)

Thanks for this tip! TIL!

jayvdb · 2023-11-07T07:04:46Z

geo/src/algorithm/voronoi_diagram.rs

+        // y = mx + b
+        let b = midpoint.y - m * midpoint.x;
+        let x = midpoint.x + f64::from(line.dx());
+        let y = m * x + b;


let y = m.mul_add(x, b)

jayvdb · 2023-11-07T07:08:17Z

geo/src/algorithm/voronoi_diagram.rs

+
+impl GuidingDirection {
+    // The common point is the end co-ordinate of both lines
+    fn from_midpoints<T: GeoFloat>(line_a: &Line<T>, line_b: &Line<T>) -> GuidingDirection {


GuidingDirection here can be Self

jayvdb · 2023-11-07T07:08:36Z

geo/src/algorithm/voronoi_diagram.rs

+        // to the left or right of the other midpoints, or
+        // above of below the other midpoints
+        if (dx_a == dx_b) && dx_a {
+            GuidingDirection::Right


Self here and one following lines

jayvdb · 2023-11-07T07:10:34Z

geo/src/algorithm/voronoi_diagram.rs

+                _ => return Err(VoronoiDiagramError::UnexpectedDirectionForInfinityVertex),
+            }
+        } else {
+            let b = circumcenter.y - line.slope() * circumcenter.x;


give b a better name?

jayvdb · 2023-11-07T07:12:07Z

geo/src/algorithm/voronoi_diagram.rs

+
+    // Get the vertices with connections to infinity
+    let mut inf_lines: Vec<Line<T>> = Vec::new();
+    for neighbour in neighbours.iter() {


.iter() ?

jayvdb · 2023-11-07T07:12:42Z

geo/src/algorithm/voronoi_diagram.rs

+
+#[cfg(test)]
+mod test {
+


unnecessary blank line

jayvdb · 2023-11-07T07:16:02Z

geo/src/algorithm/triangulate_delaunay.rs

+    None
+}
+
+fn add_point<T: GeoFloat>(triangles: &mut Vec<DelaunayTriangle<T>>, c: &Coord<T>) -> Result<()>


Result<()> unnecessary? I dont see any return or ? inside

c -> coord or point

c -> coord or point

I renamed add_point to add_coordinate

jayvdb · 2023-11-07T07:19:00Z

geo/src/algorithm/triangulate_delaunay.rs

+                    bad_triangle_edge_count.push(1);
+                }
+            }
+        })


add trailing ;

jayvdb · 2023-11-07T07:21:05Z

geo/src/algorithm/triangulate_delaunay.rs

+            let flipped_y = Line::new(y.end, y.start);
+            let idx =
+                find_line(y, &bad_triangle_edges).or(find_line(&flipped_y, &bad_triangle_edges));
+            match idx {


if let Some(idx) = idx { .. } else { ... } is less nesting

jayvdb · 2023-11-07T07:23:00Z

geo/src/algorithm/triangulate_delaunay.rs

+
+    let mut bad_triangle_edges: Vec<Line<T>> = Vec::new();
+    let mut bad_triangle_edge_count: Vec<u128> = Vec::new();
+    bad_triangles.iter().for_each(|x| {


for_each not needed here.
im less sure about the inner for_each

Do you mean replace the for_each for a std for loop?

yup, this is more readable

for x in &bad_triangles { for y in x.0.to_lines() { ...

there are a few changes needed inside to make it work.

jayvdb · 2023-11-07T07:26:30Z

geo/src/algorithm/triangulate_delaunay.rs

+
+    // Replace the triangles
+    triangles.clear();
+    new_triangles.iter().for_each(|x| triangles.push(x.clone()));


It would be more efficient to return new_triangles, and then this fn doesnt need a mut input

* Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]>

* chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]>

* Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]>

* chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]>

* chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add len to MultiPoint. * Add is_empty to MultiPoint. * Add entry to geo/CHANGES.md for len and is_empty on MultiPoint. * prepare for geo-types 0.7.12 release * Prepare for 0.27.0 release * Update Cargo.toml * geo now requires at least geo-types 0.7.12 for the wkt macro and the `use-rstar_0_11` feature flag. * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> * Upstream rebase (#3) * chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]> Co-authored-by: andriyDev <[email protected]> Co-authored-by: Michael Kirk <[email protected]> Co-authored-by: Corey Farwell <[email protected]>

* Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]>

* chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]>

* chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add len to MultiPoint. * Add is_empty to MultiPoint. * Add entry to geo/CHANGES.md for len and is_empty on MultiPoint. * prepare for geo-types 0.7.12 release * Prepare for 0.27.0 release * Update Cargo.toml * geo now requires at least geo-types 0.7.12 for the wkt macro and the `use-rstar_0_11` feature flag. * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> * Upstream rebase (#3) * chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]> Co-authored-by: andriyDev <[email protected]> Co-authored-by: Michael Kirk <[email protected]> Co-authored-by: Corey Farwell <[email protected]>

* chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> * Upstream rebase (#3) * chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]> * Upstream rebase (#3) (#6) * chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add len to MultiPoint. * Add is_empty to MultiPoint. * Add entry to geo/CHANGES.md for len and is_empty on MultiPoint. * prepare for geo-types 0.7.12 release * Prepare for 0.27.0 release * Update Cargo.toml * geo now requires at least geo-types 0.7.12 for the wkt macro and the `use-rstar_0_11` feature flag. * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> * Upstream rebase (#3) * chore: add spade as a dependency although spade is a optional dependency, it looks like a good fit for the default features. Including it has the effect of bringing in 3 new dependencies: - robust 0.2 (we already use this) - optional 0.5 - spade 2.2 I'll try to speak to the spade maintainers. Maybe we can bump the robust version in their crate to reduce dependencies further. Also it might make sense to ask them if the optional crate provides any real value. * feat: initial implementation of TriangulateSpade trait * fix: ignore example pictures in doc tests * chore: add changelog entry * chore: fix comment * chore: apply review suggestion for doc comments * chore: capitalize Delaunay * chore: fix typo: convertes -> converts * chore: fix typo: achives -> achieves * feat: put required methods into a sealed trait so we don't leak them * feat: add tests for the shapes in the doc comments * chore: add doc tests and move cleanup function to sealed trait * chore: fix typo * chore: apply review suggestion for naming * chore: improve description, worsen english * chore: fix weird line wrap * fix: pass epsilon as parameter + rename points -> coords * chore: add test for different snap radius values * chore: add link that explains constrained Delaunay triangulations * Add voronoi (#2) * Add Delaunay triangulation Signed-off-by: Ben Johnston <[email protected]> * feat: Delaunay documentation Signed-off-by: Ben Johnston <[email protected]> * feat: Add Voronoi diagram Signed-off-by: Ben Johnston <[email protected]> * feat: Voronoi testing Signed-off-by: Ben Johnston <[email protected]> * feat: Remove ndarray crates * chore: Remove unwanted Result * feat: Remove Circle struct * feat: Remove nested loop * feat: Add test to trim intersection to None * chore: Update CHANGES.md * feat: Address review comments --------- Signed-off-by: Ben Johnston <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]> --------- Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]> Co-authored-by: andriyDev <[email protected]> Co-authored-by: Michael Kirk <[email protected]> Co-authored-by: Corey Farwell <[email protected]> * Add package to cloudsmith for testing and internal use (#5) * feat: Prepare for cloudsmith * chore: Add cloudsmith registry * feat: Bump version to alpha * feat: Remove need for cloudsmith geo-types * feat: Improve infinity line construction (#7) * fix: Remove duplicate points (#8) * feat: Remove duplicate points from delaunay * feat: Flag invalid delaunay triangulation * chore: Bump cloudsmith version * Fix: Infinity line construction (#9) * feat: Voronoi working Signed-off-by: Ben Johnston <[email protected]> * feat: Some refactoring * feat: Improve clipping mask operation --------- Signed-off-by: Ben Johnston <[email protected]> * chore: Correct changelog entry --------- Signed-off-by: Ben Johnston <[email protected]> Signed-off-by: Ben Johnston <[email protected]> Co-authored-by: aviac <[email protected]> Co-authored-by: RobWalt <[email protected]> Co-authored-by: Stephan Hügel <[email protected]> Co-authored-by: andriyDev <[email protected]> Co-authored-by: Michael Kirk <[email protected]> Co-authored-by: Corey Farwell <[email protected]>

doc-E-brown and others added 4 commits November 2, 2023 16:55

Add Delaunay triangulation

9b85434

Signed-off-by: Ben Johnston <[email protected]>

feat: Delaunay documentation

05bd062

Signed-off-by: Ben Johnston <[email protected]>

feat: Add Voronoi diagram

a622da3

Signed-off-by: Ben Johnston <[email protected]>

feat: Voronoi testing

bcfcbdc

Signed-off-by: Ben Johnston <[email protected]>

doc-E-brown requested review from jayvdb, boods and MitchellNeill November 2, 2023 06:14

doc-E-brown self-assigned this Nov 2, 2023

jayvdb reviewed Nov 2, 2023

View reviewed changes

geo/Cargo.toml Outdated Show resolved Hide resolved

doc-E-brown added 2 commits November 6, 2023 14:55

feat: Remove ndarray crates

802d7a2

chore: Remove unwanted Result

9d42440

jayvdb reviewed Nov 6, 2023

View reviewed changes

geo/CHANGES.md Outdated Show resolved Hide resolved

MitchellNeill reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/triangulate_delaunay.rs Outdated Show resolved Hide resolved

MitchellNeill reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/triangulate_delaunay.rs Outdated Show resolved Hide resolved

MitchellNeill reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/triangulate_delaunay.rs Outdated Show resolved Hide resolved

jayvdb reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Show resolved Hide resolved

jayvdb reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Outdated Show resolved Hide resolved

jayvdb reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Outdated Show resolved Hide resolved

MitchellNeill reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Outdated Show resolved Hide resolved

MitchellNeill reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Outdated Show resolved Hide resolved

MitchellNeill approved these changes Nov 6, 2023

View reviewed changes

jayvdb reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Outdated Show resolved Hide resolved

jayvdb reviewed Nov 6, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Outdated Show resolved Hide resolved

doc-E-brown added 4 commits November 7, 2023 11:11

feat: Remove Circle struct

f80b5f0

feat: Remove nested loop

ba4b1e0

feat: Add test to trim intersection to None

cc9b7f7

chore: Update CHANGES.md

aa649e8

jayvdb reviewed Nov 7, 2023

View reviewed changes

geo/Cargo.toml Outdated Show resolved Hide resolved

jayvdb reviewed Nov 7, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Outdated Show resolved Hide resolved

jayvdb reviewed Nov 7, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Outdated Show resolved Hide resolved

jayvdb reviewed Nov 7, 2023

View reviewed changes

geo/src/algorithm/voronoi_diagram.rs Outdated

#[cfg(test)]

mod test {

Copy link

Member

jayvdb Nov 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unnecessary blank line

doc-E-brown reacted with thumbs up emoji

jayvdb reviewed Nov 7, 2023

View reviewed changes

feat: Address review comments

2973514

doc-E-brown changed the base branch from main to franklin-enhancements November 8, 2023 05:33

doc-E-brown merged commit 8bae552 into franklin-enhancements Nov 10, 2023

doc-E-brown mentioned this pull request Nov 15, 2023

Upstream rebase (#3) #6

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add voronoi #2

Add voronoi #2

doc-E-brown commented Nov 2, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

doc-E-brown Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023 •

edited

Loading

doc-E-brown Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

jayvdb Nov 7, 2023

doc-E-brown Nov 8, 2023

jayvdb Nov 8, 2023

jayvdb Nov 7, 2023 •

edited

Loading

Add voronoi #2

Add voronoi #2

Conversation

doc-E-brown commented Nov 2, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jayvdb Nov 7, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jayvdb Nov 7, 2023 • edited Loading

Choose a reason for hiding this comment

jayvdb Nov 7, 2023 •

edited

Loading

jayvdb Nov 7, 2023 •

edited

Loading