Merge branch 'mfpos-main'

a0x8o · Nov 26, 2024 · 99b617c · 99b617c
2 parents 423ad7b + 058dbde
commit 99b617c
Show file tree

Hide file tree

Showing 110 changed files with 472 additions and 320 deletions.
diff --git a/.flake8 b/.flake8
@@ -20,6 +20,7 @@ per-file-ignores =
     # E741 ambiguous variable name 'l'
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> 0821b09838 (Checks: Fix Flake8 W605 - invalid escape sequence (#3763))
@@ -47,6 +48,8 @@ per-file-ignores =
 =======
 >>>>>>> cfa8c4eeca (Checks: Fix Flake8 W605 - invalid escape sequence (#3763))
 >>>>>>> 0821b09838 (Checks: Fix Flake8 W605 - invalid escape sequence (#3763))
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
     man/build_html.py: E501
 <<<<<<< HEAD
     man/build_md.py: E501
@@ -153,6 +156,7 @@ per-file-ignores =
     gui/wxpython/startup/locdownload.py: E722, E402
     gui/wxpython/timeline/g.gui.timeline.py: E501
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     gui/wxpython/tools/build_modules_xml.py: E722
     gui/wxpython/web_services/cap_interface.py: E501
@@ -197,6 +201,8 @@ per-file-ignores =
 >>>>>>> ba65a804c6 (Checks: fix flake8 E741 in gui/wxpython directory (#3926))
 >>>>>>> 3a3b3fa8db (Checks: fix flake8 E741 in gui/wxpython directory (#3926))
 >>>>>>> 16b2bafce3 (Checks: fix flake8 E741 in gui/wxpython directory (#3926))
+=======
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
     # Generated file
     gui/wxpython/menustrings.py: E501
     # F821 undefined name 'cmp'

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -89,6 +89,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
 =======
@@ -139,6 +140,9 @@ jobs:
 >>>>>>> 1a779126bc (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> 6c2bbd4089 (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> c384ba3d8c (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
+=======
+        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           languages: ${{ matrix.language }}
           config-file: ./.github/codeql/codeql-config.yml
@@ -169,6 +173,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
 =======
@@ -219,5 +224,8 @@ jobs:
 >>>>>>> 1a779126bc (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> 6c2bbd4089 (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> c384ba3d8c (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
+=======
+        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -128,6 +128,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
 =======
@@ -170,6 +171,9 @@ jobs:
         uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0
 >>>>>>> db4f23459c (CI(deps): Update docker/build-push-action action to v6.3.0 (#3976))
 >>>>>>> 3d802a7bcb (CI(deps): Update docker/build-push-action action to v6.3.0 (#3976))
+=======
+        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           push: true
           pull: true

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -54,7 +54,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 >>>>>>> d4a11a7eae (CI(deps): Update actions/checkout action to v4.1.7 (#3801))
       - name: Setup Mamba
-        uses: mamba-org/setup-micromamba@ab6bf8bf7403e8023a094abeec19d6753bdc143e # v2.0.1
+        uses: mamba-org/setup-micromamba@06375d89d211a1232ef63355742e9e2e564bc7f7 # v2.0.2
         with:
           init-shell: bash
           environment-file: .github/workflows/macos_dependencies.txt

diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
@@ -34,6 +34,7 @@ jobs:
 <<<<<<< HEAD
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       - uses: msys2/setup-msys2@ddf331adaebd714795f1042345e6ca57bd66cea8 # v2.24.1
 =======
@@ -53,6 +54,9 @@ jobs:
 >>>>>>> d4a11a7eae (CI(deps): Update actions/checkout action to v4.1.7 (#3801))
 >>>>>>> 9dae335815 (CI(deps): Update actions/checkout action to v4.1.7 (#3801))
 >>>>>>> 04e6857dc2 (CI(deps): Update actions/checkout action to v4.1.7 (#3801))
+=======
+      - uses: msys2/setup-msys2@c52d1fa9c7492275e60fe763540fb601f5f232a1 # v2.25.0
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           path-type: inherit
           location: D:\

diff --git a/.github/workflows/python-code-quality.yml b/.github/workflows/python-code-quality.yml
@@ -56,6 +56,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       RUFF_VERSION: "0.5.1"
 =======
@@ -230,6 +231,9 @@ jobs:
 >>>>>>> 309fcfbf04 (CI(deps): Update dependency ruff to v0.5.1 (#3983))
 =======
 >>>>>>> 86958332ef (CI(deps): Update ruff to v0.7.2 (#4631))
+=======
+      RUFF_VERSION: "0.8.0"
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 
     runs-on: ${{ matrix.os }}
     permissions:
@@ -400,6 +404,7 @@ jobs:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
 =======
@@ -450,6 +455,9 @@ jobs:
 >>>>>>> 1a779126bc (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> 6c2bbd4089 (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
 >>>>>>> c384ba3d8c (CI(deps): Update github/codeql-action action to v3.25.11 (#3938))
+=======
+        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         with:
           sarif_file: bandit.sarif
 

diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -37,6 +37,7 @@ jobs:
       - name: Lint code base
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         uses: super-linter/super-linter/slim@b92721f792f381cedc002ecdbb9847a15ece5bb8 # v7.1.0
 =======
@@ -55,6 +56,9 @@ jobs:
 >>>>>>> 31def23932 (CI(deps): Update super-linter/super-linter action to v6.7.0 (#4002))
 >>>>>>> 8938eb13e8 (CI(deps): Update super-linter/super-linter action to v6.7.0 (#4002))
 >>>>>>> 98c5477af1 (CI(deps): Update super-linter/super-linter action to v6.7.0 (#4002))
+=======
+        uses: super-linter/super-linter/slim@e1cb86b6e8d119f789513668b4b30bf17fe1efe4 # v7.2.0
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
         env:
           DEFAULT_BRANCH: main
           # To report GitHub Actions status checks

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -56,6 +56,7 @@ repos:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     rev: v0.5.1
 =======
@@ -225,6 +226,9 @@ repos:
 >>>>>>> 79c03e82ac (CI(deps): Update ruff to v0.7.2 (#4631))
 >>>>>>> 2d8985db52 (CI(deps): Update ruff to v0.7.2 (#4631))
 >>>>>>> 86958332ef (CI(deps): Update ruff to v0.7.2 (#4631))
+=======
+    rev: v0.8.0
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
     hooks:
       # Run the linter.
       - id: ruff

diff --git a/db/db.connect/db.connect.html b/db/db.connect/db.connect.html
@@ -36,7 +36,7 @@ <h3>SQLite (default backend)</h3>
 <h3>PostgreSQL (local connection)</h3>
 
 Local storage, database tables stored in database "mydb"
-(may require the use of <em><a href=db.login.html>db.login</a></em>):
+(may require the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=pg database=mydb
@@ -49,7 +49,7 @@ <h3>PostgreSQL (local connection)</h3>
 <h3>PostgreSQL (network connection)</h3>
 
 Network storage, database tables stored in database "mydb"
-(may require the use of <em><a href=db.login.html>db.login</a></em>):
+(may require the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=pg database=mydb
@@ -62,7 +62,7 @@ <h3>PostgreSQL (network connection)</h3>
 <h3>MySQL (local connection)</h3>
 
 Local storage, database tables stored in database "mydb" (may require
-the use of <em><a href=db.login.html>db.login</a></em>):
+the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=mysql database=mydb
@@ -75,7 +75,7 @@ <h3>MySQL (local connection)</h3>
 <h3>MySQL (network connection)</h3>
 
 Network storage, database tables stored in database "mydb"
-(may require the use of <em><a href=db.login.html>db.login</a></em>):
+(may require the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=mysql database=mydb
@@ -88,7 +88,7 @@ <h3>MySQL (network connection)</h3>
 <h3>ODBC</h3>
 
 Network storage, database tables stored in database "mydb"
-(may require the use of <em><a href=db.login.html>db.login</a></em>):
+(may require the use of <em><a href="db.login.html">db.login</a></em>):
 <br>
 <div class="code"><pre>
 db.connect driver=odbc database=mydb

diff --git a/db/drivers/README b/db/drivers/README
diff --git a/db/drivers/README.md b/db/drivers/README.md
@@ -0,0 +1,30 @@
+This directory contains drivers for the DBMI library.
+The driver functions are for internal usage.
+
+The DBMI API to be used for module programming is available in:
+`lib/db/`
+
+NOTE:
+`db__driver_*` functions are implemented in a driver. If some of them
+are not used or defined, the driver will use stub functions in
+`lib/db/stubs/`.
+
+For some platforms like Cygwin, multiply defined symbols are not
+resolved in a way that UNIX does. Even worse is that it is impossible
+to build shared libraries with undefined symbols. For example,
+`libgrass*dbmidriver.so` cannot be built without any implementations
+of `db__driver*\*` functions which should be specific to a db driver.
+
+To work around this problem, function pointers are defined to use
+driver's implementations instead of those of the db stubs library.
+To do this automatically, run `../mk_dbdriver_h.sh` (GRASS GIS 6)
+in driver's directory, `#include "dbdriver.h"` from `main.c`, and
+execute `init_dbdriver()`.
+
+Function pointers are defined in `lib/db/dbmi_driver/dbstubs.h`
+This header file can be generated with
+`lib/db/dbmi_driver/mk_dbstubs_h.sh` (GRASS GIS 6).
+
+Please read lib/db/README.md and
+
+<https://grass.osgeo.org/programming8/dbmilib.html>
diff --git a/db/drivers/mysql/grass-mesql.html b/db/drivers/mysql/grass-mesql.html
@@ -1,28 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>GRASS-MySQL embedded driver - 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>
-
 <!-- meta page description: MySQL embedded driver -->
-<h1>MySQL embedded driver in GRASS</h1>
-
-<h2>KEYWORDS</h2>
 
-database, attribute table, driver
-
-<h2>DESCRIPTION</h2>
-
-MySQL database driver in GRASS enables GRASS to store vector
-attributes in MySQL embedded database without necessity
-to run MySQL server.
+MySQL database driver enables GRASS to store vector attributes
+in MySQL embedded database without necessity to run MySQL server.
 
 <h2>Driver and database name</h2>
 
@@ -68,14 +47,7 @@ <h2>Troubleshooting: SQL syntax error</h2>
 
 Attempting to use a reserved SQL word as column or table name will result
 in a "SQL syntax" error. The list of reserved words for MySQL can be
-found in the <a href="http://dev.mysql.com/doc/refman/5.7/en/reserved-words.html#table-reserved-words-5.7.4">MySQL manual</a>.
-
-<h2>SEE ALSO</h2>
-
-<em>
-<a href="db.connect.html">db.connect</a>,
-<a href="sql.html">SQL support in GRASS GIS</a>
-</em>
+found in the <a href="https://dev.mysql.com/doc/refman/8.4/en/keywords.html#keywords-in-current-series">MySQL manual</a>.
 
 <h2>AUTHOR</h2>
 
@@ -92,6 +64,7 @@ <h2>AUTHOR</h2>
 =======
 >>>>>>> 4217d7b0d6 (wxpyimgview: explicit conversion to int (#2704))
 <a href="https://www.faunalia.it">Faunalia</a> (Italy)
+<<<<<<< HEAD
 =======
 <a href="http://www.faunalia.it">Faunalia</a> (Italy)
 >>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
@@ -108,8 +81,13 @@ <h2>AUTHOR</h2>
 >>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
 >>>>>>> 4217d7b0d6 (wxpyimgview: explicit conversion to int (#2704))
 as part of a project for <a href="http://www.atac.roma.it/">ATAC</a>.
+=======
+as part of a project for <a href="https://www.atac.roma.it/">ATAC</a>.
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3
 
+<h2>SEE ALSO</h2>
 
+<<<<<<< HEAD
 <hr class="header">
 <p><a href="index.html">Main index</a> - <a href="database.html">Database index</a> - <a href="topics.html">Topics index</a> - <a href="keywords.html">Keywords Index</a> - <a href="full_index.html">Full index</a></p>
 <<<<<<< HEAD
@@ -3234,3 +3212,9 @@ <h2>AUTHOR</h2>
 >>>>>>> d3f362186e (wxpyimgview: explicit conversion to int (#2704))
 </body>
 </html>
+=======
+<em>
+<a href="db.connect.html">db.connect</a>,
+<a href="sql.html">SQL support in GRASS GIS</a>
+</em>
+>>>>>>> 7e29f98e86c644696e35f504c8ae4d287e1745d3