Skip to content

Commit cbae952

Browse files
authored
pygmt.grdlandmask: Refactor to use the new alias system for bordervalues/maskvalues (#4031)
1 parent 3788d90 commit cbae952

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

pygmt/src/grdlandmask.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import xarray as xr
99
from pygmt._typing import PathLike
10+
from pygmt.alias import Alias, AliasSystem
1011
from pygmt.clib import Session
1112
from pygmt.exceptions import GMTInvalidInput
1213
from pygmt.helpers import (
1314
build_arg_list,
1415
fmt_docstring,
1516
kwargs_to_strings,
16-
sequence_join,
1717
use_alias,
1818
)
1919
from pygmt.src._common import _parse_coastline_resolution
@@ -25,9 +25,7 @@
2525
@use_alias(
2626
A="area_thresh",
2727
D="resolution-",
28-
E="bordervalues-",
2928
I="spacing",
30-
N="maskvalues-",
3129
R="region",
3230
V="verbose",
3331
r="registration",
@@ -55,6 +53,8 @@ def grdlandmask(
5553
Full GMT docs at :gmt-docs:`grdlandmask.html`.
5654
5755
{aliases}
56+
- E=bordervalues
57+
- N=maskvalues
5858
5959
Parameters
6060
----------
@@ -119,11 +119,14 @@ def grdlandmask(
119119
raise GMTInvalidInput(msg)
120120

121121
kwargs["D"] = kwargs.get("D", _parse_coastline_resolution(resolution))
122-
kwargs["N"] = sequence_join(maskvalues, size=(2, 5), name="maskvalues")
123-
kwargs["E"] = sequence_join(bordervalues, size=(1, 4), name="bordervalues")
122+
123+
aliasdict = AliasSystem(
124+
N=Alias(maskvalues, name="maskvalues", sep="/", size=(2, 5)),
125+
E=Alias(bordervalues, name="bordervalues", sep="/", size=4),
126+
).merge(kwargs)
124127

125128
with Session() as lib:
126129
with lib.virtualfile_out(kind="grid", fname=outgrid) as voutgrd:
127-
kwargs["G"] = voutgrd
128-
lib.call_module(module="grdlandmask", args=build_arg_list(kwargs))
130+
aliasdict["G"] = voutgrd
131+
lib.call_module(module="grdlandmask", args=build_arg_list(aliasdict))
129132
return lib.virtualfile_to_raster(vfname=voutgrd, outgrid=outgrid)

0 commit comments

Comments
 (0)