Skip to content

Commit

Permalink
Handle geopandas and shapely geometries via __geo_interface__ link (#…
Browse files Browse the repository at this point in the history
…1000)

Initial stab at allowing PyGMT to accept Python objects
that implement __geo_interface__, i.e. a GeoJSON-like
format. Works by conversion to a temporary OGR_GMT file,
which can then be read natively by GMT . This is currently
tested via `pygmt.info` in test_geopandas.py on a
geopandas.GeoDataFrame object only. Will handle raw
GeoJSON dict-like objects properly via fiona in subsequent
iterations.

* Add intersphinx mapping to geopandas docs
* Create tempfile_from_geojson function to handle __geo_interface__
* Add geopandas.GeoDataFrame to list of allowed table inputs to info
* Handle generic __geo_interface__ objects via fiona and geopandas

Hacky attempt to handle non-geopandas objects (e.g.
shapely.geometry) that have a __geo_interface__ dictionary
property associated with it. Still assumes that geopandas
is installed (along with fiona), so not a perfect solution.
Also added another test with different geometry types.

* Install geopandas on the Python 3.9/NumPy 1.20 test build only
* Mention optional geopandas dependency in install and maintenance docs
* Tweak tempfile_from_geojson docstring and remove unused fiona code
* Add geopandas.GeoDataFrame to standardized table-classes filler text

Co-authored-by: Michael Grund <[email protected]>
  • Loading branch information
