Skip to content

Commit

Permalink
Merge branch 'OSGeo:grass8' into r_maxent_train
Browse files Browse the repository at this point in the history
  • Loading branch information
ecodiv authored Nov 11, 2024
2 parents 8537b56 + f000675 commit 5e7dad1
Show file tree
Hide file tree
Showing 138 changed files with 293 additions and 288 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/additional_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

steps:
- name: Checkout repository contents
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 31

Expand All @@ -45,7 +45,7 @@ jobs:
exclude: mswindows .*\.bat .*/testsuite/data/.*

- name: Set up Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: ${{ env.PYTHON_VERSION }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/black.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- name: Set up Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: ${{ env.PYTHON_VERSION }}
cache: "pip"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ jobs:

steps:
- name: Checkout core
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: OSGeo/grass
ref: ${{ matrix.grass-version }}
path: grass

- name: Checkout addons
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
path: grass-addons

Expand All @@ -57,7 +57,7 @@ jobs:
sudo apt-get install -y --no-install-recommends --no-install-suggests
- name: Set up Python ${{ matrix.python-version }} as default Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: ${{ matrix.python-version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- uses: DoozyX/clang-format-lint-action@c71d0bf4e21876ebec3e5647491186f8797fde31 # v0.18.2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Set up Python
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: ${{ env.PYTHON_VERSION }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# To report GitHub Actions status checks
statuses: write
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# super-linter needs the full git history to get the
# list of files that changed across commits
Expand Down
13 changes: 8 additions & 5 deletions src/display/d.mon2/d.mon2.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,24 @@ <h2>DESCRIPTION</h2>
wximgview, and wxpyimgview programs a bit simpler to start up.
<p>

Add this to your ~/.grass.bashrc file:
<pre>
Add this to your <tt>~/.grass.bashrc</tt> file:

<div class="code"><pre>
if [ `echo "$GRASS_VERSION" | cut -f1 -d.` -eq 7 ] ; then
alias d.mon='eval `d.mon.py -b`'
fi
</pre>
</pre></div>

<p>
By default the temporary file will be stored in $MAPSET/.tmp/ and cleared
at the end of the session. You can put it somewhere else with the
<b>tempfile</b> option. For example, when working remotely with
PuTTY (ssh without tunnelled X) + Apache:
<pre>

<div class="code"><pre>
alias d.mon='eval `d.mon.py -b handler=none tempfile=/var/www/grassmap.png`'
</pre>
</pre></div>

then just hit reload in your web browser whenever a refresh is needed.


Expand Down
2 changes: 1 addition & 1 deletion src/general/g.download.location/g.download.location.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ <h2>SEE ALSO</h2>

<h2>AUTHOR</h2>

Vaclav Petras, <a href="http://geospatial.ncsu.edu/osgeorel/">NCSU GeoForAll Lab</a>
Vaclav Petras, <a href="https://geospatial.ncsu.edu/geoforall/">NCSU GeoForAll Lab</a>
4 changes: 2 additions & 2 deletions src/general/g.isis3mt/g.isis3mt.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ <h2>DESCRIPTION</h2>

<h2>NOTE</h2>

The ISIS3 user should use matchmap=yes in cam2map
The ISIS3 user should use <tt>matchmap=yes</tt> in <tt>cam2mapi</tt>.

<h2>AUTHORS</h2>

Alessandro Frigeri, INA, Ispra, Italy
Alessandro Frigeri, INA, Ispra, Italy<br>
Added to GRASS 7 by Yann Chemin
8 changes: 4 additions & 4 deletions src/general/g.proj.identify/g.proj.identify.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ <h2>SEE ALSO</h2>

<em>
<a href="https://grass.osgeo.org/grass-stable/manuals/g.proj.html">g.proj</a>,
<a href="m.proj.html">m.proj</a>,
<a href="https://grass.osgeo.org/grass-stable/manuals/m.proj.html">m.proj</a>,
<a href="https://grass.osgeo.org/grass-stable/manuals/r.proj.html">r.proj</a>,
<a href="https://grass.osgeo.org/grass-stable/manuals/v.proj.html">v.proj</a>
</em>

<h2>AUTHORS</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
at the Czech Technical University in Prague, developed
during <a href="http://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2015</a> (mentors: Martin Landa)
during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2015</a> (mentor: Martin Landa)
11 changes: 7 additions & 4 deletions src/gui/wxpython/wx.metadata/db.csw.run/db.csw.run.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<h2>DESCRIPTION</h2>

...
<b>db.csw.run</b> is designed to interact with Catalog Service for the Web (CSW)
servers for metadata management purposes. It is implemented as a WSGI wrapper
for pycsw and the module for starting the server on localhost.

<h2>NOTES</h2>

...

<h2>SEE ALSO</h2>
Expand All @@ -17,12 +20,12 @@ <h2>SEE ALSO</h2>
</em>

<p>
See also related <a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
See also related <a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.


<h2>AUTHORS</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
at the Czech Technical University in Prague, developed
during <a href="http://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2014</a> (mentors: Margherita Di Leo, Martin Landa)
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<h2>DESCRIPTION</h2>

<em>g.gui.cswbrowser</em> supports searching and browsing metadata catalogs based on
<a href="http://www.opengeospatial.org/standards/cat">Catalogue Service (CSW)</a> standard .
<a href="https://www.ogc.org/publications/standard/cat/">Catalogue Service (CSW)</a> standard .

<p>
The module allows to setting up connection to csw by uri and search metadata using advanced filter.

<h2>NOTES</h2>

For dependencies and installation instructions see the dedicated
<a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
<a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.

<h3>Setting up connection</h3>

Expand All @@ -36,11 +36,11 @@ <h3>Bounding box</h3>
</li>
<li>Keywords<br>
This filter allows to use basic or advance keyword filtering. In the simple case user can define
single keywords or multiple keywords with button "+". Logic operator between keywords is AND(&&).
single keywords or multiple keywords with button "+". Logic operator between keywords is AND(&amp;&amp;).
Second, advanced is based on OGC list of expressions which means that can be set filtr with logic
relations between keywords or sets of keywords. Dialog for settings kewords text string is under
"Advanced" checkbox. Syntax of constraints is based on python list syntax. Each keywords must be
in braces&lt;'&gt;or<">.
in braces &lt;'&gt; or &lt;"&gt;.
</li>
<li>
<ul>
Expand Down Expand Up @@ -78,12 +78,12 @@ <h2>SEE ALSO</h2>
</em>

<p>
See also related <a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
See also related <a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.


<h2>AUTHORS</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
at the Czech Technical University in Prague, developed
during <a href="http://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2015</a> (mentors: Martin Landa)
during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2015</a> (mentor: Martin Landa)
12 changes: 6 additions & 6 deletions src/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h2>DESCRIPTION</h2>

<em>g.gui.metadata</em> supports advanced tools for metadata management according
to <a href="http://www.iso.org/iso/catalogue_detail.htm?csnumber=26020">ISO 19115</a>.
to <a href="https://www.iso.org/iso/catalogue_detail.htm?csnumber=26020">ISO 19115</a>.

<p>
The metadata editor includes a graphical interface for converting metadata
Expand All @@ -12,7 +12,7 @@ <h2>DESCRIPTION</h2>
<h2>NOTES</h2>

For dependencies and installation instructions see the dedicated
<a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
<a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.

<h3>Naming of metadata files and storage</h3>

Expand Down Expand Up @@ -117,12 +117,12 @@ <h2>SEE ALSO</h2>
</em>

<p>
See also related <a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
See also related <a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.


<h2>AUTHORS</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
at the Czech Technical University in Prague, developed
during <a href="http://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2014</a> (mentors: Margherita Di Leo, Martin Landa)
during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2014</a> (mentor: Margherita Di Leo, Martin Landa)
10 changes: 5 additions & 5 deletions src/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h2>DESCRIPTION</h2>

<em>r.info.iso</em> creates metadata of raster maps according
to <a href="http://www.iso.org/iso/catalogue_detail.htm?csnumber=26020">ISO
to <a href="https://www.iso.org/iso/catalogue_detail.htm?csnumber=26020">ISO
19115</a>.

<p>
Expand All @@ -11,7 +11,7 @@ <h2>DESCRIPTION</h2>
<h2>NOTES</h2>

For dependencies and installation instructions see
<a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
<a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.

<h3>Naming of metadata files and storage</h3>

Expand Down Expand Up @@ -64,12 +64,12 @@ <h2>SEE ALSO</h2>
</em>

<p>
See also related <a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
See also related <a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.


<h2>AUTHORS</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
at the Czech Technical University in Prague, developed
during <a href="http://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2014</a> (mentors: Margherita Di Leo, Martin Landa)
8 changes: 4 additions & 4 deletions src/gui/wxpython/wx.metadata/t.info.iso/t.info.iso.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h2>DESCRIPTION</h2>

<em>t.info.iso</em> creates metadata of temporal maps according
to <a href="http://www.iso.org/iso/catalogue_detail.htm?csnumber=26020">ISO
to <a href="https://www.iso.org/iso/catalogue_detail.htm?csnumber=26020">ISO
19115</a>.

<p>
Expand All @@ -18,12 +18,12 @@ <h2>SEE ALSO</h2>
</em>

<p>
See also related <a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
See also related <a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.


<h2>AUTHORS</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
at the Czech Technical University in Prague, developed
during <a href="http://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2014</a> (mentors: Margherita Di Leo, Martin Landa)
10 changes: 5 additions & 5 deletions src/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h2>DESCRIPTION</h2>

<em>v.info.iso</em> creates metadata of vector maps according
to <a href="http://www.iso.org/iso/catalogue_detail.htm?csnumber=26020">ISO
to <a href="https://www.iso.org/iso/catalogue_detail.htm?csnumber=26020">ISO
19115</a>.

<p>
Expand All @@ -11,7 +11,7 @@ <h2>DESCRIPTION</h2>
<h2>NOTES</h2>

For dependencies and installation instructions see
<a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
<a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.

<h3>Naming of metadata files and storage</h3>

Expand Down Expand Up @@ -65,12 +65,12 @@ <h2>SEE ALSO</h2>
</em>

<p>
See also related <a href="http://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.
See also related <a href="https://grasswiki.osgeo.org/wiki/ISO/INSPIRE_Metadata_Support">wiki page</a>.


<h2>AUTHORS</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
at the Czech Technical University in Prague, developed
during <a href="http://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
during <a href="https://trac.osgeo.org/grass/wiki/GSoC/2014/MetadataForGRASS">Google
Summer of Code 2014</a> (mentors: Margherita Di Leo, Martin Landa)
2 changes: 1 addition & 1 deletion src/gui/wxpython/wx.mwprecip/g.gui.mwprecip.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ <h2>NOTES</h2>

<h2>AUTHOR</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
4 changes: 2 additions & 2 deletions src/hadoop/hd/hd.db.connect/hd.db.connect.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ <h2>SEE ALSO</h2>
</em>

<p>
See also related <a href="http://grasswiki.osgeo.org/wiki/">wiki page</a>.
See also related <a href="https://grasswiki.osgeo.org/wiki/">wiki page</a>.


<h2>AUTHOR</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
at the Czech Technical University in Prague, developed
during master thesis project 2016 (mentor: Martin Landa)
4 changes: 2 additions & 2 deletions src/hadoop/hd/hd.esri2vector/hd.esri2vector.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ <h2>SEE ALSO</h2>
</em>

<p>
See also related <a href="http://grasswiki.osgeo.org/wiki/">wiki page</a>.
See also related <a href="https://grasswiki.osgeo.org/wiki/">wiki page</a>.


<h2>AUTHOR</h2>

Matej Krejci, <a href="http://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
Matej Krejci, <a href="https://geo.fsv.cvut.cz/gwiki/osgeorel">OSGeoREL</a>
at the Czech Technical University in Prague, developed
during master thesis project 2016 (mentor: Martin Landa)
Loading

0 comments on commit 5e7dad1

Please sign in to comment.