Merge branch 'main' into docs-gh-edit

Author: cwhite911

.github/workflows/docker.yml

@@ -88,5 +88,7 @@ jobs:
           context: .
           tags: ${{ steps.meta.outputs.tags }}
           file: docker/${{ matrix.os }}/Dockerfile
+          cache-from: type=gha,scope=${{ matrix.os }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.os }}
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/python-code-quality.yml

@@ -30,13 +30,13 @@ jobs:
       PYTHON_VERSION: "3.13"
       MIN_PYTHON_VERSION: "3.9"
       # renovate: datasource=pypi depName=flake8
-      FLAKE8_VERSION: "7.1.1"
+      FLAKE8_VERSION: "7.1.2"
       # renovate: datasource=pypi depName=pylint
       PYLINT_VERSION: "3.3.4"
       # renovate: datasource=pypi depName=bandit
       BANDIT_VERSION: "1.8.2"
       # renovate: datasource=pypi depName=ruff
-      RUFF_VERSION: "0.9.5"
+      RUFF_VERSION: "0.9.6"
 
     runs-on: ${{ matrix.os }}
     permissions:

.markdownlint.yml

@@ -8,8 +8,6 @@ fix: true
 MD041: false # first-line-h1
 
 # Errors from .html to .md rename (first step in HTML to Markdown conversion)
-no-duplicate-heading: false
-heading-increment: false
 no-inline-html: false
 no-alt-text: false
 line-length: false

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
           )
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.9.5
+    rev: v0.9.6
     hooks:
       # Run the linter.
       - id: ruff
@@ -50,7 +50,7 @@ repos:
     hooks:
       - id: markdownlint-fix
   - repo: https://github.com/pycqa/flake8
-    rev: 7.1.1
+    rev: 7.1.2
     hooks:
       - id: flake8
         exclude: |

display/d.mon/d.mon.md

@@ -22,7 +22,7 @@ The desired monitor should be started once and need not be restarted
 unless it is stopped for some reason. A monitor may continue to run for
 any length of time, even when no GRASS session is being run.
 
-### Stopping a monitor
+### Listing currently running monitors
 
 A graphics monitor has two different types of status: monitor program
 *not running*, and monitor *running*. A monitor that has been started

docker/alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.21@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099 as common
+FROM alpine:3.21@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c as common
 
 # Based on:
 # https://github.com/mundialis/docker-grass-gis/blob/master/Dockerfile
@@ -167,15 +167,6 @@ RUN echo "  => Configure and compile grass" && \
     make install && \
     ldconfig /etc/ld.so.conf.d
 
-# Build the GDAL-GRASS plugin
-# renovate: datasource=github-tags depName=OSGeo/gdal-grass
-ARG GDAL_GRASS_VERSION=1.0.3
-RUN git clone --branch $GDAL_GRASS_VERSION --depth 1 https://github.com/OSGeo/gdal-grass.git /src/gdal-grass
-WORKDIR /src/gdal-grass
-RUN cmake -B build -DAUTOLOAD_DIR=/usr/lib/gdalplugins -DBUILD_TESTING=OFF && \
-    cmake --build build && \
-    cmake --install build
-
 # Get rid of version number here, restore in next stage via symbolic link
 RUN mv $(grass --config path) /usr/local/grass
 
@@ -200,13 +191,23 @@ ENV GRASS_SKIP_MAPSET_OWNER_CHECK=1 \
     LC_ALL="en_US.UTF-8" \
     PYTHONPATH="/usr/local/grass/etc/python:$PYTHONPATH"
 
-# Copy GRASS GIS and GDAL GRASS driver from build image
+# Copy GRASS GIS from build image
 COPY --from=build /usr/local/bin/grass /usr/local/bin/grass
 COPY --from=build /usr/local/grass* /usr/local/grass/
