Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Arrow mod, point to geoarrow crate #186

Merged
merged 3 commits into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)",
Expand Down
2 changes: 0 additions & 2 deletions geozero/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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 }
Expand Down
63 changes: 0 additions & 63 deletions geozero/src/arrow/geoarrow_reader.rs

This file was deleted.

5 changes: 0 additions & 5 deletions geozero/src/arrow/mod.rs

This file was deleted.

5 changes: 1 addition & 4 deletions geozero/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
//!
Expand All @@ -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) |
Expand Down Expand Up @@ -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")]
Expand Down
Loading