Skip to content

Commit

Permalink
v.proj/r.proj: continue renaming location to project (#3574)
Browse files Browse the repository at this point in the history
  • Loading branch information
@petrasovaa
petrasovaa committed Apr 9, 2024
1 parent 8a3c6b7 commit 1c09578
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions gui/wxpython/xml/toolboxes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
</module-item>
<separator/>
<module-item name="r.proj">
<label>Reproject raster map from different GRASS location</label>
<label>Reproject raster map from different GRASS project</label>
</module-item>
</items>
</toolbox>
Expand Down Expand Up @@ -361,7 +361,7 @@
</module-item>
<separator/>
<module-item name="v.proj">
<label>Reproject vector map from different GRASS location</label>
<label>Reproject vector map from different GRASS project</label>
</module-item>
</items>
</toolbox>
Expand Down Expand Up @@ -686,7 +686,7 @@
</module-item>
<separator/>
<module-item name="r.proj">
<label>Reproject raster map from different GRASS location</label>
<label>Reproject raster map from different GRASS project</label>
</module-item>
<module-item name="r.tileset">
<label>Tiling</label>
Expand Down Expand Up @@ -1183,7 +1183,7 @@
<label>Rectify vector map</label>
</module-item>
<module-item name="v.proj">
<label>Reproject vector map from different GRASS location</label>
<label>Reproject vector map from different GRASS project</label>
</module-item>
<separator/>
<module-item name="v.support">
Expand Down
20 changes: 10 additions & 10 deletions raster/r.proj/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@ int main(int argc, char **argv)
G_add_keyword(_("projection"));
G_add_keyword(_("transformation"));
G_add_keyword(_("import"));
module->description = _("Re-projects a raster map from given location to "
"the current location.");
module->description = _("Re-projects a raster map from given project to "
"the current project.");

inlocation = G_define_standard_option(G_OPT_M_LOCATION);
inlocation->required = YES;
inlocation->label = _("Location containing input raster map");
inlocation->label = _("Project (location) containing input raster map");
inlocation->guisection = _("Source");

imapset = G_define_standard_option(G_OPT_M_MAPSET);
Expand All @@ -166,7 +166,7 @@ int main(int argc, char **argv)
inmap->guisection = _("Source");

indbase = G_define_standard_option(G_OPT_M_DBASE);
indbase->label = _("Path to GRASS database of input location");
indbase->label = _("Path to GRASS database of input project");

outmap = G_define_standard_option(G_OPT_R_OUTPUT);
outmap->required = NO;
Expand Down Expand Up @@ -255,7 +255,7 @@ int main(int argc, char **argv)
#if 0
G_fatal_error(_("Input and output locations can not be the same"));
#else
G_warning(_("Input and output locations are the same"));
G_warning(_("Input and output projects are the same"));
#endif
G_get_window(&outcellhd);

Expand Down Expand Up @@ -286,7 +286,7 @@ int main(int argc, char **argv)

permissions = G_mapset_permissions(setname);
if (permissions < 0) /* can't access mapset */
G_fatal_error(_("Mapset <%s> in input location <%s> - %s"), setname,
G_fatal_error(_("Mapset <%s> in input project <%s> - %s"), setname,
inlocation->answer,
permissions == 0 ? _("permission denied")
: _("not found"));
Expand All @@ -296,7 +296,7 @@ int main(int argc, char **argv)
int i;
char **srclist;

G_verbose_message(_("Checking location <%s> mapset <%s>"),
G_verbose_message(_("Checking project <%s> mapset <%s>"),
inlocation->answer, setname);
srclist = G_list(G_ELEMENT_RASTER, G_getenv_nofatal("GISDBASE"),
G_getenv_nofatal("LOCATION_NAME"), setname);
Expand All @@ -312,7 +312,7 @@ int main(int argc, char **argv)

if (!G_find_raster(inmap->answer, setname))
G_fatal_error(
_("Raster map <%s> in location <%s> in mapset <%s> not found"),
_("Raster map <%s> in project <%s> in mapset <%s> not found"),
inmap->answer, inlocation->answer, setname);

/* Read input map colour table */
Expand Down Expand Up @@ -358,7 +358,7 @@ int main(int argc, char **argv)
Rast_get_cellhd(inmap->answer, setname, &incellhd);

if (G_projection() == PROJECTION_XY)
G_fatal_error(_("Unable to work with unprojected data (xy location)"));
G_fatal_error(_("Unable to work with unprojected data (xy project)"));

/* Save default borders so we can show them later */
inorth = incellhd.north;
Expand All @@ -376,7 +376,7 @@ int main(int argc, char **argv)
ocols = outcellhd.cols;

if (print_bounds->answer) {
G_message(_("Input map <%s@%s> in location <%s>:"), inmap->answer,
G_message(_("Input map <%s@%s> in project <%s>:"), inmap->answer,
setname, inlocation->answer);

/* reproject input raster extents from input to output */
Expand Down
20 changes: 10 additions & 10 deletions vector/v.proj/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ int main(int argc, char *argv[])
G_add_keyword(_("projection"));
G_add_keyword(_("transformation"));
G_add_keyword(_("import"));
module->description = _(
"Re-projects a vector map from one location to the current location.");
module->description =
_("Re-projects a vector map from one project to the current project.");

/* set up the options and flags for the command line parser */

ilocopt = G_define_standard_option(G_OPT_M_LOCATION);
ilocopt->required = YES;
ilocopt->label = _("Location containing input vector map");
ilocopt->label = _("Project (location) containing input vector map");
ilocopt->guisection = _("Source");

isetopt = G_define_standard_option(G_OPT_M_MAPSET);
Expand All @@ -96,7 +96,7 @@ int main(int argc, char *argv[])
mapopt->guisection = _("Source");

ibaseopt = G_define_standard_option(G_OPT_M_DBASE);
ibaseopt->label = _("Path to GRASS database of input location");
ibaseopt->label = _("Path to GRASS database of input project");

smax = G_define_option();
smax->key = "smax";
Expand Down Expand Up @@ -176,7 +176,7 @@ int main(int argc, char *argv[])
gbase = G_store(G_gisdbase());

if (!ibaseopt->answer && strcmp(iloc_name, G_location()) == 0)
G_fatal_error(_("Input and output locations can not be the same"));
G_fatal_error(_("Input and output projects can not be the same"));

lmax = atof(smax->answer);
if (lmax < 0)
Expand Down Expand Up @@ -228,8 +228,8 @@ int main(int argc, char *argv[])
if (flag.list->answer) {
char **list;

G_verbose_message(_("Checking location <%s> mapset <%s>"),
iloc_name, iset_name);
G_verbose_message(_("Checking project <%s> mapset <%s>"), iloc_name,
iset_name);
list = G_list(G_ELEMENT_VECTOR, G_getenv_nofatal("GISDBASE"),
G_getenv_nofatal("LOCATION_NAME"), iset_name);
if (list[0]) {
Expand All @@ -253,7 +253,7 @@ int main(int argc, char *argv[])
mapset = G_find_vector2(map_name, iset_name);
if (mapset == NULL)
G_fatal_error(
_("Vector map <%s> in location <%s> mapset <%s> not found"),
_("Vector map <%s> in project <%s> mapset <%s> not found"),
map_name, iloc_name, iset_name);

/*** Get projection info for input mapset ***/
Expand Down Expand Up @@ -365,10 +365,10 @@ int main(int argc, char *argv[])
/* need to be able to read from others */
if (stat == 0)
G_fatal_error(
_("Mapset <%s> in input location <%s> - permission denied"),
_("Mapset <%s> in input project <%s> - permission denied"),
iset_name, iloc_name);
else
G_fatal_error(_("Mapset <%s> in input location <%s> not found"),
G_fatal_error(_("Mapset <%s> in input project <%s> not found"),
iset_name, iloc_name);
}

Expand Down

0 comments on commit 1c09578

Please sign in to comment.