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

Rudimentary support for geopandas geoseries #5

Merged
merged 12 commits into from
Sep 5, 2022
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- name: Install Python dependencies
run: |
pip install shapely
pip install shapely geopandas

- name: Test with cargo - default features
uses: actions-rs/[email protected]
Expand Down
53 changes: 53 additions & 0 deletions src/geopandas.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
use crate::wrappers::f64::GeometryInterface;
use pyo3::prelude::*;

#[derive(Debug)]
#[pyclass]
pub struct GeoSeries(pub Vec<GeometryInterface>);

impl<'source> FromPyObject<'source> for GeoSeries {
fn extract(ob: &'source PyAny) -> PyResult<Self> {
let mut geoms = vec![];
for item in ob.iter()? {
let item = item?;
geoms.push(GeometryInterface::extract(item)?);
}
geoms.shrink_to_fit();
Ok(GeoSeries(geoms))
}
}

pub trait AsGeoSeries {
/// Creates a `GeoSeries` from `self`
fn as_geoseries(&self) -> PyResult<GeoSeries>;
}

impl AsGeoSeries for PyAny {
fn as_geoseries(&self) -> PyResult<GeoSeries> {
GeoSeries::extract(self)
}
}

#[cfg(test)]
mod tests {
use crate::geopandas::AsGeoSeries;
use pyo3::{prepare_freethreaded_python, Python};

#[test]
fn geoseries_from_geopandas_geoseries() {
prepare_freethreaded_python();
let geoseries = Python::with_gil(|py| {
py.run(
r#"
import geopandas as gpd
world = gpd.read_file(gpd.datasets.get_path('naturalearth_lowres'))
"#,
None,
None,
)?;
py.eval(r#"world.geometry"#, None, None)?.as_geoseries()
})
.unwrap();
assert!(geoseries.0.len() > 100);
}
}
3 changes: 3 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ pub mod from_py;
pub mod to_py;
pub mod wrappers;

#[cfg(feature = "f64")]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you consider this being a different feature flag?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used the f64 feature as usescase of geopandas use the f64 coordinates anyways. The second thought was that this implementation would not cause much compilation overhead anyways, so I omitted creating an own feature for it.

pub mod geopandas;

#[cfg(feature = "wkb")]
pub mod wkb;

Expand Down