Update usage of g.mapset to use project. Remove all caps MAPSET and L…

…OCATION from g.mapset documentation.
OSGeo · Aug 17, 2023 · befd037 · befd037
1 parent 8b428fb
commit befd037
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/general/g.mapset/g.mapset.html b/general/g.mapset/g.mapset.html
@@ -1,6 +1,7 @@
 <h2>DESCRIPTION</h2>
 
-<em>g.mapset</em> changes the current working MAPSET, LOCATION, or GISDBASE.
+<em>g.mapset</em> changes the current working mapset, project (formerly known
+as location), or GISDBASE (directory with one or more projects).
 This is a fairly radical maneuver to run mid-session, take care when running
 the GUI at the same time.
 <p>
@@ -42,7 +43,7 @@ <h3>Change the current mapset</h3>
 To change the current mapset to "user1" use the following command:
 
 <div class="code"><pre>
-g.mapset mapset=user1 location=nc_spm_08_grass7
+g.mapset mapset=user1 project=nc_spm_08_grass7
 </pre></div>
 
 You should receive the following message: "Mapset switched. Your shell
@@ -52,7 +53,7 @@ <h3>Create a new mapset</h3>
 
 To create a new mapset, use the <b>-c</b> tag as shown below:
 <div class="code"><pre>
-g.mapset -c mapset=new location=nc_spm_08_grass7
+g.mapset -c mapset=new project=nc_spm_08_grass7
 </pre></div>
 
 <h2>SEE ALSO</h2>

diff --git a/general/g.proj/create.c b/general/g.proj/create.c
@@ -25,7 +25,7 @@ void create_location(const char *location)
         G_fatal_error(_("Unable to create location <%s>"), location);
 
     G_message(_("You can switch to the new location by\n`%s=%s`"),
-              "g.mapset mapset=PERMANENT location", location);
+              "g.mapset mapset=PERMANENT project", location);
 }
 
 void modify_projinfo(void)

diff --git a/gui/wxpython/core/utils.py b/gui/wxpython/core/utils.py
@@ -601,7 +601,7 @@ def GetListOfMapsets(dbase, location, selectable=False):
 
     if selectable:
         ret = RunCommand(
-            "g.mapset", read=True, flags="l", location=location, dbase=dbase
+            "g.mapset", read=True, flags="l", project=location, dbase=dbase
         )
 
         if not ret:

diff --git a/gui/wxpython/image2target/ii2t_gis_set.py b/gui/wxpython/image2target/ii2t_gis_set.py
@@ -909,7 +909,7 @@ def UpdateMapsets(self, location):
             "g.mapset",
             read=True,
             flags="l",
-            location=locationName,
+            project=locationName,
             gisdbase=self.gisdbase,
         )
 

diff --git a/gui/wxpython/lmgr/workspace.py b/gui/wxpython/lmgr/workspace.py
@@ -127,7 +127,7 @@ def _tryToSwitchMapsetFromWorkspaceFile(self, gxwXml):
         returncode, errors = RunCommand(
             "g.mapset",
             dbase=gxwXml.database,
-            location=gxwXml.location,
+            project=gxwXml.location,
             mapset=gxwXml.mapset,
             getErrorMsg=True,
         )

diff --git a/gui/wxpython/startup/guiutils.py b/gui/wxpython/startup/guiutils.py
@@ -681,7 +681,7 @@ def switch_mapset_interactively(
             RunCommand(
                 "g.mapset",
                 parent=guiparent,
-                location=location,
+                project=location,
                 mapset=mapset,
                 dbase=dbase,
             )
@@ -702,7 +702,7 @@ def switch_mapset_interactively(
             )
     elif location:
         if (
-            RunCommand("g.mapset", parent=guiparent, location=location, mapset=mapset)
+            RunCommand("g.mapset", parent=guiparent, project=location, mapset=mapset)
             == 0
         ):
             if show_confirmation:

diff --git a/python/grass/temporal/stds_import.py b/python/grass/temporal/stds_import.py
@@ -349,7 +349,7 @@ def import_stds(
             gscript.run_command(
                 "g.mapset",
                 mapset="PERMANENT",
-                location=location,
+                project=location,
                 dbase=old_env["GISDBASE"],
             )
         except CalledModuleError:
@@ -590,7 +590,7 @@ def import_stds(
                 gscript.run_command(
                     "g.mapset",
                     mapset=old_env["MAPSET"],
-                    location=old_env["LOCATION_NAME"],
+                    project=old_env["LOCATION_NAME"],
                     gisdbase=old_env["GISDBASE"],
                 )
             except CalledModuleError: