Merge branch 'main' into enable-md-compilation

OSGeo · Feb 6, 2025 · 3ed9b36 · 3ed9b36
2 parents 41cb874 + 29009ad
commit 3ed9b36
Show file tree

Hide file tree

Showing 38 changed files with 235 additions and 178 deletions.
diff --git a/general/g.setproj/g.setproj.html b/general/g.setproj/g.setproj.html
@@ -1,32 +1,8 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>g.setproj - GRASS GIS manual</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <link rel="stylesheet" href="grassdocs.css" type="text/css">
- <meta http-equiv="content-language" content="en-us">
- <meta name="viewport" content="width=device-width, initial-scale=1">
-</head>
-<body bgcolor="white">
-
-<img src="grass_logo.png" alt="GRASS logo"><hr align="center" size="6" noshade>
-
-<h2>NAME</h2>
+<h2>DESCRIPTION</h2>
 
-<em><b>g.setproj</b></em> allows the user to create the PROJ_INFO and the
+<em>g.setproj</em> allows the user to create the PROJ_INFO and the
 PROJ_UNITS files to record the coordinate reference system (CRS) information
 associated with a current project (previously called location).
-<br>
-
-<h2>SYNOPSIS</h2>
-
-<b>g.setproj</b>
-
-<h2>DESCRIPTION</h2>
-
-Allows a user to create a PROJ_INFO file in the PERMANENT mapset of the
-current project. PROJ_INFO file is used to record the CRS information
-associated with the specified project.
 
 <h2>NOTES</h2>
 
@@ -82,11 +58,6 @@ <h2>SEE ALSO</h2>
 
 <h2>AUTHORS</h2>
 
-Irina Kosinovsky,
-U.S. Army Construction Engineering
-Research Laboratory<br>
+Irina Kosinovsky, U.S. Army Construction Engineering Research Laboratory<br>
 Morten Hulden, morten at untamo.net - rewrote module and added 121 projections <br>
 Andreas Lange, andreas.lange at rhein-main.de - added prelimnary map datum support
-
-</body>
-</html>
diff --git a/gui/wxpython/animation/data.py b/gui/wxpython/animation/data.py
@@ -21,6 +21,7 @@
 
 from grass.script.utils import parse_key_val
 from grass.script import core as gcore
+from grass.exceptions import ScriptError
 
 from core.gcmd import GException
 from animation.nviztask import NvizTask
@@ -299,7 +300,7 @@ def SetName(self, name):
                 try:
                     name = validateTimeseriesName(name, self._mapType)
                     self._maps = getRegisteredMaps(name, self._mapType)
-                except (GException, gcore.ScriptError) as e:
+                except (GException, ScriptError) as e:
                     raise ValueError(str(e))
             else:
                 self._maps = validateMapNames(name.split(","), self._mapType)

diff --git a/gui/wxpython/animation/dialogs.py b/gui/wxpython/animation/dialogs.py
@@ -37,6 +37,7 @@
     from wx import HyperlinkCtrl
 
 from core.gcmd import GMessage, GError, GException
+from grass.exceptions import ScriptError
 from core import globalvar
 from gui_core.dialogs import MapLayersDialog, GetImageHandlers
 from gui_core.preferences import PreferencesBaseDialog
@@ -1784,7 +1785,7 @@ def _createDefaultCommand(self):
                     if maps:
                         mapName, mapLayer = getNameAndLayer(maps[0])
                         cmd.append("map={name}".format(name=mapName))
-                except gcore.ScriptError as e:
+                except ScriptError as e:
                     GError(parent=self, message=str(e), showTraceback=False)
                     return None
         return cmd
@@ -1837,7 +1838,7 @@ def _onOK(self, event):
                 self.layer.name = self._name
                 self.layer.cmd = self._cmd
                 event.Skip()
-            except (GException, gcore.ScriptError) as e:
+            except (GException, ScriptError) as e:
                 GError(parent=self, message=str(e))
 
     def GetLayer(self):

