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.

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

raster: fix typos #5266

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion raster/r.category/r.category.html
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ <h3>Adding categories</h3>
EOF
</pre></div>

This sets the categoy values 1 and 2 to respective text labels.
This sets the category values 1 and 2 to respective text labels.

Alternatively, the rules can be stored in an ASCII text file and loaded
via the <em>rules</em> parameter.
Expand Down
2 changes: 1 addition & 1 deletion raster/r.category/r.category.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ r.category diseasemap separator=":" rules=- << EOF
EOF
```

This sets the categoy values 1 and 2 to respective text labels.
This sets the category values 1 and 2 to respective text labels.
Alternatively, the rules can be stored in an ASCII text file and loaded
via the *rules* parameter.

Expand Down
2 changes: 1 addition & 1 deletion raster/r.contour/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* value is added a small quantity (the smaller one that makes cell[i] +
* small != cell[i], I've taken into consideration double encoding)
* o one can specify a minimum number of point for a contour line to be put
* into outout, so that small spurs, single points and so on won't be
* into output, so that small spurs, single points and so on won't be
* present and the output will be more clear (that's optional anyway);
* o in my opinion there were minor memory handling problems in r.contour,
* I've corrected them (Head.map_name was not guaranteed to be properly
Expand Down
2 changes: 1 addition & 1 deletion raster/r.describe/r.describe.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h3>FLAGS</h3>

<p>
The <b>-d</b> flag can be used to force <em>r.describe</em> to respect the current region
extents when repoting raster map categories. The default behavior is to read the full
extents when reporting raster map categories. The default behavior is to read the full
extent of the input raster map.

<p>If the <b>-1</b> flag is specified, the output appears with one category value/range per line.
Expand Down
2 changes: 1 addition & 1 deletion raster/r.describe/r.describe.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ occurs, this will be indicated. The range report will generally run
faster than the full list (the default output).

The **-d** flag can be used to force *r.describe* to respect the current
region extents when repoting raster map categories. The default behavior
region extents when reporting raster map categories. The default behavior
is to read the full extent of the input raster map.

If the **-1** flag is specified, the output appears with one category
Expand Down
4 changes: 2 additions & 2 deletions raster/r.gwflow/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ int main(int argc, char *argv[])
N_convert_array_2d_null_to_zero(data->phead);

/****************************************************/
/*explicite calculation of free groundwater surface */
/*explicit calculation of free groundwater surface */

/****************************************************/
if (data->gwtype == N_GW_UNCONFINED) {
Expand Down Expand Up @@ -446,7 +446,7 @@ int main(int argc, char *argv[])
N_write_array_2d_to_rast(budget, param.budget->answer);
}

/*Compute the the velocity field if required and write the result into two
/*Compute the velocity field if required and write the result into two
* raster maps */
if (param.vector_x->answer && param.vector_y->answer) {
field = N_compute_gradient_field_2d(data->phead, data->hc_x, data->hc_y,
Expand Down
4 changes: 2 additions & 2 deletions raster/r.gwflow/r.gwflow.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ <h2>NOTES</h2>
<p>Two different boundary conditions are implemented,
the Dirichlet and Neumann conditions. By default the calculation area is surrounded by homogeneous Neumann boundary conditions.
The calculation and boundary status of single cells must be set with a status map,
the following states are supportet:
the following states are supported:

<ul>
<li>0 == inactive - the cell with status 0 will not be calculated, active cells will have a no flow boundary to this cell</li>
<li>1 == active - this cell is used for groundwater floaw calculation, inner sources and recharge can be defined for those cells</li>
<li>1 == active - this cell is used for groundwater flow calculation, inner sources and recharge can be defined for those cells</li>
<li>2 == Dirichlet - cells of this type will have a fixed piezometric head value which do not change over the time </li>
</ul>
<br>
Expand Down
4 changes: 2 additions & 2 deletions raster/r.gwflow/r.gwflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ Two different boundary conditions are implemented, the Dirichlet and
Neumann conditions. By default the calculation area is surrounded by
homogeneous Neumann boundary conditions. The calculation and boundary
status of single cells must be set with a status map, the following
states are supportet:
states are supported:

- 0 == inactive - the cell with status 0 will not be calculated, active
cells will have a no flow boundary to this cell
- 1 == active - this cell is used for groundwater floaw calculation,
- 1 == active - this cell is used for groundwater flow calculation,
inner sources and recharge can be defined for those cells
- 2 == Dirichlet - cells of this type will have a fixed piezometric head
value which do not change over the time
Expand Down
4 changes: 2 additions & 2 deletions raster/r.horizon/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ int main(int argc, char *argv[])
settings.fixedMaxLength); /* predefined as BIG */

/* TODO: fixing BIG, there is a bug with distant mountains not being seen:
attempt to contrain to current region
attempt to constrain to current region

fixedMaxLength = (fixedMaxLength < AMAX1(deltx, delty)) ? fixedMaxLength
: AMAX1(deltx, delty); G_debug(1,"Using maxdistance %f", fixedMaxLength);
Expand Down Expand Up @@ -846,7 +846,7 @@ void calculate_point_mode(const Settings *settings, const Geometry *geometry,
double printangle = settings->single_direction;

origin_point.maxlength = settings->fixedMaxLength;
/* JSON variables and formating */
/* JSON variables and formatting */

JSON_Value *horizons_value;
JSON_Array *horizons;
Expand Down
2 changes: 1 addition & 1 deletion raster/r.in.ascii/gethead.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ int gethead(FILE *fd, struct Cell_head *cellhd, RASTER_MAP_TYPE *d_type,

if (strcmp(label, "multiplier") == 0) {
if (Rast_is_d_null_value(
mult)) { /* if mult not set on commant line */
mult)) { /* if mult not set on command line */
if (sscanf(value, "%lf", mult) != 1) {
G_warning(_("illegal multiplier field: using 1.0"));
*mult = 1.0;
Expand Down
2 changes: 1 addition & 1 deletion raster/r.in.lidar/local_proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* PURPOSE: Imports LAS LiDAR point clouds to a raster map using
* aggregate statistics.
*
* COPYRIGHT: (C) 2011 Markus Metz and the The GRASS Development Team
* COPYRIGHT: (C) 2011 Markus Metz and The GRASS Development Team
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we use capitalized "the" or no? There's three other changes of this in this PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

usually it's 'the GRASS Development Team' but it seems that there are instances in raster/ and vector/ headers where 'The GRASS Development Team' is used.

Screenshot_20250303_090118

*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
Expand Down
2 changes: 1 addition & 1 deletion raster/r.in.lidar/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* PURPOSE: Imports LAS LiDAR point clouds to a raster map using
* aggregate statistics.
*
* COPYRIGHT: (C) 2011-2015 Markus Metz and the The GRASS Development Team
* COPYRIGHT: (C) 2011-2015 Markus Metz and The GRASS Development Team
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
Expand Down
2 changes: 1 addition & 1 deletion raster/r.in.pdal/grassrasterwriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class GrassRasterWriter : public pdal::Writer, public pdal::Streamable {

// TODO: check the bounds and report discrepancies in
// number of filtered out vs processed to the user
// (alternativelly, change the spatial bounds test to
// (alternatively, change the spatial bounds test to
// give same results as this, but it might be actually helpful
// to tell user that they have points right on the border)
int arr_row = (int)((region_->north - y) / region_->ns_res);
Expand Down
2 changes: 1 addition & 1 deletion raster/r.in.pdal/string_list.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* PURPOSE: Imports LAS LiDAR point clouds to a raster map using
* aggregate statistics.
*
* COPYRIGHT: (C) 2019 Vaclav Petras and the The GRASS Development Team
* COPYRIGHT: (C) 2019 Vaclav Petras and The GRASS Development Team
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
Expand Down
2 changes: 1 addition & 1 deletion raster/r.in.pdal/string_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* PURPOSE: Imports LAS LiDAR point clouds to a raster map using
* aggregate statistics.
*
* COPYRIGHT: (C) 2019 Vaclav Petras and the The GRASS Development Team
* COPYRIGHT: (C) 2019 Vaclav Petras and The GRASS Development Team
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
Expand Down
2 changes: 1 addition & 1 deletion raster/r.in.poly/r.in.poly.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>NOTES</h2>
<p>
The data will be imported using the current region settings to set the
new raster map's bounds and resolution. Any features falling outside
the current region will be cropped. The region settings are contolled
the current region will be cropped. The region settings are controlled
with the <em>g.region</em> module.

<p>
Expand Down
2 changes: 1 addition & 1 deletion raster/r.in.poly/r.in.poly.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ is fine.

The data will be imported using the current region settings to set the
new raster map's bounds and resolution. Any features falling outside the
current region will be cropped. The region settings are contolled with
current region will be cropped. The region settings are controlled with
the *g.region* module.

The format is a simplified version of the standard GRASS vector ASCII
Expand Down
2 changes: 1 addition & 1 deletion raster/r.li/r.li.daemon/daemon.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ struct area_entry {

/**
* \brief function prototype for index calculation
* \param fd file descripter of opened raster map
* \param fd file descriptor of opened raster map
* \param par optional parameters
* \param ad definition of the sample area
* \param result pointer to store the result
Expand Down
2 changes: 1 addition & 1 deletion raster/r.mapcalc/map.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ static void translate_from_colors(struct map *m, DCELL *rast, CELL *cell,
* category file.
*
* This requires performing sscanf() of the category label
* and only do it it for new categories. Must maintain
* and only do it for new categories. Must maintain
* some kind of maps of already scanned values.
*
* This maps is a hybrid tree, where the data in each node
Expand Down
2 changes: 1 addition & 1 deletion raster/r.mapcalc/map3.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static void translate_from_colors(map *m, DCELL *rast, CELL *cell, int ncols,
* category file.
*
* This requires performing sscanf() of the category label
* and only do it it for new categories. Must maintain
* and only do it for new categories. Must maintain
* some kind of maps of already scanned values.
*
* This maps is a hybrid tree, where the data in each node
Expand Down
2 changes: 1 addition & 1 deletion raster/r.mapcalc/testsuite/const_map_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ compare_result()
fi
}

# Deactive the current mask, by using our own mask name,
# Deactivate the current mask, by using our own mask name,
# but not creating any mask.
MASKTMP=mask.$TMPNAME
export GRASS_MASK=$MASKTMP
Expand Down
2 changes: 1 addition & 1 deletion raster/r.mask.status/r.mask.status.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h3>Use as the test utility</h3>
The POSIX <em>test</em> utility uses return code 0 to indicate presence
and 1 to indicate absence of a file, so testing existence of a file with
<code>test -f</code> gives return code 0 when the file exists.
<em>r.mask.status</em> can be used in the same with the the <b>-t</b> flag:
<em>r.mask.status</em> can be used in the same with the <b>-t</b> flag:

<div class="code"><pre>
r.mask.status -t
Expand Down
2 changes: 1 addition & 1 deletion raster/r.mask.status/r.mask.status.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ This returns a dictionary with keys `present`, `full_name`, and
The POSIX *test* utility uses return code 0 to indicate presence and 1
to indicate absence of a file, so testing existence of a file with
`test -f` gives return code 0 when the file exists. *r.mask.status* can
be used in the same with the the **-t** flag:
be used in the same with the **-t** flag:

```sh
r.mask.status -t
Expand Down
4 changes: 2 additions & 2 deletions raster/r.out.ppm3/r.out.ppm3.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ <h2>DESCRIPTION</h2>
image file, using the current region.

