Add RTreeObject geom impls for rstar 0.10

Also tidy up rstar::Point impl for geo_types::Point
georust · Apr 14, 2023 · 9366b58 · 9366b58
1 parent 5c32920
commit 9366b58
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 99 deletions.
diff --git a/geo-types/src/geometry/geometry_collection.rs b/geo-types/src/geometry/geometry_collection.rs
@@ -1,4 +1,4 @@
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use crate::Point;
 use crate::{CoordNum, Geometry};
 use alloc::vec;
@@ -7,7 +7,7 @@ use alloc::vec::Vec;
 use approx::{AbsDiffEq, RelativeEq};
 use core::iter::FromIterator;
 use core::ops::{Index, IndexMut};
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use num_traits::Bounded;
 
 /// A collection of [`Geometry`](enum.Geometry.html) types.
@@ -250,7 +250,7 @@ impl<'a, T: CoordNum> GeometryCollection<T> {
     }
 }
 
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 macro_rules! impl_rstar_geometry_collection {
     ($rstar:ident) => {
         impl<T> $rstar::RTreeObject for GeometryCollection<T>
@@ -289,6 +289,9 @@ impl_rstar_geometry_collection!(rstar_0_8);
 #[cfg(feature = "rstar_0_9")]
 impl_rstar_geometry_collection!(rstar_0_9);
 
+#[cfg(feature = "rstar_0_10")]
+impl_rstar_geometry_collection!(rstar_0_10);
+
 #[cfg(any(feature = "approx", test))]
 impl<T> RelativeEq for GeometryCollection<T>
 where

diff --git a/geo-types/src/geometry/mod.rs b/geo-types/src/geometry/mod.rs
@@ -269,7 +269,7 @@ where
     }
 }
 
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 macro_rules! impl_rstar_geometry {
     ($rstar:ident) => {
         impl<T> $rstar::RTreeObject for Geometry<T>
@@ -302,6 +302,9 @@ impl_rstar_geometry!(rstar_0_8);
 #[cfg(feature = "rstar_0_9")]
 impl_rstar_geometry!(rstar_0_9);
 
+#[cfg(feature = "rstar_0_10")]
+impl_rstar_geometry!(rstar_0_10);
+
 #[cfg(any(feature = "approx", test))]
 impl<T> RelativeEq for Geometry<T>
 where

diff --git a/geo-types/src/geometry/multi_line_string.rs b/geo-types/src/geometry/multi_line_string.rs
@@ -1,6 +1,6 @@
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use crate::Point;
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use num_traits::Bounded;
 
 use crate::{CoordNum, LineString};
@@ -123,7 +123,7 @@ impl<T: CoordNum> MultiLineString<T> {
     }
 }
 
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 macro_rules! impl_rstar_multi_linestring {
     ($rstar:ident) => {
         impl<T> $rstar::RTreeObject for MultiLineString<T>
@@ -157,6 +157,9 @@ impl_rstar_multi_linestring!(rstar_0_8);
 #[cfg(feature = "rstar_0_9")]
 impl_rstar_multi_linestring!(rstar_0_9);
 
+#[cfg(feature = "rstar_0_10")]
+impl_rstar_multi_linestring!(rstar_0_10);
+
 #[cfg(any(feature = "approx", test))]
 impl<T> RelativeEq for MultiLineString<T>
 where

diff --git a/geo-types/src/geometry/multi_point.rs b/geo-types/src/geometry/multi_point.rs
@@ -1,7 +1,7 @@
 use crate::{CoordNum, Point};
 #[cfg(any(feature = "approx", test))]
 use approx::{AbsDiffEq, RelativeEq};
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use num_traits::Bounded;
 
 use alloc::vec;
@@ -100,7 +100,7 @@ impl<T: CoordNum> MultiPoint<T> {
     }
 }
 
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 macro_rules! impl_rstar_multi_point {
     ($rstar:ident) => {
         impl<T> $rstar::RTreeObject for MultiPoint<T>
@@ -133,6 +133,9 @@ impl_rstar_multi_point!(rstar_0_8);
 #[cfg(feature = "rstar_0_9")]
 impl_rstar_multi_point!(rstar_0_9);
 
+#[cfg(feature = "rstar_0_10")]
+impl_rstar_multi_point!(rstar_0_10);
+
 #[cfg(any(feature = "approx", test))]
 impl<T> RelativeEq for MultiPoint<T>
 where

diff --git a/geo-types/src/geometry/multi_polygon.rs b/geo-types/src/geometry/multi_polygon.rs
@@ -1,7 +1,7 @@
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use crate::Point;
 use crate::{CoordNum, Polygon};
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use num_traits::Bounded;
 
 use alloc::vec;
@@ -95,7 +95,7 @@ impl<T: CoordNum> MultiPolygon<T> {
     }
 }
 
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 macro_rules! impl_rstar_multi_polygon {
     ($rstar:ident) => {
         impl<T> $rstar::RTreeObject for MultiPolygon<T>
@@ -130,6 +130,9 @@ impl_rstar_multi_polygon!(rstar_0_8);
 #[cfg(feature = "rstar_0_9")]
 impl_rstar_multi_polygon!(rstar_0_9);
 
+#[cfg(feature = "rstar_0_10")]
+impl_rstar_multi_polygon!(rstar_0_10);
+
 #[cfg(any(feature = "approx", test))]
 impl<T> RelativeEq for MultiPolygon<T>
 where

diff --git a/geo-types/src/geometry/point.rs b/geo-types/src/geometry/point.rs
@@ -586,93 +586,48 @@ where
     }
 }
 
-#[cfg(feature = "rstar_0_8")]
-// These are required for rstar RTree
-impl<T> ::rstar_0_8::Point for Point<T>
-where
-    T: ::num_traits::Float + ::rstar_0_8::RTreeNum,
-{
-    type Scalar = T;
-
-    const DIMENSIONS: usize = 2;
-
-    fn generate(generator: impl Fn(usize) -> Self::Scalar) -> Self {
-        Point::new(generator(0), generator(1))
-    }
-
-    fn nth(&self, index: usize) -> Self::Scalar {
-        match index {
-            0 => self.0.x,
-            1 => self.0.y,
-            _ => unreachable!(),
-        }
-    }
-    fn nth_mut(&mut self, index: usize) -> &mut Self::Scalar {
-        match index {
-            0 => &mut self.0.x,
-            1 => &mut self.0.y,
-            _ => unreachable!(),
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
+macro_rules! impl_rstar_point {
+    ($rstar:ident) => {
+        // These are required for rstar RTree
+        impl<T> $rstar::Point for Point<T>
+        where
+            T: ::num_traits::Float + ::$rstar::RTreeNum,
+        {
+            type Scalar = T;
+
+            const DIMENSIONS: usize = 2;
+
+            fn generate(mut generator: impl FnMut(usize) -> Self::Scalar) -> Self {
+                Point::new(generator(0), generator(1))
+            }
+
+            fn nth(&self, index: usize) -> Self::Scalar {
+                match index {
+                    0 => self.0.x,
+                    1 => self.0.y,
+                    _ => unreachable!(),
+                }
+            }
+            fn nth_mut(&mut self, index: usize) -> &mut Self::Scalar {
+                match index {
+                    0 => &mut self.0.x,
+                    1 => &mut self.0.y,
+                    _ => unreachable!(),
+                }
+            }
         }
-    }
+    };
 }
 
-#[cfg(feature = "rstar_0_9")]
-impl<T> ::rstar_0_9::Point for Point<T>
-where
-    T: ::num_traits::Float + ::rstar_0_9::RTreeNum,
-{
-    type Scalar = T;
-
-    const DIMENSIONS: usize = 2;
-
-    fn generate(mut generator: impl FnMut(usize) -> Self::Scalar) -> Self {
-        Point::new(generator(0), generator(1))
-    }
+#[cfg(feature = "rstar_0_8")]
+impl_rstar_point!(rstar_0_8);
 
-    fn nth(&self, index: usize) -> Self::Scalar {
-        match index {
-            0 => self.0.x,
-            1 => self.0.y,
-            _ => unreachable!(),
-        }
-    }
-    fn nth_mut(&mut self, index: usize) -> &mut Self::Scalar {
-        match index {
-            0 => &mut self.0.x,
-            1 => &mut self.0.y,
-            _ => unreachable!(),
-        }
-    }
-}
+#[cfg(feature = "rstar_0_9")]
+impl_rstar_point!(rstar_0_9);
 
 #[cfg(feature = "rstar_0_10")]
-impl<T> ::rstar_0_10::Point for Point<T>
-where
-    T: ::num_traits::Float + ::rstar_0_10::RTreeNum,
-{
-    type Scalar = T;
-
-    const DIMENSIONS: usize = 2;
-
-    fn generate(mut generator: impl FnMut(usize) -> Self::Scalar) -> Self {
-        Point::new(generator(0), generator(1))
-    }
-
-    fn nth(&self, index: usize) -> Self::Scalar {
-        match index {
-            0 => self.0.x,
-            1 => self.0.y,
-            _ => unreachable!(),
-        }
-    }
-    fn nth_mut(&mut self, index: usize) -> &mut Self::Scalar {
-        match index {
-            0 => &mut self.0.x,
-            1 => &mut self.0.y,
-            _ => unreachable!(),
-        }
-    }
-}
+impl_rstar_point!(rstar_0_10);
 
 #[cfg(test)]
 mod test {

diff --git a/geo-types/src/geometry/rect.rs b/geo-types/src/geometry/rect.rs
@@ -1,6 +1,6 @@
 use crate::{coord, polygon, Coord, CoordFloat, CoordNum, Line, Polygon};
 
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use crate::Point;
 #[cfg(any(feature = "approx", test))]
 use approx::{AbsDiffEq, RelativeEq};
@@ -380,7 +380,7 @@ impl<T: CoordFloat> Rect<T> {
 
 static RECT_INVALID_BOUNDS_ERROR: &str = "Failed to create Rect: 'min' coordinate's x/y value must be smaller or equal to the 'max' x/y value";
 
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 macro_rules! impl_rstar_rect {
     ($rstar:ident) => {
         impl<T> $rstar::RTreeObject for Rect<T>
@@ -405,6 +405,9 @@ impl_rstar_rect!(rstar_0_8);
 #[cfg(feature = "rstar_0_9")]
 impl_rstar_rect!(rstar_0_9);
 
+#[cfg(feature = "rstar_0_10")]
+impl_rstar_rect!(rstar_0_10);
+
 #[cfg(any(feature = "approx", test))]
 impl<T> RelativeEq for Rect<T>
 where

diff --git a/geo-types/src/geometry/triangle.rs b/geo-types/src/geometry/triangle.rs
@@ -1,10 +1,10 @@
 use crate::{polygon, Coord, CoordNum, Line, Polygon};
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use num_traits::Bounded;
 
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use crate::private_utils::get_bounding_rect;
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 use crate::Point;
 
 #[cfg(any(feature = "approx", test))]
@@ -70,7 +70,7 @@ impl<IC: Into<Coord<T>> + Copy, T: CoordNum> From<[IC; 3]> for Triangle<T> {
     }
 }
 
-#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9"))]
+#[cfg(any(feature = "rstar_0_8", feature = "rstar_0_9", feature = "rstar_0_10"))]
 macro_rules! impl_rstar_triangle {
     ($rstar:ident) => {
         impl<T> $rstar::RTreeObject for Triangle<T>
@@ -102,6 +102,9 @@ impl_rstar_triangle!(rstar_0_8);
 #[cfg(feature = "rstar_0_9")]
 impl_rstar_triangle!(rstar_0_9);
 
+#[cfg(feature = "rstar_0_10")]
+impl_rstar_triangle!(rstar_0_10);
+
 #[cfg(any(feature = "approx", test))]
 impl<T> RelativeEq for Triangle<T>
 where