Upgrade geo-traits to 0.3.0, upgrade geo to 0.30.0 (#127)

Author: Kontinuation

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 **This is the changelog for the core Rust library**. There's a [separate changelog](./python/CHANGELOG.md) for the Python bindings.
 
+## [0.3.0] - <RELEASE DATE>
+
+### Breaking
+
+- Upgrade geo-traits to 0.3 by @kontinuation in https://github.com/kylebarron/geo-index/pull/127
+- Update geo to 0.30.0 by @kontinuation in https://github.com/kylebarron/geo-index/pull/127
+
 ## [0.2.0] - 2025-01-06
 
 ### Breaking

Cargo.lock

@@ -15,20 +15,19 @@ categories = ["data-structures", "algorithms", "science::geo"]
 [dependencies]
 bytemuck = "1"
 float_next_after = "1"
-geo-traits = "0.2"
+geo-traits = "0.3"
 num-traits = "0.2"
 rayon = { version = "1.8.0", optional = true }
 thiserror = "1"
 tinyvec = { version = "1", features = ["alloc", "rustc_1_40"] }
 
 [dev-dependencies]
 criterion = { version = "0.5", features = ["html_reports"] }
-geo = "0.28.0"
+geo = "0.30.0"
 geozero = "0.12"
 rstar = "0.12"
 zip = "2.2.2"
 
-
 [[bench]]
 name = "rtree"
 harness = false

Cargo.toml

@@ -1,6 +1,10 @@
 //! Utilities to traverse the KDTree structure.
 
-use geo_traits::RectTrait;
+use geo_traits::{
+    GeometryTrait, RectTrait, UnimplementedGeometryCollection, UnimplementedLine,
+    UnimplementedLineString, UnimplementedMultiLineString, UnimplementedMultiPoint,
+    UnimplementedMultiPolygon, UnimplementedPoint, UnimplementedPolygon, UnimplementedTriangle,
+};
 
 use crate::kdtree::KDTreeIndex;
 use crate::r#type::{Coord, IndexableNum};
@@ -216,16 +220,11 @@ impl<'a, N: IndexableNum, T: KDTreeIndex<N>> Node<'a, N, T> {
 }
 
 impl<N: IndexableNum, T: KDTreeIndex<N>> RectTrait for Node<'_, N, T> {
-    type T = N;
     type CoordType<'a>
         = Coord<N>
     where
         Self: 'a;
 
-    fn dim(&self) -> geo_traits::Dimensions {
-        geo_traits::Dimensions::Xy
-    }
-
     fn min(&self) -> Self::CoordType<'_> {
         Coord {
             x: self.min_x,
@@ -240,3 +239,79 @@ impl<N: IndexableNum, T: KDTreeIndex<N>> RectTrait for Node<'_, N, T> {
         }
     }
 }
+
+impl<N: IndexableNum, T: KDTreeIndex<N>> GeometryTrait for Node<'_, N, T> {
+    type T = N;
+
+    type PointType<'a>
+        = UnimplementedPoint<N>
+    where
+        Self: 'a;
+
+    type LineStringType<'a>
+        = UnimplementedLineString<N>
+    where
+        Self: 'a;
+
+    type PolygonType<'a>
+        = UnimplementedPolygon<N>
+    where
+        Self: 'a;
+
+    type MultiPointType<'a>
+        = UnimplementedMultiPoint<N>
+    where
+        Self: 'a;
+
+    type MultiLineStringType<'a>
+        = UnimplementedMultiLineString<N>
+    where
+        Self: 'a;
+
+    type MultiPolygonType<'a>
+        = UnimplementedMultiPolygon<N>
+    where
+        Self: 'a;
+
+    type GeometryCollectionType<'a>
+        = UnimplementedGeometryCollection<N>
+    where
+        Self: 'a;
+
+    type RectType<'a>
+        = Node<'a, N, T>
+    where
+        Self: 'a;
+
+    type TriangleType<'a>
+        = UnimplementedTriangle<N>
+    where
+        Self: 'a;
+
+    type LineType<'a>
+        = UnimplementedLine<N>
+    where
+        Self: 'a;
+
+    fn dim(&self) -> geo_traits::Dimensions {
+        geo_traits::Dimensions::Xy
+    }
+
+    fn as_type(
+        &self,
+    ) -> geo_traits::GeometryType<
+        '_,
+        Self::PointType<'_>,
+        Self::LineStringType<'_>,
+        Self::PolygonType<'_>,
+        Self::MultiPointType<'_>,
+        Self::MultiLineStringType<'_>,
+        Self::MultiPolygonType<'_>,
+        Self::GeometryCollectionType<'_>,
+        Self::RectType<'_>,
+        Self::TriangleType<'_>,
+        Self::LineType<'_>,
+    > {
+        geo_traits::GeometryType::Rect(self)
+    }
+}