diff --git a/gui/wxpython/datacatalog/catalog.py b/gui/wxpython/datacatalog/catalog.py
@@ -17,7 +17,6 @@
 """
 
 import wx
-import os
 
 from pathlib import Path
 
@@ -212,7 +211,7 @@ def OnAddGrassDB(self, event):
             grassdb_node = self.tree.InsertGrassDb(name=grassdatabase)
 
             # Offer to create a new location
-            if grassdb_node and not os.listdir(grassdatabase):
+            if grassdb_node and not any(Path(grassdatabase).iterdir()):
                 message = _(
                     "Do you want to create a new project (also known as location)?"
                 )

diff --git a/gui/wxpython/dbmgr/vinfo.py b/gui/wxpython/dbmgr/vinfo.py
@@ -23,6 +23,7 @@
 from core.gcmd import RunCommand, GError
 from core.settings import UserSettings
 import grass.script as gs
+from grass.exceptions import ScriptError
 
 
 def GetUnicodeValue(value):
@@ -106,7 +107,7 @@ def SelectByPoint(self, queryCoords, qdist):
                 coord=(float(queryCoords[0]), float(queryCoords[1])),
                 distance=float(qdist),
             )
-        except gs.ScriptError:
+        except ScriptError:
             GError(
                 parent=None,
                 message=_(

diff --git a/gui/wxpython/gui_core/forms.py b/gui/wxpython/gui_core/forms.py
@@ -83,6 +83,7 @@
 
 from grass.script import core as grass
 from grass.script import task as gtask
+from grass.exceptions import ScriptError
 
 from core import globalvar
 from gui_core.widgets import (
@@ -3088,7 +3089,7 @@ def ParseCommand(self, cmd, completed=None):
         try:
             global _blackList
             self.grass_task = gtask.parse_interface(cmd[0], blackList=_blackList)
-        except (grass.ScriptError, ValueError) as e:
+        except (ScriptError, ValueError) as e:
             raise gcmd.GException(e.value)
 
         # if layer parameters previously set, re-insert them into dialog

diff --git a/gui/wxpython/gui_core/vselect.py b/gui/wxpython/gui_core/vselect.py
@@ -30,6 +30,7 @@
 from gui_core.wrap import Button, ListCtrl
 
 import grass.script as gs
+from grass.exceptions import ScriptError
 from grass.pydispatch.signal import Signal
 
 
@@ -302,7 +303,7 @@ def QuerySelectedMap(self):
                 distance=threshold,
                 skip_attributes=True,
             )
-        except gs.ScriptError:
+        except ScriptError:
             GError(
                 parent=self, message=_("Failed to query vector map(s) <%s>.") % self.map
             )

diff --git a/gui/wxpython/location_wizard/wizard.py b/gui/wxpython/location_wizard/wizard.py
@@ -73,7 +73,7 @@
 )
 from location_wizard.dialogs import SelectTransformDialog
 
-from grass.exceptions import OpenError
+from grass.exceptions import OpenError, ScriptError
 from grass.grassdb.checks import location_exists
 from grass.script import core as grass
 from grass.script import decode
@@ -2739,7 +2739,7 @@ def OnWizFinished(self):
                     desc=self.startpage.locTitle,
                 )
 
-        except grass.ScriptError as e:
+        except ScriptError as e:
             return e.value
 
         return None

diff --git a/gui/wxpython/mapdisp/frame.py b/gui/wxpython/mapdisp/frame.py
@@ -64,6 +64,7 @@
 
 import grass.script as gs
 from grass.pydispatch.signal import Signal
+from grass.exceptions import ScriptError
 
 if TYPE_CHECKING:
     import lmgr.frame
@@ -1103,7 +1104,7 @@ def QueryMap(self, east, north, qdist, rast, vect):
                     encoding=encoding,
                     multiple=True,
                 )
-            except gs.ScriptError:
+            except ScriptError:
                 GError(
                     parent=self,
                     message=_(

diff --git a/gui/wxpython/psmap/dialogs.py b/gui/wxpython/psmap/dialogs.py
@@ -51,6 +51,7 @@
     from wx import PyValidator as Validator
 
 import grass.script as gs
+from grass.exceptions import ScriptError
 from core.gcmd import GError, GMessage, RunCommand
 from core.utils import PilImageToWxImage, cmp
 from dbmgr.vinfo import VectorDBInfo
@@ -2192,7 +2193,7 @@ def __init__(self, parent, id, vectors, tmpSettings):
         try:
             self.mapDBInfo = VectorDBInfo(self.vectorName)
             self.layers = self.mapDBInfo.layers.keys()
-        except gs.ScriptError:
+        except ScriptError:
             self.connection = False
             self.layers = []
         if not self.layers:

diff --git a/gui/wxpython/psmap/instructions.py b/gui/wxpython/psmap/instructions.py
@@ -43,6 +43,7 @@
 from core.utils import GetCmdString
 from dbmgr.vinfo import VectorDBInfo
 from grass.script.task import cmdlist_to_tuple
+from grass.exceptions import ScriptError
 from gui_core.wrap import NewId as wxNewId
 
 from psmap.utils import (  # Add any additional required names from psmap.utils here
@@ -533,7 +534,7 @@ def SetRegion(self, regionInstruction):
         try:
             self.env["GRASS_REGION"] = gs.region_env(env=self.env, **cmd[1])
 
-        except gs.ScriptError as e:
+        except ScriptError as e:
             GError(_("Region cannot be set\n%s") % e)
             return False
 
@@ -1910,7 +1911,7 @@ def Read(self, instruction, text):
             return False
         try:
             info = gs.find_file(map, element="cell")
-        except gs.ScriptError as e:
+        except ScriptError as e:
             GError(message=e.value)
             return False
         instr["raster"] = info["fullname"]
@@ -1951,7 +1952,7 @@ def Read(self, instruction, text, **kwargs):
             vmap = line.split()[1]
             try:
                 info = gs.find_file(vmap, element="vector")
-            except gs.ScriptError as e:
+            except ScriptError as e:
                 GError(message=e.value)
                 return False
             vmap = info["fullname"]
@@ -2123,7 +2124,7 @@ def Read(self, instruction, text, **kwargs):
         instr = {}
         try:
             info = gs.find_file(name=text[0].split()[1], element="vector")
-        except gs.ScriptError as e:
+        except ScriptError as e:
             GError(message=e.value)
             return False
         instr["name"] = info["fullname"]

diff --git a/gui/wxpython/psmap/utils.py b/gui/wxpython/psmap/utils.py
@@ -25,6 +25,7 @@
 from core.gcmd import GError, RunCommand
 
 import grass.script as gs
+from grass.exceptions import ScriptError
 
 try:
     from PIL import Image as PILImage  # noqa
@@ -226,7 +227,7 @@ def AutoAdjust(self, scaleType, rect, env, map=None, mapType=None, region=None):
             if mapType == "raster":
                 try:
                     res = gs.read_command("g.region", flags="gu", raster=map, env=env)
-                except gs.ScriptError:
+                except ScriptError:
                     pass
             elif mapType == "vector":
                 res = gs.read_command("g.region", flags="gu", vector=map, env=env)
@@ -240,7 +241,7 @@ def AutoAdjust(self, scaleType, rect, env, map=None, mapType=None, region=None):
         else:
             return None, None, None
     # fails after switching location
-    except (gs.ScriptError, gs.CalledModuleError):
+    except (ScriptError, gs.CalledModuleError):
         pass
 
     if not currRegionDict:
@@ -390,7 +391,7 @@ def GetMapBounds(filename, env, portrait=True):
                 .split(","),
             )
         )
-    except (gs.ScriptError, IndexError):
+    except (ScriptError, IndexError):
         GError(message=_("Unable to run `ps.map -b`"))
         return None
     return Rect2D(bb[0], bb[3], bb[2] - bb[0], bb[1] - bb[3])

diff --git a/imagery/i.gensigset/i.gensigset.html b/imagery/i.gensigset/i.gensigset.html
@@ -61,7 +61,7 @@ <h3>Parameters</h3>
 and
 <em><a href="v.to.rast.html">v.to.rast</a></em>,
 or some other import/development process (e.g.,
-<em><a href="v.transects.html">v.transects</a>)</em>
+<em><a href="https://grass.osgeo.org/grass-stable/manuals/addons/v.transects.html">v.transects</a>)</em>
 to define the areas representative of the classes in the image.
 
 <p>

diff --git a/imagery/i.landsat.toar/i.landsat.toar.html b/imagery/i.landsat.toar/i.landsat.toar.html
@@ -29,7 +29,7 @@ <h2>DESCRIPTION</h2>
 region settings, in order to have the largest possible sample of pixels
 from where to get the darkest one of the scene and perform the DOS
 correction. To limit the results to a custom region, the user is
-advised to clip the results (with <a href="r.clip.html">r.clip</a>, for
+advised to clip the results (with <a href="https://grass.osgeo.org/grass-stable/manuals/addons/r.clip.html">r.clip</a>, for
 instance) or to define the region first, import the images with region
 cropping, and then running the module.
 

diff --git a/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html b/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html
@@ -16,7 +16,7 @@ <h2>DESCRIPTION</h2>
 include: the (XC,YC,ZC) standard (e.g. UTM) approximate coordinates of the camera exposure
 station; initial roll, pitch, and yaw angles (in degrees) of the cameras
 attitude; and the <em>a priori</em> standard deviations for these
-parameters. During the imagery program, <em>i.photo.rectify</em>, the initial camera
+parameters. During the imagery program, <em>i.ortho.rectify</em>, the initial camera
 exposure station file is used for computation of the ortho-rectification
 parameters.  If no initial camera exposure station file exist, the default
 values are computed from the control points file created in
@@ -107,7 +107,7 @@ <h2>SEE ALSO</h2>
 <a href="i.ortho.elev.html">i.ortho.elev</a>,
 <a href="i.ortho.camera.html">i.ortho.camera</a>,
 <a href="i.ortho.transform.html">i.ortho.transform</a>,
-<a href="i.photo.rectify.html">i.photo.rectify</a>
+<a href="i.ortho.rectify.html">i.ortho.rectify</a>
 </em>
 
 <h2>AUTHOR</h2>

diff --git a/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html b/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html
@@ -1,11 +1,11 @@
 <h2>DESCRIPTION</h2>
 
-<em>i.photo.rectify</em> rectifies an image by using the image to photo
+<em>i.ortho.rectify</em> rectifies an image by using the image to photo
 coordinate transformation matrix created by <a href="g.gui.photo2image.html">g.gui.photo2image</a>
 and the rectification parameters created by <a href="g.gui.image2target.html">g.gui.image2target</a>.
 Rectification is the process by which the geometry of an image is made
 planimetric.  This is accomplished by mapping an image from one coordinate
-system to another. In <em>i.photo.rectify</em> the parameters computed by
+system to another. In <em>i.ortho.rectify</em> the parameters computed by
 <a href="g.gui.photo2image.html">g.gui.photo2image</a> and
 <a href="g.gui.image2target.html">g.gui.image2target</a> are used in equations to
 convert x,y image coordinates to standard map coordinates for each pixel in
@@ -38,7 +38,7 @@ <h2>DESCRIPTION</h2>
 areas with high camera angles may also appear blurred if they are located
 (viewed from the camera position) behind mountain ridges or peaks.
 <p>
-<em>i.photo.rectify</em> can be run directly, specifying options in the
+<em>i.ortho.rectify</em> can be run directly, specifying options in the
 command line or the GUI, or it can be invoked as OPTION 8 through
 <a href="i.ortho.photo.html">i.ortho.photo</a>. If invoked though
 <a href="i.ortho.photo.html">i.ortho.photo</a>, an interactive terminal
@@ -70,7 +70,7 @@ <h4>Interactive mode</h4>
 <p>
 If you choose option 2, you can also specify a desired target resolution.
 <p>
-<em>i.photo.rectify</em> will only rectify that portion of the
+<em>i.ortho.rectify</em> will only rectify that portion of the
 image that occurs within the chosen window.  Only that portion will be
 relocated in the target database. It is therefore important to check the
 current window in the target project if choice number one is selected.
@@ -87,7 +87,7 @@ <h4>Interactive mode</h4>
 </pre>
 <p>
 The last prompt will ask you about the amount of memory to be used by
-<em>i.photo.rectify</em>.
+<em>i.ortho.rectify</em>.
 
 <h2>SEE ALSO</h2>
 

diff --git a/imagery/i.pca/i.pca.html b/imagery/i.pca/i.pca.html
@@ -96,7 +96,7 @@ <h2>SEE ALSO</h2>
 <a href="g.gui.iclass.html">g.gui.iclass</a>,
 <a href="i.fft.html">i.fft</a>,
 <a href="i.ifft.html">i.ifft</a>,
-<a href="m.eigensystem.html">m.eigensystem</a>,
+<a href="https://grass.osgeo.org/grass-stable/manuals/addons/m.eigensystem.html">m.eigensystem</a>,
 <a href="r.covar.html">r.covar</a>,
 <a href="r.mapcalc.html">r.mapcalc</a>
 <p>

diff --git a/lib/vector/Vlib/net_build.c b/lib/vector/Vlib/net_build.c
@@ -666,6 +666,8 @@ int Vect_net_ttb_build_graph(struct Map_info *Map, int ltype, int afield,
     dglInitializeSPCache(gr, &(Map->dgraph.spCache));
 
     G_message(_("Graph was built"));
+    Vect_destroy_field_info(Fi);
+    db_free_column(Column);
     return 0;
 }
 
@@ -1061,6 +1063,8 @@ int Vect_net_build_graph(struct Map_info *Map, int ltype, int afield,
     dglInitializeSPCache(gr, &(Map->dgraph.spCache));
 
     G_message(_("Graph was built"));
+    Vect_destroy_field_info(Fi);
+    db_free_column(Column);
 
     return 0;
 }