-COPY --from=build /usr/lib/gdalplugins/*_GRASS.so /usr/lib/gdalplugins/
 # Set GISBASE
 ENV GISBASE /usr/local/grass
 
+# Build the GDAL-GRASS plugin
+# renovate: datasource=github-tags depName=OSGeo/gdal-grass
+ARG GDAL_GRASS_VERSION=1.0.3
+RUN git clone --branch $GDAL_GRASS_VERSION --depth 1 https://github.com/OSGeo/gdal-grass.git /src/gdal-grass
+WORKDIR /src/gdal-grass
+RUN cmake -B build -DAUTOLOAD_DIR=/usr/lib/gdalplugins -DBUILD_TESTING=OFF && \
+    cmake --build build && \
+    cmake --install build
+# Copy GDAL GRASS driver from build image
+COPY --from=build /usr/lib/gdalplugins/*_GRASS.so /usr/lib/gdalplugins/
+
 # run simple LAZ test
 COPY docker/testdata/simple.laz /tmp/
 COPY docker/testdata/test_grass_python.py docker/testdata/test_grass_session.py docker/alpine/grass_tests.sh /scripts/

docker/alpine/grass_tests.sh

@@ -6,8 +6,8 @@
 apk add --no-cache py3-scikit-learn
 
 echo "Testing the GDAL-GRASS plugins:"
-gdalinfo --formats | grep -p "GRASS Rasters" && \
-ogrinfo --formats | grep -p "GRASS Vectors" || echo "...failed"
+gdalinfo --formats | grep "GRASS Rasters" && \
+ogrinfo --formats | grep "GRASS Vectors" || echo "...failed"
 
 # Test grass-session
 /usr/bin/python3 /scripts/test_grass_session.py

imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.md

@@ -47,7 +47,7 @@ line or the GUI, or it can be invoked as OPTION 8 through
 [i.ortho.photo](i.ortho.photo.md), an interactive terminal is used to
 determine the options.
 
-#### Interactive mode
+### Interactive mode
 
 You are first asked if all images within the imagery group should be
 rectified. If this option is not chosen, you are asked to specify for

imagery/i.vi/i.vi.md

@@ -59,7 +59,7 @@ proper level of correction to use with *i.vi*.
 
 ### Vegetation Indices
 
-**ARVI: Atmospheric Resistant Vegetation Index**
+#### ARVI: Atmospheric Resistant Vegetation Index
 
 ARVI is resistant to atmospheric effects (in comparison to the NDVI) and
 is accomplished by a self correcting process for the atmospheric effect
@@ -73,7 +73,7 @@ ARVI = (nirchan - (2.0*redchan - bluechan)) /
        ( nirchan + (2.0*redchan - bluechan))
 ```
 
-**CI: Crust Index**
+#### CI: Crust Index
 
 Advantage is taken of a unique spectral feature of soil biogenic crust
 containing cyanobacteria. It has been shown that the special phycobilin
@@ -90,15 +90,15 @@ CI = 1 - (redchan - bluechan) /
        (redchan + bluechan)
 ```
 
-**DVI: Difference Vegetation Index**
+#### DVI: Difference Vegetation Index
 
 ```sh
 dvi( redchan, nirchan )
 
 DVI = ( nirchan - redchan )
 ```
 
-**EVI: Enhanced Vegetation Index**
+#### EVI: Enhanced Vegetation Index
 
 The enhanced vegetation index (EVI) is an optimized index designed to
 enhance the vegetation signal with improved sensitivity in high biomass
@@ -115,7 +115,7 @@ EVI = 2.5 * ( nirchan - redchan ) /
       ( nirchan + 6.0 * redchan - 7.5 * bluechan + 1.0 )
 ```
 
-**EVI2: Enhanced Vegetation Index 2**
+#### EVI2: Enhanced Vegetation Index 2
 
 A 2-band EVI (EVI2), without a blue band, which has the best similarity
 with the 3-band EVI, particularly when atmospheric effects are
@@ -133,7 +133,7 @@ EVI2 = 2.5 * ( nirchan - redchan ) /
        ( nirchan + 2.4 * redchan + 1.0 )
 ```
 
-**GARI: green atmospherically resistant vegetation index**
+#### GARI: green atmospherically resistant vegetation index
 
 The formula was actually defined: Gitelson, Anatoly A.; Kaufman, Yoram
 J.; Merzlyak, Mark N. (1996) Use of a green channel in remote sensing of
@@ -148,7 +148,7 @@ GARI = ( nirchan - (greenchan - (bluechan - redchan))) /
        ( nirchan + (greenchan - (bluechan - redchan)))
 ```
 
-**GEMI: Global Environmental Monitoring Index**
+#### GEMI: Global Environmental Monitoring Index
 
 ```sh
 gemi( redchan, nirchan )
@@ -160,7 +160,7 @@ GEMI = (( (2*((nirchan * nirchan)-(redchan * redchan)) +
        ( (redchan - 0.125) / (1 - redchan))
 ```
 
-**GVI: Green Vegetation Index**
+#### GVI: Green Vegetation Index
 
 ```sh
 gvi( bluechan, greenchan, redchan, nirchan, chan5chan, chan7chan)
@@ -170,23 +170,23 @@ GVI = ( -0.2848 * bluechan - 0.2435 * greenchan -
       0.1800 * chan7chan)
 ```
 
-**IPVI: Infrared Percentage Vegetation Index**
+#### IPVI: Infrared Percentage Vegetation Index
 
 ```sh
 ipvi( redchan, nirchan )
 
 IPVI = nirchan/(nirchan+redchan)
 ```
 
-**MSAVI2: second Modified Soil Adjusted Vegetation Index**
+#### MSAVI2: second Modified Soil Adjusted Vegetation Index
 
 ```sh
 msavi2( redchan, nirchan )
 
 MSAVI2 = (1/2)*(2*NIR+1-sqrt((2*NIR+1)^2-8*(NIR-red)))
 ```
 
-**MSAVI: Modified Soil Adjusted Vegetation Index**
+#### MSAVI: Modified Soil Adjusted Vegetation Index
 
 ```sh
 msavi( redchan, nirchan )
@@ -198,7 +198,7 @@ where a is the soil line intercept, s is the soil line slope, and X is
 an adjustment factor which is set to minimize soil noise (0.08 in
 original papers).
 
-**NDVI: Normalized Difference Vegetation Index**
+#### NDVI: Normalized Difference Vegetation Index
 
 ```sh
 ndvi( redchan, nirchan )
@@ -216,7 +216,7 @@ Satellite specific band numbers ([NIR, Red]):
 NDVI = (NIR - Red) / (NIR + Red)
 ```
 
-**NDWI: Normalized Difference Water Index** (after McFeeters, 1996)
+#### NDWI: Normalized Difference Water Index (after McFeeters, 1996)
 
 This index is suitable to detect water bodies.
 
@@ -238,31 +238,33 @@ NDWI = (NIR - SWIR) / (NIR + SWIR)
 This index is important for monitoring vegetation health (not
 implemented).
 
-**PVI: Perpendicular Vegetation Index**
+#### PVI: Perpendicular Vegetation Index
 
 ```sh
 pvi( redchan, nirchan, soil_line_slope )
 
 PVI = sin(a)NIR-cos(a)red
 ```
 
-**SAVI: Soil Adjusted Vegetation Index**
+#### SAVI: Soil Adjusted Vegetation Index
 
 ```sh
 savi( redchan, nirchan )
 
 SAVI = ((1.0+0.5)*(nirchan - redchan)) / (nirchan + redchan +0.5)
 ```
 
-**SR: Simple Vegetation ratio**
+#### SR: Simple Vegetation ratio
 
 ```sh
 sr( redchan, nirchan )
 
 SR = (nirchan/redchan)
 ```
 
-**VARI: Visible Atmospherically Resistant Index** VARI was designed to
+#### VARI: Visible Atmospherically Resistant Index
+
+VARI was designed to
 introduce an atmospheric self-correction (Gitelson A.A., Kaufman Y.J.,
 Stark R., Rundquist D., 2002. Novel algorithms for estimation of
 vegetation fraction Remote Sensing of Environment (80), pp76-87.)
@@ -273,7 +275,7 @@ vari = ( bluechan, greenchan, redchan )
 VARI = (green - red ) / (green + red - blue)
 ```
 
-**WDVI: Weighted Difference Vegetation Index**
+#### WDVI: Weighted Difference Vegetation Index
 
 ```sh
 wdvi( redchan, nirchan, soil_line_weight )
@@ -464,7 +466,7 @@ i.landsat.toar input=lsat7_2002. output=lsat7_2002_toar. sensor=tm7 \
 The resulting Landsat channels are names
 `lsat7_2002_toar.1 .. lsat7_2002_toar.8`.
 
-#### Calculation of NDVI
+#### NDVI
 
 The calculation of NDVI from the reflectance values is done as follows:
 
@@ -481,7 +483,7 @@ d.rast.leg lsat7_2002.ndvi
 ![North Carolina dataset: NDVI](i_vi_ndvi.png)  
 North Carolina dataset: NDVI
 
-#### Calculation of ARVI
+#### ARVI
 
 The calculation of ARVI from the reflectance values is done as follows:
 
@@ -497,7 +499,7 @@ d.rast.leg lsat7_2002.arvi
 ![North Carolina dataset: ARVI](i_vi_arvi.png)  
 North Carolina dataset: ARVI
 
-#### Calculation of GARI
+#### GARI
 
 The calculation of GARI from the reflectance values is done as follows: