Bump geo-traits to 0.2 (#874)

geoarrow · Nov 25, 2024 · 3ecf7df · 3ecf7df
1 parent e38f0d9
commit 3ecf7df
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/js/Cargo.toml b/js/Cargo.toml
@@ -89,7 +89,7 @@ bytes = { version = "1", optional = true }
 console_error_panic_hook = { version = "0.1.6", optional = true }
 futures = { version = "0.3.30", optional = true }
 geo = "0.28"
-geo-traits = "0.1.1"
+geo-traits = "0.2"
 geoarrow = { path = "../rust/geoarrow" }
 geodesy = { version = "0.12", optional = true, features = ["js"] }
 object_store = { version = "0.11", optional = true }

diff --git a/python/Cargo.toml b/python/Cargo.toml
@@ -18,7 +18,7 @@ arrow = "53"
 arrow-array = "53"
 arrow-buffer = "53"
 arrow-schema = "53"
-geo-traits = "0.1.1"
+geo-traits = "0.2"
 geoarrow = { path = "../rust/geoarrow" }
 # Uncomment when publishing
 # geoarrow = { version = "0.4.0-beta.1" }

diff --git a/rust/geoarrow/Cargo.toml b/rust/geoarrow/Cargo.toml
@@ -64,7 +64,7 @@ futures = { version = "0.3", optional = true }
 gdal = { version = "0.17", optional = true }
 geo = "0.28"
 geo-index = "0.1.1"
-geo-traits = "0.1.1"
+geo-traits = "0.2"
 geos = { version = "9.0", features = ["v3_10_0", "geo"], optional = true }
 geozero = { version = "0.14", features = ["with-wkb"] }
 half = { version = "2.4.1" }
@@ -96,8 +96,8 @@ sqlx = { version = "0.7", optional = true, default-features = false, features =
 thiserror = "1"
 tokio = { version = "1", default-features = false, optional = true }
 # wkt = "0.11"
-wkt = { git = "https://github.com/georust/wkt", branch = "kyle/geo-traits-writer" }
-wkb = { git = "https://github.com/kylebarron/wkb", rev = "7d58a2327fe21cf250dab5ac6860b6cf0fddb838" }
+wkt = { git = "https://github.com/georust/wkt", rev = "447be533e0a76188ca499eb8a0c74fc4e8a0f823" }
+wkb = { git = "https://github.com/kylebarron/wkb", rev = "e0f29b4a24104356464cc123925b459d81c40e52" }
 
 
 [dev-dependencies]

diff --git a/rust/geoarrow/src/algorithm/native/eq.rs b/rust/geoarrow/src/algorithm/native/eq.rs
@@ -17,7 +17,7 @@ pub fn coord_eq<T: CoordFloat>(
     }
 
     for i in 0..left_dim.size() {
-        if left.nth_unchecked(i) != right.nth_unchecked(i) {
+        if left.nth_or_panic(i) != right.nth_or_panic(i) {
             return false;
         }
     }

diff --git a/rust/geoarrow/src/io/flatgeobuf/reader/core.rs b/rust/geoarrow/src/io/flatgeobuf/reader/core.rs
@@ -23,7 +23,7 @@ impl<'a> CoordTrait for Coord<'a> {
         self.dim.into()
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         match n {
             0 => self.geom.xy().unwrap().get(self.coord_offset * 2),
             1 => self.geom.xy().unwrap().get((self.coord_offset * 2) + 1),

diff --git a/rust/geoarrow/src/io/geos/scalar/coord/mod.rs b/rust/geoarrow/src/io/geos/scalar/coord/mod.rs
@@ -18,7 +18,7 @@ impl CoordTrait for GEOSConstCoord {
         self.dim
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         match n {
             0 => self.coords.get_x(self.geom_index).unwrap(),
             1 => self.coords.get_y(self.geom_index).unwrap(),

diff --git a/rust/geoarrow/src/io/geozero/scalar/coord.rs b/rust/geoarrow/src/io/geozero/scalar/coord.rs
@@ -13,7 +13,7 @@ pub(crate) fn process_coord<P: GeomProcessor>(
         Dimensions::Xyz | Dimensions::Unknown(3) => processor.coordinate(
             coord.x(),
             coord.y(),
-            Some(coord.nth_unchecked(2)),
+            Some(unsafe { coord.nth_unchecked(2) }),
             None,
             None,
             None,
@@ -23,16 +23,16 @@ pub(crate) fn process_coord<P: GeomProcessor>(
             coord.x(),
             coord.y(),
             None,
-            Some(coord.nth_unchecked(2)),
+            Some(unsafe { coord.nth_unchecked(2) }),
             None,
             None,
             coord_idx,
         )?,
         Dimensions::Xyzm | Dimensions::Unknown(4) => processor.coordinate(
             coord.x(),
             coord.y(),
-            Some(coord.nth_unchecked(2)),
-            Some(coord.nth_unchecked(3)),
+            Some(unsafe { coord.nth_unchecked(2) }),
+            Some(unsafe { coord.nth_unchecked(3) }),
             None,
             None,
             coord_idx,

diff --git a/rust/geoarrow/src/io/geozero/scalar/point.rs b/rust/geoarrow/src/io/geozero/scalar/point.rs
@@ -33,7 +33,7 @@ pub(crate) fn process_point_as_coord<P: GeomProcessor>(
         Dimensions::Xyz | Dimensions::Unknown(3) => processor.coordinate(
             coord.x(),
             coord.y(),
-            Some(coord.nth_unchecked(2)),
+            Some(unsafe { coord.nth_unchecked(2) }),
             None,
             None,
             None,
@@ -43,16 +43,16 @@ pub(crate) fn process_point_as_coord<P: GeomProcessor>(
             coord.x(),
             coord.y(),
             None,
-            Some(coord.nth_unchecked(2)),
+            Some(unsafe { coord.nth_unchecked(2) }),
             None,
             None,
             coord_idx,
         )?,
         Dimensions::Xyzm | Dimensions::Unknown(4) => processor.coordinate(
             coord.x(),
             coord.y(),
-            Some(coord.nth_unchecked(2)),
-            Some(coord.nth_unchecked(3)),
+            Some(unsafe { coord.nth_unchecked(2) }),
+            Some(unsafe { coord.nth_unchecked(3) }),
             None,
             None,
             coord_idx,

diff --git a/rust/geoarrow/src/io/shapefile/scalar.rs b/rust/geoarrow/src/io/shapefile/scalar.rs
@@ -21,7 +21,7 @@ impl<'a> CoordTrait for Point<'a> {
         geo_traits::Dimensions::Xy
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         match n {
             0 => self.0.x,
             1 => self.0.y,
@@ -71,7 +71,7 @@ impl<'a> CoordTrait for PointZ<'a> {
         }
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         match n {
             0 => self.0.x,
             1 => self.0.y,

diff --git a/rust/geoarrow/src/io/wkt/writer/scalar.rs b/rust/geoarrow/src/io/wkt/writer/scalar.rs
@@ -18,14 +18,14 @@ pub(super) fn coord_to_wkt<T: CoordFloat>(coord: &impl CoordTrait<T = T>) -> wkt
     match coord.dim() {
         Dimensions::Xy | Dimensions::Unknown(2) => {}
         Dimensions::Xyz | Dimensions::Unknown(3) => {
-            out.z = Some(coord.nth_unchecked(2));
+            out.z = Some(unsafe { coord.nth_unchecked(2) });
         }
         Dimensions::Xym => {
-            out.m = Some(coord.nth_unchecked(2));
+            out.m = Some(unsafe { coord.nth_unchecked(2) });
         }
         Dimensions::Xyzm | Dimensions::Unknown(4) => {
-            out.z = Some(coord.nth_unchecked(2));
-            out.m = Some(coord.nth_unchecked(3));
+            out.z = Some(unsafe { coord.nth_unchecked(2) });
+            out.m = Some(unsafe { coord.nth_unchecked(3) });
         }
         _ => panic!(),
     }

diff --git a/rust/geoarrow/src/scalar/coord/combined/scalar.rs b/rust/geoarrow/src/scalar/coord/combined/scalar.rs
@@ -105,10 +105,10 @@ impl CoordTrait for Coord<'_> {
         }
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         match self {
-            Coord::Interleaved(c) => c.nth_unchecked(n),
-            Coord::Separated(c) => c.nth_unchecked(n),
+            Coord::Interleaved(c) => c.nth_or_panic(n),
+            Coord::Separated(c) => c.nth_or_panic(n),
         }
     }
 
@@ -137,10 +137,10 @@ impl CoordTrait for &Coord<'_> {
         }
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         match self {
-            Coord::Interleaved(c) => c.nth_unchecked(n),
-            Coord::Separated(c) => c.nth_unchecked(n),
+            Coord::Interleaved(c) => c.nth_or_panic(n),
+            Coord::Separated(c) => c.nth_or_panic(n),
         }
     }
 

diff --git a/rust/geoarrow/src/scalar/coord/interleaved/scalar.rs b/rust/geoarrow/src/scalar/coord/interleaved/scalar.rs
@@ -18,7 +18,7 @@ pub struct InterleavedCoord<'a> {
 impl<'a> InterleavedCoord<'a> {
     /// Return `true` if all values in the coordinate are f64::NAN
     pub(crate) fn is_nan(&self) -> bool {
-        (0..self.dim.size()).all(|coord_dim| self.nth_unchecked(coord_dim).is_nan())
+        (0..self.dim.size()).all(|coord_dim| self.nth_or_panic(coord_dim).is_nan())
     }
 }
 
@@ -92,7 +92,7 @@ impl CoordTrait for InterleavedCoord<'_> {
         self.dim.into()
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         debug_assert!(n < self.dim.size());
         *self.coords.get(self.i * self.dim.size() + n).unwrap()
     }
@@ -113,7 +113,7 @@ impl CoordTrait for &InterleavedCoord<'_> {
         self.dim.into()
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         debug_assert!(n < self.dim.size());
         *self.coords.get(self.i * self.dim.size() + n).unwrap()
     }

diff --git a/rust/geoarrow/src/scalar/coord/separated/scalar.rs b/rust/geoarrow/src/scalar/coord/separated/scalar.rs
@@ -17,7 +17,7 @@ pub struct SeparatedCoord<'a> {
 impl<'a> SeparatedCoord<'a> {
     /// Return `true` if all values in the coordinate are f64::NAN
     pub(crate) fn is_nan(&self) -> bool {
-        (0..self.dim.size()).all(|coord_dim| self.nth_unchecked(coord_dim).is_nan())
+        (0..self.dim.size()).all(|coord_dim| self.nth_or_panic(coord_dim).is_nan())
     }
 }
 
@@ -90,7 +90,7 @@ impl CoordTrait for SeparatedCoord<'_> {
         self.dim.into()
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         self.buffers[n][self.i]
     }
 
@@ -110,7 +110,7 @@ impl CoordTrait for &SeparatedCoord<'_> {
         self.dim.into()
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         self.buffers[n][self.i]
     }
 

diff --git a/rust/geoarrow/src/test/point.rs b/rust/geoarrow/src/test/point.rs
@@ -54,7 +54,7 @@ impl CoordTrait for CoordZ {
         geo_traits::Dimensions::Xyz
     }
 
-    fn nth_unchecked(&self, n: usize) -> Self::T {
+    fn nth_or_panic(&self, n: usize) -> Self::T {
         match n {
             0 => self.x,
             1 => self.y,