From 8491d4a7154b449eb1f72dfa48bd17c8108167d4 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 10 Jan 2024 14:57:58 -0800 Subject: [PATCH 1/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 From e69422770d138182fd804a4b39c2064ef0fc3c01 Mon Sep 17 00:00:00 2001 From: Kyle Barron Date: Mon, 12 Feb 2024 17:07:12 -0500 Subject: [PATCH 2/3] Update changelog --- geozero/CHANGELOG.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/geozero/CHANGELOG.md b/geozero/CHANGELOG.md index 98f90629..b89026c4 100644 --- a/geozero/CHANGELOG.md +++ b/geozero/CHANGELOG.md @@ -1,10 +1,19 @@ ## 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. +* Remove Arrow mod, point to the updated and expanded geozero integration in the `geoarrow` crate (#186) + * There are two different Rust arrow implementations, `arrow` and `arrow2`. geozero's existing integration used `arrow2`, which is [now defunct](https://github.com/jorgecarleitao/arrow2?tab=readme-ov-file#this-crate-is-unmaintained). The `geoarrow` crate uses the maintained `arrow` crate. + * The GeoArrow spec is much broader than what was implemented here in geozero. In particular, GeoArrow defines both "[serialized](https://github.com/geoarrow/geoarrow/blob/v0.1.0/format.md#serialized-encodings)" and "[native](https://github.com/geoarrow/geoarrow/blob/v0.1.0/format.md#native-encoding)" encodings. The existing geozero code supported only a tiny fraction of that: read-only from the WKB serialized encoding. The current `geoarrow` crate supports read-write from/to a GeoArrow WKB array but _also_ to/from all the native encodings. + * The `geoarrow` crate also includes reading and writing to GeoParquet. +* Add GeoJsonLineReader to top-level documentation (#192) +* Add GeoJsonLineWriter (#193) +* Breaking: Make WKB and WKT generic over `AsRef<[u8]>` (#188) +* Improved trait documentation (#183) +* 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. (#190) * 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 +* Configure for merge queue #194 ## 0.11.0 (2023-08-28) @@ -197,7 +206,7 @@ * Add geo-types writer * Impl FeatureProcessor for GeoJSON reader -* Change Reader::open to Read + Seek trait +* Change Reader::open to Read + Seek trait ## 0.2.0 (2020-04-20) From 644844e4f51086e8f7cad0de270817076b0d6ea1 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 13 Feb 2024 11:19:26 -0800 Subject: [PATCH 3/3] prepare for 0.12.0 release --- Cargo.toml | 5 +++-- geozero/CHANGELOG.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 42fe3ec8..effcf21d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ resolver = "2" [workspace.package] # This version should match the version in [workspace.dependencies] below -version = "0.11.0" +version = "0.12.0" authors = ["Pirmin Kalberer ", "Yuri Astrakhan "] edition = "2021" homepage = "https://github.com/georust/geozero" @@ -18,7 +18,7 @@ license = "MIT OR Apache-2.0" # This should point to the last published version # This is a major hack, due to some code (like geozero tests!) relying on flatgeobuf crate, # which in turn relies on geozero itself. -geozero = { version = "0.11.0", default-features = false } +geozero = { version = "0.12.0", default-features = false } async-trait = "0.1" byteorder = { version = "1.4.3", default-features = false } @@ -61,3 +61,4 @@ wkt = "0.10.3" [patch.crates-io] geozero = { path = "./geozero" } #flatgeobuf = { path = "../../gis/flatgeobuf/src/rust" } +flatgeobuf = { git = "https://github.com/michaelkirk/flatgeobuf", branch = "mkirk/geozero-0.12.0" } diff --git a/geozero/CHANGELOG.md b/geozero/CHANGELOG.md index b89026c4..42cf6b44 100644 --- a/geozero/CHANGELOG.md +++ b/geozero/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.12.0 - (release date TBD) +## 0.12.0 - (2024-02-13) * Remove Arrow mod, point to the updated and expanded geozero integration in the `geoarrow` crate (#186) * There are two different Rust arrow implementations, `arrow` and `arrow2`. geozero's existing integration used `arrow2`, which is [now defunct](https://github.com/jorgecarleitao/arrow2?tab=readme-ov-file#this-crate-is-unmaintained). The `geoarrow` crate uses the maintained `arrow` crate.