Update for latest geo-traits

georust · Oct 24, 2024 · b49bf35 · b49bf35
1 parent 9824207
commit b49bf35
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 50 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2021"
 
 [dependencies]
 geo-types = { version = "0.7.8", optional = true }
-geo-traits = { git = "https://github.com/kylebarron/geo", rev = "b1364efe8b69eb109a520867df5b6a76a4645034" }
+geo-traits = { git = "https://github.com/kylebarron/geo", rev = "2b776919d561547f2e2658f804ce42574869d44b" }
 num-traits = "0.2"
 serde = { version = "1.0", default-features = false, optional = true }
 thiserror = "1.0.23"

diff --git a/src/types/coord.rs b/src/types/coord.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use geo_traits::PointTrait;
+use geo_traits::CoordTrait;
 
 use crate::tokenizer::{PeekableTokens, Token};
 use crate::types::Dimension;
@@ -98,7 +98,7 @@ where
     }
 }
 
-impl<T: WktNum> PointTrait for Coord<T> {
+impl<T: WktNum> CoordTrait for Coord<T> {
     type T = T;
 
     fn dim(&self) -> geo_traits::Dimensions {
@@ -118,11 +118,6 @@ impl<T: WktNum> PointTrait for Coord<T> {
         self.y
     }
 
-    fn is_empty(&self) -> bool {
-        // the Coord is never empty; the Point contains an `Option<Coord>` and thus may be empty.
-        false
-    }
-
     fn nth_unchecked(&self, n: usize) -> Self::T {
         let has_z = self.z.is_some();
         let has_m = self.m.is_some();
@@ -150,7 +145,7 @@ impl<T: WktNum> PointTrait for Coord<T> {
     }
 }
 
-impl<T: WktNum> PointTrait for &Coord<T> {
+impl<T: WktNum> CoordTrait for &Coord<T> {
     type T = T;
 
     fn dim(&self) -> geo_traits::Dimensions {
@@ -162,11 +157,6 @@ impl<T: WktNum> PointTrait for &Coord<T> {
         }
     }
 
-    fn is_empty(&self) -> bool {
-        // the Coord is never empty; the Point contains an `Option<Coord>` and thus may be empty.
-        false
-    }
-
     fn x(&self) -> Self::T {
         self.x
     }

diff --git a/src/types/linestring.rs b/src/types/linestring.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use geo_traits::{LineStringTrait, PointTrait};
+use geo_traits::{CoordTrait, LineStringTrait};
 
 use crate::tokenizer::PeekableTokens;
 use crate::types::coord::Coord;
@@ -65,7 +65,7 @@ where
 
 impl<T: WktNum> LineStringTrait for LineString<T> {
     type T = T;
-    type PointType<'a> = &'a Coord<T> where Self: 'a;
+    type CoordType<'a> = &'a Coord<T> where Self: 'a;
 
     fn dim(&self) -> geo_traits::Dimensions {
         // TODO: infer dimension from empty WKT
@@ -76,18 +76,18 @@ impl<T: WktNum> LineStringTrait for LineString<T> {
         }
     }
 
-    fn num_points(&self) -> usize {
+    fn num_coords(&self) -> usize {
         self.0.len()
     }
 
-    unsafe fn point_unchecked(&self, i: usize) -> Self::PointType<'_> {
+    unsafe fn coord_unchecked(&self, i: usize) -> Self::CoordType<'_> {
         &self.0[i]
     }
 }
 
 impl<T: WktNum> LineStringTrait for &LineString<T> {
     type T = T;
-    type PointType<'a> = &'a Coord<T> where Self: 'a;
+    type CoordType<'a> = &'a Coord<T> where Self: 'a;
 
     fn dim(&self) -> geo_traits::Dimensions {
         // TODO: infer dimension from empty WKT
@@ -98,11 +98,11 @@ impl<T: WktNum> LineStringTrait for &LineString<T> {
         }
     }
 
-    fn num_points(&self) -> usize {
+    fn num_coords(&self) -> usize {
         self.0.len()
     }
 
-    unsafe fn point_unchecked(&self, i: usize) -> Self::PointType<'_> {
+    unsafe fn coord_unchecked(&self, i: usize) -> Self::CoordType<'_> {
         &self.0[i]
     }
 }

diff --git a/src/types/point.rs b/src/types/point.rs
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use geo_traits::PointTrait;
+use geo_traits::{CoordTrait, PointTrait};
 
 use crate::tokenizer::PeekableTokens;
 use crate::types::coord::Coord;
@@ -70,6 +70,7 @@ where
 
 impl<T: WktNum> PointTrait for Point<T> {
     type T = T;
+    type CoordType<'a> = &'a Coord<T> where Self: 'a;
 
     fn dim(&self) -> geo_traits::Dimensions {
         if let Some(coord) = &self.0 {
@@ -80,25 +81,14 @@ impl<T: WktNum> PointTrait for Point<T> {
         }
     }
 
-    fn is_empty(&self) -> bool {
-        self.0.is_none()
-    }
-
-    fn x(&self) -> Self::T {
-        self.0.as_ref().unwrap().x()
-    }
-
-    fn y(&self) -> Self::T {
-        self.0.as_ref().unwrap().y()
-    }
-
-    fn nth_unchecked(&self, n: usize) -> Self::T {
-        self.0.as_ref().unwrap().nth_unchecked(n)
+    fn coord(&self) -> Option<Self::CoordType<'_>> {
+        self.0.as_ref()
     }
 }
 
 impl<T: WktNum> PointTrait for &Point<T> {
     type T = T;
+    type CoordType<'a> = &'a Coord<T> where Self: 'a;
 
     fn dim(&self) -> geo_traits::Dimensions {
         if let Some(coord) = &self.0 {
@@ -109,20 +99,8 @@ impl<T: WktNum> PointTrait for &Point<T> {
         }
     }
 
-    fn is_empty(&self) -> bool {
-        self.0.is_none()
-    }
-
-    fn x(&self) -> Self::T {
-        self.0.as_ref().unwrap().x()
-    }
-
-    fn y(&self) -> Self::T {
-        self.0.as_ref().unwrap().y()
-    }
-
-    fn nth_unchecked(&self, n: usize) -> Self::T {
-        self.0.as_ref().unwrap().nth_unchecked(n)
+    fn coord(&self) -> Option<Self::CoordType<'_>> {
+        self.0.as_ref()
     }
 }
 #[cfg(test)]