<p>This program converts a GRASS raster map to a PPM image file
using the the current region settings.
using the current region settings.

<p>To get the full area and resolutin of the raster map, run:
<p>To get the full area and resolution of the raster map, run:

<div class="code"><pre>
g.region raster=[mapname]
Expand Down
2 changes: 1 addition & 1 deletion raster/r.out.ppm3/r.out.ppm3.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ file, using the current region.
This program converts a GRASS raster map to a PPM image file using the
the current region settings.

To get the full area and resolutin of the raster map, run:
To get the full area and resolution of the raster map, run:

```sh
g.region raster=[mapname]
Expand Down
2 changes: 1 addition & 1 deletion raster/r.out.vrml/put_grid.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "pv.h"

/*
* Use centers of GRASS CELLS as vertexes for grid.
* Use centers of GRASS CELLS as vertices for grid.
* Currently, grid space is "unitized" so that the
* largest dimension of the current region in GRASS == 1.0
*/
Expand Down
2 changes: 1 addition & 1 deletion raster/r.param.scale/interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void interface(int argc, char **argv)

/* Each option has a 'key' (short descriptn), a 'description` (longer one)
*/
/* a 'type' (eg int, or string), and an indication whether manditory or not
/* a 'type' (eg int, or string), and an indication whether mandatory or not
*/

