From 5c8a841be0cd2c45c10961ba5b83adbc297ea136 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 10 Jan 2024 14:42:54 -0800 Subject: [PATCH 1/3] Fix clippy: remove superfluous use statements These modules only contain trait implementations, which don't need to be `use`'d --- geozero-shp/src/lib.rs | 1 - geozero/src/gpkg/mod.rs | 2 -- geozero/src/postgis/mod.rs | 9 ++------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/geozero-shp/src/lib.rs b/geozero-shp/src/lib.rs index 817ca62a..25b6ac13 100644 --- a/geozero-shp/src/lib.rs +++ b/geozero-shp/src/lib.rs @@ -6,7 +6,6 @@ mod shp_reader; mod shx_reader; pub use crate::header::ShapeType; -pub use crate::property_processor::*; pub use crate::reader::Reader; pub use crate::shp_reader::NO_DATA; diff --git a/geozero/src/gpkg/mod.rs b/geozero/src/gpkg/mod.rs index e174e11b..310810c6 100644 --- a/geozero/src/gpkg/mod.rs +++ b/geozero/src/gpkg/mod.rs @@ -28,5 +28,3 @@ //! ``` mod geopackage; - -pub use geopackage::*; diff --git a/geozero/src/postgis/mod.rs b/geozero/src/postgis/mod.rs index 1622c5a5..bcaa4415 100644 --- a/geozero/src/postgis/mod.rs +++ b/geozero/src/postgis/mod.rs @@ -44,10 +44,7 @@ mod postgis_sqlx; /// # Ok(()) /// # } ///``` -#[cfg(feature = "with-postgis-postgres")] -pub mod postgres { - pub use super::postgis_postgres::*; -} +pub mod postgres {} /// PostGIS geometry type encoding/decoding for SQLx. /// @@ -89,9 +86,7 @@ pub mod postgres { /// # } /// ``` #[cfg(feature = "with-postgis-sqlx")] -pub mod sqlx { - pub use super::postgis_sqlx::*; -} +pub mod sqlx {} /// Postgis geometry type encoding for Diesel. /// From a224cddad9e63319a010bac15d904909d676b2f5 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 10 Jan 2024 14:36:01 -0800 Subject: [PATCH 2/3] expose feature for gdal with bindgen This is necessary for linking against gdal versions whose bindings aren't yet included in gdal-sys, which is common when using a newly released gdal. Also removed redundant gdal-sys dependency - gdal already includes that, and geozero doesn't use it directly. --- geozero/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/geozero/Cargo.toml b/geozero/Cargo.toml index c83a8bc2..ea3c1b8d 100644 --- a/geozero/Cargo.toml +++ b/geozero/Cargo.toml @@ -15,7 +15,8 @@ license.workspace = true default = ["with-svg", "with-wkt", "with-geo", "with-geojson"] with-arrow = ["dep:arrow2"] with-csv = ["dep:csv", "with-wkt"] -with-gdal = ["dep:gdal", "dep:gdal-sys"] +with-gdal = ["dep:gdal"] +with-gdal-bindgen = [ "with-gdal", "gdal?/bindgen" ] with-geo = ["dep:geo-types"] with-geojson = ["dep:geojson"] with-geos = ["dep:geos"] From f1c64ffb07f23b8e6022e22bb67bc7629e1dc5c8 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 10 Jan 2024 14:57:58 -0800 Subject: [PATCH 3/3] Release notes --- geozero/CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/geozero/CHANGELOG.md b/geozero/CHANGELOG.md index caeceef3..98f90629 100644 --- a/geozero/CHANGELOG.md +++ b/geozero/CHANGELOG.md @@ -1,3 +1,11 @@ +## 0.12.0 - (release date TBD) + +* Added feature `with-gdal-bindgen` to build gdal support with the `bindgen` feature. This is useful when building against a recent gdal, for which the project hasn't yet pre-built bindings. +* Breaking: update flatgeobuf to 4.0.0 +* Update errors to include more detail +* Update Wkb to allow non-owned buffers +* Fix `with-mvt` feature no longer requires `protoc` runtime dependency + ## 0.11.0 (2023-08-28) * Add support for raw WKB DB queries