Merge pull request #186 from kylebarron/kyle/remove-arrow

Remove Arrow mod, point to geoarrow crate
georust · Feb 12, 2024 · c1e7b30 · c1e7b30
2 parents 625f07d + 34db004
commit c1e7b30
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 77 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,6 @@ license = "MIT OR Apache-2.0"
 # which in turn relies on geozero itself.
 geozero = { version = "0.11.0", default-features = false }
 
-arrow2 = { version = "0.17", features = ["io_ipc"] }
 async-trait = "0.1"
 byteorder = { version = "1.4.3", default-features = false }
 bytes = "1.4"

diff --git a/README.md b/README.md
@@ -29,7 +29,6 @@ Supported dimensions: X, Y, Z, M, T
   - GeoPackage geometries for [SQLx](https://github.com/launchbadge/sqlx)
 * [WKT](https://github.com/georust/wkt) Reader + Writer
 * CSV Reader + Writer
-* GeoArrow WKB reader
 * SVG Writer
 * [geo-types](https://github.com/georust/geo) Reader + Writer
 * MVT (Mapbox Vector Tiles) Reader + Writer
@@ -45,6 +44,12 @@ Supported dimensions: X, Y, Z, M, T
 
 * FlatGeobuf Reader
 
+[geoarrow](https://github.com/geoarrow/geoarrow-rs) [![crates.io version](https://img.shields.io/crates/v/geoarrow.svg)](https://crates.io/crates/geoarrow)
+[![docs.rs docs](https://docs.rs/geoarrow/badge.svg)](https://docs.rs/geoarrow)
+
+* GeoArrow Reader and Writer
+* GeoParquet Reader and Writer
+
 ## Applications
 
 * [flatgeobuf-gpu](https://github.com/pka/flatgeobuf-gpu): Demo rendering FlatGeobuf to GPU
@@ -157,7 +162,7 @@ let _ = sqlx::query(
 .await?;
 ```
 
-Using compile-time verification requires [type overrides](https://docs.rs/sqlx/latest/sqlx/macro.query.html#force-a-differentcustom-type): 
+Using compile-time verification requires [type overrides](https://docs.rs/sqlx/latest/sqlx/macro.query.html#force-a-differentcustom-type):
 ```rust,ignore
 let _ = sqlx::query!(
     "INSERT INTO point2d (datetimefield, geom) VALUES(now(), $1::geometry)",

diff --git a/geozero/Cargo.toml b/geozero/Cargo.toml
@@ -13,7 +13,6 @@ license.workspace = true
 
 [features]
 default = ["with-svg", "with-wkt", "with-geo", "with-geojson"]
-with-arrow = ["dep:arrow2"]
 with-csv = ["dep:csv", "with-wkt"]
 with-gdal = ["dep:gdal"]
 with-gdal-bindgen = ["with-gdal", "gdal?/bindgen"]
@@ -37,7 +36,6 @@ serde_json.workspace = true
 thiserror.workspace = true
 
 # Optional dependencies
-arrow2 = { workspace = true, optional = true }
 byteorder = { workspace = true, optional = true }
 bytes = { workspace = true, optional = true }
 csv = { workspace = true, optional = true }

diff --git a/geozero/src/arrow/geoarrow_reader.rs b/geozero/src/arrow/geoarrow_reader.rs
diff --git a/geozero/src/arrow/mod.rs b/geozero/src/arrow/mod.rs
diff --git a/geozero/src/lib.rs b/geozero/src/lib.rs
@@ -14,6 +14,7 @@
 //! Available implementations:
 //! * [geozero-shp](https://docs.rs/geozero-shp)
 //! * [flatgeobuf](https://docs.rs/flatgeobuf)
+//! * [geoarrow](https://docs.rs/geoarrow)
 //!
 //! ## Format conversion overview
 //!
@@ -22,7 +23,6 @@
 //! | CSV           | [csv::Csv], [csv::CsvString]                                                                                             | XY         | -                                                                                    | [ProcessToCsv]      | [CsvWriter](csv::CsvWriter)                     |
 //! | GDAL          | `gdal::vector::Geometry`                                                                                                 | XYZ        | -                                                                                    | [ToGdal]            | [GdalWriter](gdal::GdalWriter)                  |
 //! | geo-types     | `geo_types::Geometry<f64>`                                                                                               | XY         | -                                                                                    | [ToGeo]             | [GeoWriter](geo_types::GeoWriter)               |
-//! | GeoArrow      | `arrow2::array::BinaryArray`                                                                                             | XY         | -                                                                                    | -                   | -                                               |
 //! | GeoJSON       | [GeoJson](geojson::GeoJson), [GeoJsonString](geojson::GeoJsonString)                                                     | XYZ        | [GeoJsonReader](geojson::GeoJsonReader), [GeoJson](geojson::GeoJson)                 | [ToJson]            | [GeoJsonWriter](geojson::GeoJsonWriter)         |
 //! | GeoJSON Lines |                                                                                                                          | XYZ        | [GeoJsonLineReader](geojson::GeoJsonLineReader)                                      |                     | [GeoJsonLineWriter](geojson::GeoJsonLineWriter) |
 //! | GEOS          | `geos::Geometry`                                                                                                         | XYZ        | -                                                                                    | [ToGeos]            | [GeosWriter](geos::GeosWriter)                  |
@@ -61,9 +61,6 @@ pub use geometry_processor::*;
 pub use multiplex::*;
 pub use property_processor::*;
 
-#[cfg(feature = "with-arrow")]
-pub mod arrow;
-
 #[cfg(feature = "with-csv")]
 pub mod csv;
 #[cfg(feature = "with-csv")]