diff --git a/general/g.proj/g.proj.html b/general/g.proj/g.proj.html index bc92318f54b..63409043afe 100644 --- a/general/g.proj/g.proj.html +++ b/general/g.proj/g.proj.html @@ -162,14 +162,14 @@

Create new location

transformation parameters:
-g.proj -c epsg=4326 location=latlong
+g.proj -c epsg=4326 project=latlong
 

Create a new location with the co-ordinate system referred to by ESRI-EPSG code 900913 (Google Mercator Projection)

-g.proj -c epsg=900913 location=google
+g.proj -c epsg=900913 project=google
 

Create a new location with the co-ordinate system referred to by EPSG code @@ -178,21 +178,21 @@

Create new location

 # list available datums for EPSG code 29900
 g.proj -t datumtrans=-1 epsg=29900
-g.proj -c epsg=29900 datumtrans=2 location=irish_grid
+g.proj -c epsg=29900 datumtrans=2 project=irish_grid
 

Create a new location with the same co-ordinate system as the current location, but forcing a change to datum transformation parameter set no. 1:

-g.proj -c location=newloc -t datumtrans=1
+g.proj -c project=newloc -t datumtrans=1
 

Create a new location with the co-ordinate system from a WKT definition stored in a text file:

-g.proj -c wkt=irish_grid.prj location=irish_grid
+g.proj -c wkt=irish_grid.prj project=irish_grid
 

Create a new location from a PROJ description, explicitly @@ -200,7 +200,7 @@

Create new location

parameters:
-g.proj -c location=spain proj4="+proj=utm +zone=30 +ellps=intl" datum=eur50 datumtrans=0
+g.proj -c project=spain proj4="+proj=utm +zone=30 +ellps=intl" datum=eur50 datumtrans=0
 

Using g.proj output for GDAL/OGR tools

diff --git a/general/g.proj/main.c b/general/g.proj/main.c index c9718018c36..0c1acb222b1 100644 --- a/general/g.proj/main.c +++ b/general/g.proj/main.c @@ -67,11 +67,11 @@ int main(int argc, char *argv[]) module = G_define_module(); G_add_keyword(_("general")); G_add_keyword(_("projection")); - G_add_keyword(_("create location")); + G_add_keyword(_("create project")); #ifdef HAVE_OGR module->label = _("Prints or modifies GRASS projection information files " "(in various co-ordinate system descriptions)."); - module->description = _("Can also be used to create new GRASS locations."); + module->description = _("Can also be used to create new GRASS projects."); #else module->description = _("Prints and manipulates GRASS projection information files."); @@ -212,15 +212,15 @@ int main(int argc, char *argv[]) create = G_define_flag(); create->key = 'c'; create->guisection = _("Modify"); - create->description = _("Modify current location projection files"); + create->description = _("Modify current project's projection files"); location = G_define_option(); - location->key = "location"; + location->key = "project"; location->type = TYPE_STRING; location->key_desc = "name"; location->required = NO; location->guisection = _("Create"); - location->description = _("Name of new location to create"); + location->description = _("Name of new project (location) to create"); if (G_parser(argc, argv)) exit(EXIT_FAILURE); diff --git a/gui/wxpython/core/testsuite/data/test_toolboxes_menudata_ref.xml b/gui/wxpython/core/testsuite/data/test_toolboxes_menudata_ref.xml index e52bfa49040..39589a08724 100644 --- a/gui/wxpython/core/testsuite/data/test_toolboxes_menudata_ref.xml +++ b/gui/wxpython/core/testsuite/data/test_toolboxes_menudata_ref.xml @@ -62,14 +62,14 @@ g.proj -p Converts co-ordinate system descriptions (i.e. projection information) between various formats (including GRASS format). - general,projection,create location + general,projection,create project RunMenuCmd g.proj Prints or modifies GRASS projection information files (in various co-ordinate system descriptions). Can also be used to create new GRASS locations. - general,projection,create location + general,projection,create project OnMenuCmd diff --git a/gui/wxpython/location_wizard/wizard.py b/gui/wxpython/location_wizard/wizard.py index 61abdd81128..4127d5047d4 100644 --- a/gui/wxpython/location_wizard/wizard.py +++ b/gui/wxpython/location_wizard/wizard.py @@ -2299,7 +2299,7 @@ def OnEnterPage(self, event): # print coordsys,proj4string if coordsys in ("proj", "epsg", "iau", "wkt", "file"): extra_opts = {} - extra_opts["location"] = "location" + extra_opts["project"] = "project" extra_opts["getErrorMsg"] = True extra_opts["read"] = True diff --git a/gui/wxpython/xml/wxgui_items.xml b/gui/wxpython/xml/wxgui_items.xml index c795ae9ce3b..ba4b30fa840 100644 --- a/gui/wxpython/xml/wxgui_items.xml +++ b/gui/wxpython/xml/wxgui_items.xml @@ -310,7 +310,7 @@ g.proj -p Converts co-ordinate system descriptions (i.e. projection information) between various formats (including GRASS format). - general,projection,create project,create location + general,projection,create project,create project diff --git a/lib/gis/renamed_options b/lib/gis/renamed_options index e996126a9b0..87935578998 100644 --- a/lib/gis/renamed_options +++ b/lib/gis/renamed_options @@ -730,3 +730,4 @@ r.proj|location:project i.ortho.elev|location:project g.download.location|location:project v.proj|location:project +g.proj|location:project diff --git a/python/grass/script/core.py b/python/grass/script/core.py index d5e529bdaeb..352e03b1cea 100644 --- a/python/grass/script/core.py +++ b/python/grass/script/core.py @@ -1791,7 +1791,7 @@ def create_project( quiet=True, flags="t", epsg=epsg, - location=mapset_path.location, + project=mapset_path.location, stderr=PIPE, env=env, **kwargs, @@ -1802,7 +1802,7 @@ def create_project( quiet=True, flags="t", proj4=proj4, - location=mapset_path.location, + project=mapset_path.location, stderr=PIPE, env=env, **kwargs, @@ -1812,7 +1812,7 @@ def create_project( "g.proj", quiet=True, georef=filename, - location=mapset_path.location, + project=mapset_path.location, stderr=PIPE, env=env, ) @@ -1822,7 +1822,7 @@ def create_project( "g.proj", quiet=True, wkt=wkt, - location=mapset_path.location, + project=mapset_path.location, stderr=PIPE, env=env, ) @@ -1831,7 +1831,7 @@ def create_project( "g.proj", quiet=True, wkt="-", - location=mapset_path.location, + project=mapset_path.location, stderr=PIPE, stdin=PIPE, env=env, diff --git a/scripts/r.tileset/r.tileset.html b/scripts/r.tileset/r.tileset.html index bfe47f48285..c219bf63fd7 100644 --- a/scripts/r.tileset/r.tileset.html +++ b/scripts/r.tileset/r.tileset.html @@ -77,11 +77,11 @@

EXAMPLES

"IrishGrid". Each tile will be less than 300x400 cells in size, with 3 cells of overlap in the top and right sides of each tile. The output is in a format where each line is in shell script style. The -substitution `g.proj -j location=IrishGrid` will only +substitution `g.proj -j project=IrishGrid` will only work in a unix style shell:

-r.tileset sourceproj="`g.proj -j location=IrishGrid`" maxrows=400 maxcols=300 overlap=3 -g
+r.tileset sourceproj="`g.proj -j project=IrishGrid`" maxrows=400 maxcols=300 overlap=3 -g
 

KNOWN ISSUES