Skip to content
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

Jump to bottom

r.geomorphon: combine profile parser rules to allow usage as pygrass module #2154

Merged
merged 6 commits into from
Feb 20, 2022
Merged

r.geomorphon: combine profile parser rules to allow usage as pygrass module #2154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eddd7ee
combine profile parser rules
ninsbl Feb 3, 2022
3c3eed4
let coords require profilesettings
ninsbl Feb 3, 2022
cd5f0a2
relax parser rules even more
ninsbl Feb 11, 2022
6a02309
remove defaults and add back parser rules
ninsbl Feb 18, 2022
13819f1
adjust manual
ninsbl Feb 19, 2022
ba10857
reactivate r.geomorphon test
ninsbl Feb 19, 2022
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
1 change: 0 additions & 1 deletion .gunittest.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ exclude =
python/grass/temporal/testsuite/unittests_temporal_raster_algebra_equal_ts.py
python/grass/temporal/testsuite/unittests_temporal_raster_conditionals_complement_else.py
raster/r.contour/testsuite/testrc.py
raster/r.geomorphon/testsuite/test_r_geom.py
raster/r.in.gdal/testsuite/test_r_in_gdal.py
raster/r.in.lidar/testsuite/test_base_resolution.sh
raster/r.in.lidar/testsuite/test_base_resolution.sh
Expand Down
4 changes: 2 additions & 2 deletions raster/r.geomorphon/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,22 +178,22 @@ int main(int argc, char **argv)

par_profiledata = G_define_standard_option(G_OPT_F_OUTPUT);
par_profiledata->key = "profiledata";
par_profiledata->answer = "-";
par_profiledata->required = NO;
par_profiledata->description =
_("Profile output file name (\"-\" for stdout)");
par_profiledata->guisection = _("Profile");
G_option_requires(par_profiledata, par_coords, NULL);
G_option_requires(par_coords, par_profiledata, NULL);

par_profileformat = G_define_option();
par_profileformat->key = "profileformat";
par_profileformat->type = TYPE_STRING;
par_profileformat->options = "json,yaml,xml";
par_profileformat->answer = "json";
par_profileformat->required = NO;
par_profileformat->description = _("Profile output format");
par_profileformat->guisection = _("Profile");
G_option_requires(par_profileformat, par_coords, NULL);
G_option_requires(par_coords, par_profileformat, NULL);

if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Expand Down
5 changes: 2 additions & 3 deletions raster/r.geomorphon/r.geomorphon.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,9 @@ <h3>Forms represented by geomorphons:</h3>
and it includes assorted values describing the computation context and
parameters, as well as its intermediate and final results.</DD>
<DT><b>profileformat</b></DT>
<DD>Format of the profile data: "json" (the default),
"yaml" or "xml".</DD>
<DD>Format of the profile data: "json", "yaml" or "xml".</DD>
</DL>
<P><em>NOTE: parameters below are very experimental. The usefulness of these parameters are currently under investigation.</em></P>
<P><em>NOTE: parameters below are experimental. The usefulness of these parameters are currently under investigation.</em></P>
<DL>
<DT><b>intensity</b></DT>
<DD>returns avarage difference between central cell of geomorphon and eight cells in visibility neighbourhood. This parameter shows local (as is visible) exposition/abasement of the form in the terrain.</DD>
Expand Down