rast_out->description =
Expand Down
2 changes: 1 addition & 1 deletion raster/r.param.scale/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int fd_in, /* File descriptor for input and */
double resoln, /* Planimetric resolution. */
exponent, /* Distance weighting exponent. */
zscale, /* Vertical scaling factor. */
slope_tol, /* Vertical tolerences for surface */
slope_tol, /* Vertical tolerances for surface */
curve_tol; /* feature identification. */

int main(int argc, char **argv)
Expand Down
2 changes: 1 addition & 1 deletion raster/r.param.scale/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ extern int fd_in, /* File descriptor for input and */
extern double resoln, /* Planimetric resolution. */
exponent, /* Distance weighting exponent. */
zscale, /* Vertical scaling factor. */
slope_tol, /* Vertical tolerences for surface */
slope_tol, /* Vertical tolerances for surface */
curve_tol; /* feature identification. */
2 changes: 1 addition & 1 deletion raster/r.profile/r.profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ <h2>EXAMPLES</h2>

<h3>Extraction of values along profile defined by coordinates (variant 1)</h3>

Extract a profile with coordinates (wayoints) provided on the command line
Extract a profile with coordinates (waypoints) provided on the command line
(North Carolina data set):

<div class="code"><pre>
Expand Down
2 changes: 1 addition & 1 deletion raster/r.profile/r.profile.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ This filters out everything except the numbers.

