Merge pull request #1093 from urschrei/polydistenvelope

Use cached envelope for polygon-polygon euclidean distance

Author: lnicola

geo/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* Use `CachedEnvelope` in R-Trees when computing euclidean distance between polygons
+  * <https://github.com/georust/geo/pull/1093>
 * Add an `inverse` method to `AffineTransform`
   * <https://github.com/georust/geo/pull/1092>
 * Fix `Densify` trait to avoid panic with empty line string.

geo/src/algorithm/euclidean_distance.rs

@@ -7,6 +7,7 @@ use crate::{
 };
 use num_traits::{float::FloatConst, Bounded, Float, Signed};
 
+use rstar::primitives::CachedEnvelope;
 use rstar::RTree;
 use rstar::RTreeNum;
 
@@ -585,8 +586,8 @@ pub fn nearest_neighbour_distance<T>(geom1: &LineString<T>, geom2: &LineString<T
 where
     T: GeoFloat + RTreeNum,
 {
-    let tree_a: RTree<Line<_>> = RTree::bulk_load(geom1.lines().collect::<Vec<_>>());
-    let tree_b: RTree<Line<_>> = RTree::bulk_load(geom2.lines().collect::<Vec<_>>());
+    let tree_a = RTree::bulk_load(geom1.lines().map(CachedEnvelope::new).collect());
+    let tree_b = RTree::bulk_load(geom2.lines().map(CachedEnvelope::new).collect());
     // Return minimum distance between all geom a points and geom b lines, and all geom b points and geom a lines
     geom2
         .points()