Return GeoDataFrame in the to_dataframe function #1681
Merged
Conversation
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
Jesus89
requested changes
Aug 27, 2020
| return dataframe | ||
| gdf = GeoDataFrame(dataframe) | ||
|
|
||
| if has_geometry(dataframe): |
There was a problem hiding this comment.
The function has_geometry check the geometry of an existing GeoDataFrame, not for a DataFrames, so this won't work. We should implement the following logic instead:
- Check if the existing dataframe contains a raw geom column if:
- The entity is a Geography or
- The entity is a Dataset and add_geom is True
- In every case check that the column is there and can be decoded:
- decode_geometry(df['geom'])
- If it works, create the GeoDataFrame with that geometry
- PD: we need to decide if we should keep the original geom column or not
Jesus89
reviewed
Aug 27, 2020
| @@ -75,6 +75,7 @@ def test_dataset_to_csv_private(self): | |||
| def test_dataset_to_dataframe_public(self): | |||
| df = public_dataset.to_dataframe(self.credentials, limit=PUBLIC_LIMIT) | |||
| assert isinstance(df, GeoDataFrame) | |||
| assert df.head().geom.type == 'Polygon' | |||
There was a problem hiding this comment.
I think you could access directly the column assert df.geom.type == 'Polygon'
There was a problem hiding this comment.
Yes, you are right, changing it 👍
Jesus89
approved these changes
Aug 27, 2020
Jesus89
deleted the
feature/ch99926/change-dataset-to-dataframe-to-return-geodataframe
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
GeoDataFramein theto_dataframefunctionassert isinstance(df, GeoDataFrame))