Skip to content

Change test_grdview.py to use static_earth_relief #1752

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

Merged
merged 7 commits into from
Feb 21, 2022
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
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_grdview_drapegrid_dataarray.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: d424deb92bd8cb8846cc43155e4d681b
size: 64256
- md5: 02f76ed01dc93f013dd5d70456d3d56e
size: 11732
path: test_grdview_drapegrid_dataarray.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_grdview_grid_dataarray.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 3d78a0f03717f55ccb18e7e926a82fd9
size: 6117
- md5: f28c636ae0fcd7518c53d72c4e11d6b0
size: 8835
path: test_grdview_grid_dataarray.png

This file was deleted.

4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_grdview_on_a_plane.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: df3969a299e8a72711bd71c105bf8536
size: 37840
- md5: a1391d3165dc83a99b36dc9f390167f3
size: 30369
path: test_grdview_on_a_plane.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 6f644dfa49aa144788ee877c6fd86f37
size: 38729
- md5: 6c47058d09e1b75f3d724692ff00b703
size: 32988
path: test_grdview_on_a_plane_styled_with_facadepen.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 7ca5b177d95e7839f137f1912777b495
size: 38182
- md5: 45d04e159cac6d5cc7f780707748fcca
size: 30821
path: test_grdview_on_a_plane_with_colored_frontal_facade.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 9da8c13aa8d2c1b1cb26da04ae477cce
size: 45741
- md5: 83acb7282135b4cc4491c3a5afe4679e
size: 43983
path: test_grdview_surface_mesh_plot_styled_with_meshpen.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: ae29730738ddc25623cc112447bc6f2a
size: 62181
- md5: b490c8a81b97cc54b42160115aac95c9
size: 67769
path: test_grdview_surface_plot_styled_with_contourpen.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 4a54af50c67c7c7818dc6b3be01047df
size: 68127
- md5: 4f8b5d492ab869c552739126a41e838c
size: 270012
path: test_grdview_with_cmap_for_image_plot.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 122aa9d570ec1261265faed6b9c3c285
size: 83556
- md5: c32ce35f51b3e11cb1c9b9fad9ef7a0a
size: 76504
path: test_grdview_with_cmap_for_perspective_surface_plot.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 994ba2d345a0ba313e85b69d7fd43f25
size: 96043
- md5: 152085fd81de3ad78b5c7ffb3cf0d080
size: 95530
path: test_grdview_with_cmap_for_surface_monochrome_plot.png
4 changes: 2 additions & 2 deletions pygmt/tests/baseline/test_grdview_with_perspective.png.dvc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 6b81f7b66b2793f96bfd855800b74048
size: 21631
- md5: f53fdc81b70335b8d7d30261a91969c0
size: 27943
path: test_grdview_with_perspective.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 1680961103f85fec593816463d9ad796
size: 216773
- md5: 101647c2769eb063abe1dab098a05320
size: 60384
path: test_grdview_with_perspective_and_zaxis_frame.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: e84757f6b9a02bcf8c7e1fbe2369f77b
size: 30484
- md5: 6074c0d7e5dcf0dc02df96de87d0d384
size: 26169
path: test_grdview_with_perspective_and_zscale.png
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
outs:
- md5: 48b05c4fcd3b16277ae94a310af2f5ce
size: 46070
- md5: b2db2a4e6d14b53ac960abd87aacb488
size: 38017
path: test_grdview_with_perspective_and_zsize.png
39 changes: 18 additions & 21 deletions pygmt/tests/test_grdview.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,44 @@
Tests grdview.
"""
import pytest
from pygmt import Figure, grdcut, which
from pygmt import Figure, grdcut
from pygmt.exceptions import GMTInvalidInput
from pygmt.helpers import GMTTempFile, data_kind
from pygmt.helpers.testing import load_static_earth_relief


@pytest.fixture(scope="module", name="region")
def fixture_region():
"""
Test region as lonmin, lonmax, latmin, latmax.
"""
return (-116, -109, -47, -44)
return [-55, -50, -18, -12]


@pytest.fixture(scope="module", name="grid")
def fixture_grid():
"""
Load the grid data from the static_earth_relief file.
"""
return load_static_earth_relief()


@pytest.fixture(scope="module", name="gridfile")
def fixture_gridfile(region):
def fixture_gridfile(grid, region):
"""
Load the NetCDF grid file from the sample earth_relief file.
"""
with GMTTempFile(suffix=".nc") as tmpfile:
grdcut(grid="@earth_relief_01d_g", region=region, outgrid=tmpfile.name)
grdcut(grid=grid, region=region, outgrid=tmpfile.name)
yield tmpfile.name


@pytest.fixture(scope="module", name="xrgrid")
def fixture_xrgrid(region):
def fixture_xrgrid(grid, region):
"""
Load the xarray.DataArray grid from the sample earth_relief file.
"""
return grdcut(grid="@earth_relief_01d_g", region=region)
return grdcut(grid=grid, region=region)


@pytest.mark.mpl_image_compare
Expand All @@ -43,18 +52,6 @@ def test_grdview_grid_dataarray(xrgrid):
return fig


@pytest.mark.mpl_image_compare
def test_grdview_grid_file_with_region_subset(region):
"""
Run grdview by passing in a grid filename, and cropping it to a region.
"""
gridfile = which("@earth_relief_01d_g", download="a")

fig = Figure()
fig.grdview(grid=gridfile, region=region)
return fig


def test_grdview_wrong_kind_of_grid(xrgrid):
"""
Run grdview using grid input that is not an xarray.DataArray or file.
Expand Down Expand Up @@ -145,7 +142,7 @@ def test_grdview_on_a_plane(xrgrid):
setting a 3D perspective viewpoint.
"""
fig = Figure()
fig.grdview(grid=xrgrid, plane=-4000, perspective=[225, 30], zscale=0.005)
fig.grdview(grid=xrgrid, plane=100, perspective=[225, 30], zscale=0.005)
return fig


Expand All @@ -156,7 +153,7 @@ def test_grdview_on_a_plane_with_colored_frontal_facade(xrgrid):
facade is colored gray, while setting a 3D perspective viewpoint.
"""
fig = Figure()
fig.grdview(grid=xrgrid, plane="-4000+ggray", perspective=[225, 30], zscale=0.005)
fig.grdview(grid=xrgrid, plane="100+ggray", perspective=[225, 30], zscale=0.005)
return fig


Expand Down Expand Up @@ -209,7 +206,7 @@ def test_grdview_on_a_plane_styled_with_facadepen(xrgrid):
fig = Figure()
fig.grdview(
grid=xrgrid,
plane=-4000,
plane=100,
perspective=[225, 30],
zscale=0.005,
facadepen="0.5p,blue,dash",
Expand Down