Skip to content

load_earth_mask: Keep data's encoding to correctly infer data's registration and gtype information #2632

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.

Sign up for GitHub

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
seisman merged 3 commits into from
Aug 16, 2023
Merged

load_earth_mask: Keep data's encoding to correctly infer data's registration and gtype information #2632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa8b4b0
load_earth_mask: Fix dataset's gtype information
seisman Aug 16, 2023
ed2b8bb
Add a test to make sure the mask grid is a Geographic grid
seisman Aug 16, 2023
e1d3352
Update pygmt/tests/test_datasets_earth_mask.py
seisman Aug 16, 2023
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
5 changes: 4 additions & 1 deletion pygmt/datasets/earth_mask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,7 @@ def load_earth_mask(resolution="01d", region=None, registration=None):
region=region,
registration=registration,
)
return grid.astype("int8")
# `return grid.astype("int8")` doesn't work because grid encoding is lost.
# See https://github.com/GenericMappingTools/pygmt/issues/2629.
grid.data = grid.data.astype("int8")
return grid
3 changes: 3 additions & 0 deletions pygmt/tests/test_datasets_earth_mask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def test_earth_mask_01d():
assert data.attrs["horizontal_datum"] == "WGS84"
assert data.shape == (181, 361)
assert data.gmt.registration == 0
assert data.gmt.gtype == 1
assert data.dtype == "int8"
npt.assert_allclose(data.lat, np.arange(-90, 91, 1))
npt.assert_allclose(data.lon, np.arange(-180, 181, 1))
Expand All @@ -52,6 +53,8 @@ def test_earth_mask_01d_with_region():
data = load_earth_mask(resolution="01d", region=[-7, 4, 13, 19])
assert data.shape == (7, 12)
assert data.gmt.registration == 0
assert data.gmt.gtype == 1
assert data.dtype == "int8"
npt.assert_allclose(data.lat, np.arange(13, 20, 1))
npt.assert_allclose(data.lon, np.arange(-7, 5, 1))
npt.assert_allclose(data[1, 5], 1)