### Extraction of values along profile defined by coordinates (variant 1)

Extract a profile with coordinates (wayoints) provided on the command
Extract a profile with coordinates (waypoints) provided on the command
line (North Carolina data set):

```sh
Expand Down
2 changes: 1 addition & 1 deletion raster/r.resamp.bspline/r.resamp.bspline.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h2>DESCRIPTION</h2>
spline step values should be no less than the east-west and north-south
resolutions of the input map. Each non-NULL cell observation is modeled as a
linear function of the non-zero splines in the area around the observation.
The least squares regression predicts the the coefficients of these linear functions.
The least squares regression predicts the coefficients of these linear functions.
Regularization avoids the need to have one one observation and one coefficient
for each spline (in order to avoid instability).

Expand Down
2 changes: 1 addition & 1 deletion raster/r.resamp.bspline/r.resamp.bspline.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ north-south direction. For optimal performance, the spline step values
should be no less than the east-west and north-south resolutions of the
input map. Each non-NULL cell observation is modeled as a linear
function of the non-zero splines in the area around the observation. The
least squares regression predicts the the coefficients of these linear
least squares regression predicts the coefficients of these linear
functions. Regularization avoids the need to have one one observation
and one coefficient for each spline (in order to avoid instability).

Expand Down
2 changes: 1 addition & 1 deletion raster/r.resamp.rst/DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ IL_write_temp_2d(ngstc,nszc,offset2,Tmp_fd_z,Tmp_fd_dx,Tmp_fd_dy,Tmp_fd_xx,
FILE *Tmp_fd_z,*Tmp_fd_dx,*Tmp_fd_dy, /* Temp files */
*Tmp_fd_xx,*Tmp_fd_yy,*Tmp_fd_xy;
double *az,*adx,*ady,*adxx,*adyy,*adxy; /* interpolated values */
int scik1,scik2,scik3; /* mutipliers for interp. values */
int scik1,scik2,scik3; /* multipliers for interp. values */

Writes az,adx,...,adxy into appropriate place (depending on ngstc, nszc and
offset) in corresponding temp file */
Expand Down
2 changes: 1 addition & 1 deletion raster/r.resamp.rst/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static int fdinp, fdsmooth = -1;
* for output grid xmin ... - coordinates of corners of output grid
*
* subroutines input_data - input of data x,y,z (test function or measured
* data) iterpolate - interpolation of z-values and derivatives to grid
* data) interpolate - interpolation of z-values and derivatives to grid
* secpar_loop- computation of secondary(morphometric) parameters output -
* output of gridded data and derivatives/sec.parameters check_at_points -
* interpolation of z-values to given point x,y
Expand Down
2 changes: 1 addition & 1 deletion raster/r.ros/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ int main(int argc, char *argv[])
etaM_dead, /*dead fuel misture damping coefficient */
etaM_live, /*live fuel misture damping coefficient */
xmext, /*live fuel moisture of extinction */
phi_ws, /*wind and slope conbined coefficient */
phi_ws, /*wind and slope combined coefficient */
wmfd, fdmois, fined, finel;

/*other local variables */
Expand Down
8 changes: 4 additions & 4 deletions raster/r.sim/simlib/input.c
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ float **create_float_matrix(int rows, int cols, float fill_value)

G_verbose_message("Creating float matrix with value %g", fill_value);

/* Allocate the float marix */
/* Allocate the float matrix */
matrix = G_alloc_fmatrix(rows, cols);

for (row = 0; row < rows; row++) {
Expand All @@ -473,7 +473,7 @@ double **create_double_matrix(int rows, int cols, double fill_value)

G_verbose_message("Creating double matrix with value %g", fill_value);

/* Allocate the float marix */
/* Allocate the float matrix */
matrix = G_alloc_matrix(rows, cols);

for (row = 0; row < rows; row++) {
Expand Down Expand Up @@ -502,7 +502,7 @@ float **read_float_raster_map(int rows, int cols, char *name, float unitconv)
/* Allocate the row buffer */
row_buff = Rast_allocate_f_buf();

/* Allocate the float marix */
/* Allocate the float matrix */
matrix = G_alloc_fmatrix(rows, cols);

for (row = 0; row < rows; row++) {
Expand Down Expand Up @@ -545,7 +545,7 @@ double **read_double_raster_map(int rows, int cols, char *name, double unitconv)
/* Allocate the row buffer */
row_buff = Rast_allocate_d_buf();

/* Allocate the double marix */
/* Allocate the double matrix */
matrix = G_alloc_matrix(rows, cols);

for (row = 0; row < rows; row++) {
Expand Down
2 changes: 1 addition & 1 deletion raster/r.solute.transport/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ int main(int argc, char *argv[])
/*write the result to the output file */
N_write_array_2d_to_rast(data->c, param.output->answer);

/*Compute the the velocity field if required and write the result into three
/*Compute the velocity field if required and write the result into three
* rast maps */
if (param.vector_x->answer || param.vector_y->answer) {
xcomp = N_alloc_array_2d(geom->cols, geom->rows, 1, DCELL_TYPE);
Expand Down
Loading
Loading