-
Notifications
You must be signed in to change notification settings - Fork 1
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
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
27ab429
support for reading geopandas geoseries
nmandery fb8fe56
feature for activating auto-initialize pyo3 in tests
nmandery 946c2bd
run CI on linux, win, mac
nmandery 733634e
ci: install python3.8 on macos
nmandery d04379a
one wrapping layer less
nmandery 955770e
rename GeoSeries to GeometrySeries
nmandery 9403fe6
Added support to exchange `Vec<Geometry>` with python
nmandery 03eb4bf
enable wkb
nmandery b3b6c55
clippy fixes
nmandery 188dad5
Merge branch 'main' into geopandas
nmandery 9363899
use locals instead of globals
nmandery 62543fa
disable ci on windows as there are no fiona wheels on windows
nmandery File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.