Bump geo to 0.27 (#263)

* Bump geodesy to 0.11 * Bump geo
geoarrow · Nov 21, 2023 · ddedb9f · ddedb9f
1 parent 8ac72c8
commit ddedb9f
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,13 +31,13 @@ arrow-schema = { git = "https://github.com/apache/arrow-rs", rev="fbbb61d9428216
 bumpalo = { version = "3", features = ["collections"] }
 byteorder = "1"
 # Set default-features = false because async not working in wasm right now
-flatgeobuf = { version = "3.27.0", optional = true, default-features = false }
-gdal = { version = "0.15", optional = true }
-geo = "0.26"
+flatgeobuf = { version = "4", optional = true, default-features = false }
+gdal = { version = "0.16", optional = true }
+geo = "0.27"
 geodesy = { version = "0.11", optional = true }
 geos = { version = "8.3", features = ["v3_10_0", "geo"], optional = true }
 geozero = { version = "0.11", features = ["with-wkb"], optional = true }
-itertools = "0.11"
+itertools = "0.12"
 num_enum = "0.7"
 proj = { version = "0.27.2", optional = true, features = [
   "pkg_config",

diff --git a/js/Cargo.lock b/js/Cargo.lock
diff --git a/js/Cargo.toml b/js/Cargo.toml
@@ -47,7 +47,7 @@ console_error_panic_hook = { version = "0.1.6", optional = true }
 
 geoarrow = { path = "../", package = "geoarrow2" }
 thiserror = "1"
-geo = "0.26"
+geo = "0.27"
 geodesy = { version = "0.11", optional = true, features = ["js"] }
 
 # Pass "wasm" and "thin" down to the transitive zstd dependency

diff --git a/python/geoarrow-rust/Cargo.lock b/python/geoarrow-rust/Cargo.lock
diff --git a/python/geoarrow-rust/Cargo.toml b/python/geoarrow-rust/Cargo.toml
@@ -17,9 +17,6 @@ name = "rust"
 crate-type = ["cdylib"]
 
 [dependencies]
-# arrow-array = "48"
-# arrow-buffer = "48"
-# arrow = "48"
 arrow-array = { git = "https://github.com/apache/arrow-rs", rev="fbbb61d94282165f9bb9f73fb4d00a3af16d4aee" }
 arrow-buffer = { git = "https://github.com/apache/arrow-rs", rev="fbbb61d94282165f9bb9f73fb4d00a3af16d4aee" }
 arrow = { git = "https://github.com/apache/arrow-rs", rev="fbbb61d94282165f9bb9f73fb4d00a3af16d4aee", features = ["ffi"] }
@@ -32,4 +29,4 @@ pyo3 = { version = "0.20.0", features = [
 ] }
 geoarrow = { path = "../../", package = "geoarrow2" }
 thiserror = "1"
-geo = "0.26"
+geo = "0.27"
diff --git a/src/error.rs b/src/error.rs
@@ -41,6 +41,10 @@ pub enum GeoArrowError {
     #[cfg(feature = "proj")]
     #[error(transparent)]
     ProjError(#[from] proj::ProjError),
+
+    #[cfg(feature = "flatgeobuf")]
+    #[error(transparent)]
+    FlatgeobufError(#[from] flatgeobuf::Error),
 }
 
 pub type Result<T> = std::result::Result<T, GeoArrowError>;