Skip to content

Commit 80e9e88

Browse files
pygmt.grdlandmask: Deprecate parameters bordervalues/maskvalues to broder_values/mask_values (Will be removed in v0.20.0) (#4281)
1 parent e656013 commit 80e9e88

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

examples/gallery/images/grdlandmask.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
==========================
44
55
The :func:`pygmt.grdlandmask` function allows setting all nodes on land
6-
or water to a specified value using the ``maskvalues`` parameter.
6+
or water to a specified value using the ``mask_values`` parameter.
77
"""
88

99
# %%
@@ -18,7 +18,9 @@
1818
# masses.
1919
# Use shoreline data with (l)ow resolution and set the grid spacing to
2020
# 5 arc-minutes in x- and y-directions.
21-
grid = pygmt.grdlandmask(region=region, spacing="5m", maskvalues=[0, 1], resolution="l")
21+
grid = pygmt.grdlandmask(
22+
region=region, spacing="5m", mask_values=[0, 1], resolution="l"
23+
)
2224

2325
# Plot clipped grid
2426
fig.basemap(region=region, projection="M12c", frame=True)

pygmt/src/grdlandmask.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,22 @@
1010
from pygmt.alias import Alias, AliasSystem
1111
from pygmt.clib import Session
1212
from pygmt.exceptions import GMTInvalidInput
13-
from pygmt.helpers import build_arg_list, fmt_docstring, use_alias
13+
from pygmt.helpers import build_arg_list, deprecate_parameter, fmt_docstring, use_alias
1414

1515
__doctest_skip__ = ["grdlandmask"]
1616

1717

1818
@fmt_docstring
19+
@deprecate_parameter("maskvalues", "mask_values", "v0.18.0", remove_version="v0.20.0")
20+
@deprecate_parameter(
21+
"bordervalues", "border_values", "v0.18.0", remove_version="v0.20.0"
22+
)
1923
@use_alias(A="area_thresh")
2024
def grdlandmask(
2125
outgrid: PathLike | None = None,
2226
spacing: Sequence[float | str] | None = None,
23-
maskvalues: Sequence[float] | None = None,
24-
bordervalues: bool | float | Sequence[float] | None = None,
27+
mask_values: Sequence[float] | None = None,
28+
border_values: bool | float | Sequence[float] | None = None,
2529
resolution: Literal[
2630
"auto", "full", "high", "intermediate", "low", "crude", None
2731
] = None,
@@ -45,9 +49,9 @@ def grdlandmask(
4549
4650
$aliases
4751
- D = resolution
48-
- E = bordervalues
52+
- E = border_values
4953
- I = spacing
50-
- N = maskvalues
54+
- N = mask_values
5155
- R = region
5256
- V = verbose
5357
- r = registration
@@ -68,15 +72,15 @@ def grdlandmask(
6872
mask file using one resolution is not guaranteed to remain inside [or outside]
6973
when a different resolution is selected. If ``None``, the low resolution is used
7074
by default.
71-
maskvalues
75+
mask_values
7276
Set the values that will be assigned to nodes, in the form of [*wet*, *dry*], or
7377
[*ocean*, *land*, *lake*, *island*, *pond*]. Default is ``[0, 1, 0, 1, 0]``
7478
(i.e., ``[0, 1]``), meaning that all "wet" nodes will be assigned a value of 0
7579
and all "dry" nodes will be assigned a value of 1. Values can be any number, or
7680
one of ``None``, ``"NaN"``, and ``np.nan`` for setting nodes to NaN.
7781
78-
Use ``bordervalues`` to control how nodes on feature boundaries are handled.
79-
bordervalues
82+
Use ``border_values`` to control how nodes on feature boundaries are handled.
83+
border_values
8084
Sets the behavior for nodes that fall exactly on a polygon boundary. Valid
8185
values are:
8286
@@ -129,8 +133,8 @@ def grdlandmask(
129133
},
130134
),
131135
I=Alias(spacing, name="spacing", sep="/", size=2),
132-
N=Alias(maskvalues, name="maskvalues", sep="/", size=(2, 5)),
133-
E=Alias(bordervalues, name="bordervalues", sep="/", size=4),
136+
N=Alias(mask_values, name="mask_values", sep="/", size=(2, 5)),
137+
E=Alias(border_values, name="border_values", sep="/", size=4),
134138
).add_common(
135139
R=region,
136140
V=verbose,

0 commit comments

Comments
 (0)