update deps

Cargo.toml

@@ -17,23 +17,22 @@ license = "MIT OR Apache-2.0"
 # Used in geozero-cli and geozero-bench
 # geozero version must be in sync with flatgeobuf version!
 geozero = { version = "0.14.0", default-features = false }
-# flatgeobuf had a breaking (!) change released in 4.5.0, so we'll pin until we adapt to the new version.
-flatgeobuf = ">=4.4.0,<4.5.0"
+flatgeobuf = "4.5.0"
 
 async-trait = "0.1"
 byteorder = { version = "1.4.3", default-features = false }
 bytes = "1.4"
 clap = { version = "4.3", features = ["derive"] }
 criterion = "0.5.1"
 csv = "1.2.2"
-dbase = "0.4"
+dbase = "0.5.0"
 diesel = { version = "2.2.3", default-features = false, features = ["postgres"] }
-dup-indexer = "0.3"
-env_logger = "0.10.0"
+dup-indexer = "0.4.0"
+env_logger = "0.11.5"
 futures-util = "0.3.28"
-gdal = { version = "0.16", default-features = false }
-gdal-sys = "0.9"
-geo = "0.26.0"
+gdal = { version = "0.17.1", default-features = false }
+gdal-sys = "0.10.0"
+geo = "0.29.3"
 geo-types = { version = "0.7.11", default-features = false }
 geojson = { version = "0.24.1", default-features = false }
 geos = "9.0"
@@ -45,16 +44,16 @@ lyon = "1.0.1"
 postgis = "0.9.0"
 postgres = "0.19"
 postgres-types = "0.2"
-prost = "0.11.9"
+prost = "0.13.4"
 # NOTICE: When updating prost-build, remove geozero/src/mvt/vector_tile.rs to force a rebuild
-prost-build = "0.11.9"
-scroll = "0.11"
+prost-build = "0.13.4"
+scroll = "0.12.0"
 seek_bufread = "1.2"
 serde_json = "1.0.104"
 sqlx = { version = "0.8", default-features = false }
-thiserror = "1.0"
+thiserror = "2.0.7"
 tokio = { version = "1.30.0", default-features = false }
-wkt = "0.11"
+wkt = "0.12.0"
 
 [patch.crates-io]
 #geozero = { path = "./geozero" }

geozero-cli/src/main.rs

@@ -152,6 +152,9 @@ fn fgb_to_geozero_err(fgb_err: flatgeobuf::Error) -> GeozeroError {
             GeozeroError::Dataset(format!("Invalid Flatbuffer: {e}"))
         }
         flatgeobuf::Error::IO(io) => GeozeroError::IoError(io),
+        flatgeobuf::Error::UnsupportedGeometryType(error_message) => {
+            GeozeroError::Dataset(error_message)
+        }
     }
 }
 

geozero/src/mvt/vector_tile.rs

@@ -1,7 +1,7 @@
 // This file was automatically generated through the build.rs script, and should not be edited.
 // Remove this file to force a rebuild.
 
-#[allow(clippy::derive_partial_eq_without_eq)]
+// This file is @generated by prost-build.
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Tile {
     #[prost(message, repeated, tag = "3")]
@@ -11,7 +11,6 @@ pub struct Tile {
 pub mod tile {
     /// Variant type encoding
     /// The use of values is described in section 4.1 of the specification
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Value {
         /// Exactly one of these values must be present in a valid message
@@ -31,7 +30,6 @@ pub mod tile {
         pub bool_value: ::core::option::Option<bool>,
     }
     /// Features are described in section 4.2 of the specification
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Feature {
         #[prost(uint64, optional, tag = "1", default = "0")]
@@ -52,7 +50,6 @@ pub mod tile {
         pub geometry: ::prost::alloc::vec::Vec<u32>,
     }
     /// Layers are described in section 4.1 of the specification
-    #[allow(clippy::derive_partial_eq_without_eq)]
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct Layer {
         /// Any compliant implementation must first read the version
@@ -103,10 +100,10 @@ pub mod tile {
         /// (if the ProtoBuf definition does not change) and safe for programmatic use.
         pub fn as_str_name(&self) -> &'static str {
             match self {
-                GeomType::Unknown => "UNKNOWN",
-                GeomType::Point => "POINT",
-                GeomType::Linestring => "LINESTRING",
-                GeomType::Polygon => "POLYGON",
+                Self::Unknown => "UNKNOWN",
+                Self::Point => "POINT",
+                Self::Linestring => "LINESTRING",
+                Self::Polygon => "POLYGON",
             }
         }
         /// Creates an enum from field names used in the ProtoBuf definition.