weiji14 and michaelgrund authored May 18, 2021
1 parent ddec7c8 commit 5695f17
Show file tree
Hide file tree
Showing 10 changed files with 145 additions and 16 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,14 @@ jobs:
# python-version: 3.7
# isDraft: true
# Pair Python 3.7 with NumPy 1.17 and Python 3.9 with NumPy 1.20
# Only install optional packages on Python 3.9/NumPy 1.20
include:
- python-version: 3.7
numpy-version: '1.17'
optional-packages: ''
- python-version: 3.9
numpy-version: '1.20'
optional-packages: 'geopandas'
defaults:
run:
shell: bash -l {0}
Expand Down Expand Up @@ -89,6 +92,7 @@ jobs:
conda install -c conda-forge/label/dev gmt=6.2.0rc1
conda install numpy=${{ matrix.numpy-version }} \
pandas xarray netCDF4 packaging \
${{ matrix.optional-packages }} \
codecov coverage[toml] dvc ipython make \
pytest-cov pytest-mpl pytest>=6.0 \
sphinx-gallery
Expand Down
1 change: 1 addition & 0 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
# intersphinx configuration
intersphinx_mapping = {
"python": ("https://docs.python.org/3/", None),
"geopandas": ("https://geopandas.org/", None),
"numpy": ("https://numpy.org/doc/stable/", None),
"pandas": ("https://pandas.pydata.org/pandas-docs/stable/", None),
"xarray": ("https://xarray.pydata.org/en/stable/", None),
Expand Down
5 changes: 3 additions & 2 deletions doc/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,10 @@ PyGMT requires the following libraries to be installed:
* `netCDF4 <https://unidata.github.io/netcdf4-python>`__
* `packaging <https://packaging.pypa.io>`__

The following are optional (but recommended) dependencies:
The following are optional dependencies:

* `IPython <https://ipython.org>`__: For embedding the figures in Jupyter notebooks.
* `IPython <https://ipython.org>`__: For embedding the figures in Jupyter notebooks (recommended).
* `GeoPandas <https://geopandas.org>`__: For using and plotting GeoDataFrame objects.

Installing GMT and other dependencies
-------------------------------------
Expand Down
9 changes: 6 additions & 3 deletions doc/maintenance.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,12 @@ There are 9 configuration files located in `.github/workflows`:

This is run on every commit to the *master* and Pull Request branches.
It is also scheduled to run daily on the *master* branch.
In draft Pull Requests, only two jobs on Linux (minimum NEP29 Python/NumPy versions
and latest Python/NumPy versions) are triggered to save on Continuous Integration
resources.
In draft Pull Requests, only two jobs on Linux are triggered to save on
Continuous Integration resources:

- Minimum [NEP29](https://numpy.org/neps/nep-0029-deprecation_policy)
Python/NumPy versions
- Latest Python/NumPy versions + optional packages (e.g. GeoPandas)

3. `ci_docs.yml` (Build documentation on Linux/macOS/Windows)

Expand Down
14 changes: 10 additions & 4 deletions pygmt/clib/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
GMTInvalidInput,
GMTVersionError,
)
from pygmt.helpers import data_kind, dummy_context, fmt_docstring
from pygmt.helpers import data_kind, dummy_context, fmt_docstring, tempfile_from_geojson

FAMILIES = [
"GMT_IS_DATASET",
Expand Down Expand Up @@ -1418,12 +1418,18 @@ def virtualfile_from_data(

if check_kind == "raster" and kind not in ("file", "grid"):
raise GMTInvalidInput(f"Unrecognized data type for grid: {type(data)}")
if check_kind == "vector" and kind not in ("file", "matrix", "vectors"):
raise GMTInvalidInput(f"Unrecognized data type: {type(data)}")
if check_kind == "vector" and kind not in (
"file",
"matrix",
"vectors",
"geojson",
):
raise GMTInvalidInput(f"Unrecognized data type for vector: {type(data)}")

# Decide which virtualfile_from_ function to use
_virtualfile_from = {
"file": dummy_context,
"geojson": tempfile_from_geojson,
"grid": self.virtualfile_from_grid,
# Note: virtualfile_from_matrix is not used because a matrix can be
# converted to vectors instead, and using vectors allows for better
Expand All @@ -1433,7 +1439,7 @@ def virtualfile_from_data(
}[kind]

# Ensure the data is an iterable (Python list or tuple)
if kind in ("file", "grid"):
if kind in ("file", "geojson", "grid"):
_data = (data,)
elif kind == "vectors":
_data = [np.atleast_1d(x), np.atleast_1d(y)]
Expand Down
2 changes: 1 addition & 1 deletion pygmt/helpers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
kwargs_to_strings,
use_alias,
)
from pygmt.helpers.tempfile import GMTTempFile, unique_name
from pygmt.helpers.tempfile import GMTTempFile, tempfile_from_geojson, unique_name
from pygmt.helpers.utils import (
args_in_kwargs,
build_arg_string,
Expand Down
14 changes: 8 additions & 6 deletions pygmt/helpers/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,12 @@ def fmt_docstring(module_func):
<BLANKLINE>
Parameters
----------
data : str or numpy.ndarray or pandas.DataFrame or xarray.Dataset
data : str or numpy.ndarray or pandas.DataFrame or xarray.Dataset or geo...
Pass in either a file name to an ASCII data table, a 2D
:class:`numpy.ndarray`, a :class:`pandas.DataFrame`, or an
:class:`numpy.ndarray`, a :class:`pandas.DataFrame`, an
:class:`xarray.Dataset` made up of 1D :class:`xarray.DataArray`
data variables containing the tabular data.
data variables, or a :class:`geopandas.GeoDataFrame` containing the
tabular data.
region : str or list
*Required if this is the first plot command*.
*xmin/xmax/ymin/ymax*\ [**+r**][**+u**\ *unit*].
Expand Down Expand Up @@ -237,13 +238,14 @@ def fmt_docstring(module_func):
"numpy.ndarray",
"pandas.DataFrame",
"xarray.Dataset",
# "geopandas.GeoDataFrame",
"geopandas.GeoDataFrame",
]
)
filler_text["table-classes"] = (
":class:`numpy.ndarray`, a :class:`pandas.DataFrame`, or an\n"
":class:`numpy.ndarray`, a :class:`pandas.DataFrame`, an\n"
" :class:`xarray.Dataset` made up of 1D :class:`xarray.DataArray`\n"
" data variables containing the tabular data"
" data variables, or a :class:`geopandas.GeoDataFrame` containing the\n"
" tabular data"
)

for marker, text in COMMON_OPTIONS.items():
Expand Down
44 changes: 44 additions & 0 deletions pygmt/helpers/tempfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""
import os
import uuid
from contextlib import contextmanager
from tempfile import NamedTemporaryFile

import numpy as np
Expand Down Expand Up @@ -104,3 +105,46 @@ def loadtxt(self, **kwargs):
Data read from the text file.
"""
return np.loadtxt(self.name, **kwargs)


@contextmanager
def tempfile_from_geojson(geojson):
"""
Saves any geo-like Python object which implements ``__geo_interface__``
(e.g. a geopandas.GeoDataFrame or shapely.geometry) to a temporary OGR_GMT
text file.
Parameters
----------
geojson : geopandas.GeoDataFrame
A geopandas GeoDataFrame, or any geo-like Python object which
implements __geo_interface__, i.e. a GeoJSON.
Yields
------
tmpfilename : str
A temporary OGR_GMT format file holding the geographical data.
E.g. '1a2b3c4d5e6.gmt'.
"""
with GMTTempFile(suffix=".gmt") as tmpfile:
os.remove(tmpfile.name) # ensure file is deleted first
ogrgmt_kwargs = dict(filename=tmpfile.name, driver="OGR_GMT", mode="w")
try:
# Using geopandas.to_file to directly export to OGR_GMT format
geojson.to_file(**ogrgmt_kwargs)
except AttributeError:
# pylint: disable=import-outside-toplevel
# Other 'geo' formats which implement __geo_interface__
import json

import fiona
import geopandas as gpd

with fiona.Env():
jsontext = json.dumps(geojson.__geo_interface__)
# Do Input/Output via Fiona virtual memory
with fiona.io.MemoryFile(file_or_bytes=jsontext.encode()) as memfile:
geoseries = gpd.GeoSeries.from_file(filename=memfile)
geoseries.to_file(**ogrgmt_kwargs)

yield tmpfile.name
2 changes: 2 additions & 0 deletions pygmt/helpers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ def data_kind(data, x=None, y=None, z=None):
kind = "file"
elif isinstance(data, xr.DataArray):
kind = "grid"
elif hasattr(data, "__geo_interface__"):
kind = "geojson"
elif data is not None:
kind = "matrix"
else:
Expand Down
66 changes: 66 additions & 0 deletions pygmt/tests/test_geopandas.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
"""
Tests on integration with geopandas.
"""
import numpy.testing as npt
import pytest
from pygmt import info

gpd = pytest.importorskip("geopandas")
shapely = pytest.importorskip("shapely")


@pytest.fixture(scope="module", name="gdf")
def fixture_gdf():
"""
Create a sample geopandas GeoDataFrame object with shapely geometries of
different types.
"""
linestring = shapely.geometry.LineString([(20, 15), (30, 15)])
polygon = shapely.geometry.Polygon([(20, 10), (23, 10), (23, 14), (20, 14)])
multipolygon = shapely.geometry.shape(
{
"type": "MultiPolygon",
"coordinates": [
[
[[0, 0], [20, 0], [10, 20], [0, 0]], # Counter-clockwise
[[3, 2], [10, 16], [17, 2], [3, 2]], # Clockwise
],
[[[6, 4], [14, 4], [10, 12], [6, 4]]], # Counter-clockwise
[[[25, 5], [30, 10], [35, 5], [25, 5]]],
],
}
)
# Multipolygon first so the OGR_GMT file has @GMULTIPOLYGON in the header
gdf = gpd.GeoDataFrame(
index=["multipolygon", "polygon", "linestring"],
geometry=[multipolygon, polygon, linestring],
)

return gdf


def test_geopandas_info_geodataframe(gdf):
"""
Check that info can return the bounding box region from a
geopandas.GeoDataFrame.
"""
output = info(table=gdf, per_column=True)
npt.assert_allclose(actual=output, desired=[0.0, 35.0, 0.0, 20.0])


@pytest.mark.parametrize(
"geomtype,desired",
[
("multipolygon", [0.0, 35.0, 0.0, 20.0]),
("polygon", [20.0, 23.0, 10.0, 14.0]),
("linestring", [20.0, 30.0, 15.0, 15.0]),
],
)
def test_geopandas_info_shapely(gdf, geomtype, desired):
"""
Check that info can return the bounding box region from a shapely.geometry
object that has a __geo_interface__ property.
"""
geom = gdf.loc[geomtype].geometry
output = info(table=geom, per_column=True)
npt.assert_allclose(actual=output, desired=desired)

0 comments on commit 5695f17

Please sign in to comment.