Merge branch 'main' into docs-github

OSGeo · Feb 13, 2025 · a1d7d1b · a1d7d1b
2 parents da42c71 + c0fe7d7
commit a1d7d1b
Show file tree

Hide file tree

Showing 103 changed files with 649 additions and 910 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -295,13 +295,13 @@ RUN ./configure $GRASS_CONFIG \
     mv module_items.xml /usr/local/grass85/gui/wxpython/xml/module_items.xml;
 
 # Build the GDAL-GRASS plugin
-RUN git clone https://github.com/OSGeo/gdal-grass \
+# 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 \
     && cd "gdal-grass" \
-    && ./configure \
-      --with-gdal=/usr/bin/gdal-config \
-      --with-grass=/usr/local/grass85 \
-    && make -j $NUMTHREADS \
-    && make install -j $NUMTHREADS \
+    && cmake -B build -DAUTOLOAD_DIR=/usr/lib/gdalplugins -DBUILD_TESTING=OFF \
+    && cmake --build build \
+    && cmake --install build \
     && cd /src \
     && rm -rf "gdal-grass"
 

diff --git a/display/d.geodesic/d.geodesic.md b/display/d.geodesic/d.geodesic.md
@@ -32,8 +32,7 @@ d.geodesic coordinates=55:58W,33:18S,26:43E,60:37N \
   line_color=yellow text_color=red units=kilometers
 ```
 
-<img src="d_geodesic.png" data-border="1"
-alt="Geodesic line (great circle line)" />  
+![Geodesic line (great circle line)](d_geodesic.png)  
 *Geodesic line (great circle line)*
 
 ## NOTES

diff --git a/display/d.grid/d.grid.md b/display/d.grid/d.grid.md
@@ -39,8 +39,7 @@ or
 d.grid -g size=0.5 color=255:0:0
 ```
 
-<img src="d_grid_red_grid.png" data-border="0"
-alt="d.grid red grid example" />  
+![d.grid red grid example](d_grid_red_grid.png)  
 *Figure: Showing a geographic grid in red line color*
 
 To draw a blue standard rectangular grid at a 500 (meter) spacing run
@@ -50,8 +49,7 @@ the following:
 d.grid size=500 color=blue
 ```
 
-<img src="d_grid_blue_grid.png" data-border="0"
-alt="d.grid blue grid example" />  
+![d.grid blue grid example](d_grid_blue_grid.png)  
 *Figure: Showing a rectangular grid in blue line color*
 
 ## SEE ALSO

diff --git a/display/d.histogram/d.histogram.md b/display/d.histogram/d.histogram.md
@@ -26,8 +26,7 @@ d.mon wx0
 d.histogram map=elevation
 ```
 
-<img src="d_histogram_bar.png" data-border="0"
-alt="d.histogram bar graph example" />  
+![d.histogram bar graph example](d_histogram_bar.png)  
 *Figure: Bar graph histogram for elevation map*
 
 Running the command below will generate the pie graph shown in the
@@ -38,8 +37,7 @@ g.region raster=landuse96_28m -p
 d.histogram map=landuse96_28m style=pie
 ```
 
-<img src="d_histogram_pie.png" data-border="0"
-alt="d.histogram pie graph example" />  
+![d.histogram pie graph example](d_histogram_pie.png)  
 *Figure: Pie graph histogram for landuse map*
 
 ## SEE ALSO

diff --git a/display/d.legend/d.legend.md b/display/d.legend/d.legend.md
@@ -111,8 +111,7 @@ d.rast elevation
 d.legend -d elevation
 ```
 
-<img src="d_legend.png" data-border="1"
-alt="Elevation map with legend" />
+![Elevation map with legend](d_legend.png)
 
 Displaying the legend with custom labels and background:
 
@@ -122,8 +121,7 @@ d.rast elevation
 d.legend raster=elevation -t label_step=20 label_values=108 title=Legend -b bgcolor=255:255:204 border_color=gray
 ```
 
-<img src="d_legend_custom_labels_and_background.png" data-border="1"
-alt="Elevation map with custom legend" />
+![Elevation map with custom legend](d_legend_custom_labels_and_background.png)
 
 Displaying the legend with logarithmic scale:
 
@@ -134,8 +132,7 @@ d.rast flowacc
 d.legend raster=flowacc -t -l label_step=1
 ```
 
-<img src="d_legend_logarithmic.png" data-border="1"
-alt="Flow accumulation map with logarithmic legend" />
+![Flow accumulation map with logarithmic legend](d_legend_logarithmic.png)
 
 ## SEE ALSO
 

diff --git a/display/d.mon/d.mon.md b/display/d.mon/d.mon.md
@@ -64,7 +64,7 @@ display](wxGUI.md#map-display-window)*, run
 d.mon start=wx0
 ```
 
-<img src="d_mon_wx0.png" data-border="0" alt="Blank wx0 display" />  
+![Blank wx0 display](d_mon_wx0.png)  
 *Figure: The initialization of display monitor wx0*
 
 All subsequently displayed data will be rendered on monitor `wx0`.
@@ -74,8 +74,7 @@ g.region raster=elevation -p
 d.rast map=elevation
 ```
 
-<img src="d_mon_wx0_raster.png" data-border="0"
-alt="Display wx0 with raster map" />  
+![Display wx0 with raster map](d_mon_wx0_raster.png)  
 *Figure: The display wx0 showing an elevation raster map*
 
 ### CAIRO file renderer monitor

diff --git a/display/d.rast.num/d.rast.num.md b/display/d.rast.num/d.rast.num.md
@@ -31,8 +31,7 @@ r.grow.distance input=streams_derived distance=dist_from_streams
 d.rast.num dist_from_streams -a
 ```
 
-<img src="d_rast_num_zoom.png" data-border="0"
-alt="Euclidean distance from the streams network in meters" />  
+![Euclidean distance from the streams network in meters](d_rast_num_zoom.png)  
 *Euclidean distance from the streams network in meters (detail, numbers
 shown with d.rast.num)*
 

diff --git a/display/d.rast/d.rast.md b/display/d.rast/d.rast.md
@@ -11,8 +11,7 @@ Display raster map "elevation":
 d.rast map=elevation
 ```
 
-<img src="d_rast_elevation.png" data-border="0"
-alt="d.rast elevation" />  
+![d.rast elevation](d_rast_elevation.png)  
 *Figure: elevation raster map visualization*
 
 Display raster map "elevation" but only the raster cells with values
@@ -22,8 +21,7 @@ between 75 and 80 meters:
 d.rast map=elevation values=75-80
 ```
 
-<img src="d_rast_elevation_values.png" data-border="0"
-alt="d.rast elevation with values" />  
+![d.rast elevation with values](d_rast_elevation_values.png)  
 *Figure: elevation raster map showing values between 75 and 80 meters*
 
 Display raster map "landuse96_28m" but only categories 1 and 2:
@@ -32,7 +30,7 @@ Display raster map "landuse96_28m" but only categories 1 and 2:
 d.rast landuse96_28m values=1,2
 ```
 
-<img src="d_rast_landuse.png" data-border="0" alt="d.rast landuse" />  
+![d.rast landuse](d_rast_landuse.png)  
 *Figure: landuse raster map showing categories 1 and 2*
 
 ## SEE ALSO

diff --git a/display/d.rgb/d.rgb.md b/display/d.rgb/d.rgb.md
@@ -49,7 +49,7 @@ g.region raster=lsat7_2002_10 -p
 d.rgb blue=lsat7_2002_10 green=lsat7_2002_20 red=lsat7_2002_30
 ```
 
-<img src="d_rgb.png" data-border="0" alt="d.rgb example" />  
+![d.rgb example](d_rgb.png)  
 *Figure: Visual color composite of a LANDSAT scene (North Carolina
 sample dataset)*
 

diff --git a/display/d.vect.thematic/d.vect.thematic.md b/display/d.vect.thematic/d.vect.thematic.md
@@ -78,8 +78,7 @@ d.vect.thematic map=schools_wake@PERMANENT column=CORECAPACI algorithm=std \
 d.legend.vect -b at=2,80 font=Sans symbol_size=25
 ```
 
-[<img src="d_vect_thematic.png" width="600" height="377"
-alt="d_vect_thematic example" />](d_vect_thematic.png)  
+![d_vect_thematic example](d_vect_thematic.png)  
 *Thematic map of average elevation and school capacity*
 
 ## SEE ALSO

diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
@@ -123,6 +123,7 @@ ENV GRASS_BUILD_PACKAGES="\
       build-base \
       bzip2-dev \
       cairo-dev \
+      cmake \
       fftw-dev \
       freetype-dev \
       geos-dev \
@@ -178,13 +179,13 @@ RUN cp /usr/local/grass/gui/wxpython/xml/module_items.xml module_items.xml; \
     mkdir -p /usr/local/grass/gui/wxpython/xml/; \
     mv module_items.xml /usr/local/grass/gui/wxpython/xml/module_items.xml;
 
-RUN git clone https://github.com/OSGeo/gdal-grass /src/gdal-grass
+# 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 ./configure \
-    --with-gdal=/usr/bin/gdal-config \
-    --with-grass=/usr/local/grass && \
-    make -j $NUMTHREADS && \
-    make install -j $NUMTHREADS
+RUN cmake -B build -DAUTOLOAD_DIR=/usr/lib/gdalplugins -DBUILD_TESTING=OFF && \
+    cmake --build build && \
+    cmake --install build
 
 
 FROM common as grass

diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile
@@ -295,13 +295,13 @@ RUN ./configure $GRASS_CONFIG \
     mv module_items.xml /usr/local/grass85/gui/wxpython/xml/module_items.xml;
 
 # Build the GDAL-GRASS plugin
-RUN git clone https://github.com/OSGeo/gdal-grass \
+# 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 \
     && cd "gdal-grass" \
-    && ./configure \
-      --with-gdal=/usr/bin/gdal-config \
-      --with-grass=/usr/local/grass85 \
-    && make -j $NUMTHREADS \
-    && make install -j $NUMTHREADS \
+    && cmake -B build -DAUTOLOAD_DIR=/usr/lib/gdalplugins -DBUILD_TESTING=OFF \
+    && cmake --build build \
+    && cmake --install build \
     && cd /src \
     && rm -rf "gdal-grass"
 

diff --git a/general/g.region/g.region.md b/general/g.region/g.region.md
@@ -396,7 +396,7 @@ g.region -l format=json
 *[g.access](g.access.md), [g.mapsets](g.mapsets.md),
 [g.proj](g.proj.md)  
 Environment variables: [GRASS_REGION and
-WIND_OVERRIDE](variables.md#internal)*
+WIND_OVERRIDE](variables.md#list-of-selected-internal-grass-environment-variables)*
 
 ## AUTHOR
 

diff --git a/gui/wxpython/animation/g.gui.animation.md b/gui/wxpython/animation/g.gui.animation.md
@@ -36,8 +36,7 @@ follow these steps:
 - choose parameter (parameter of *[m.nviz.image](m.nviz.image.md)*) to
   animate (e.g. color_map)
 
-<img src="wxGUI_animation_tool.jpg" data-border="1"
-alt="Animation Tool screenshot" />  
+![Animation Tool screenshot](wxGUI_animation_tool.jpg)
 
 ## NOTE
 

diff --git a/gui/wxpython/datacatalog/g.gui.datacatalog.md b/gui/wxpython/datacatalog/g.gui.datacatalog.md
@@ -17,9 +17,8 @@ Data Catalog allows you to:
 Note that projects are called *locations* at some places and in old
 documentation.
 
-<img src="datacatalog.png" data-border="0"
-alt="data catalog screenshot" />  
-Figure: Data Catalog integrated in wxGUI.
+![data catalog screenshot](datacatalog.png)  
+*Figure: Data Catalog integrated in wxGUI.*
 
 ## NOTES
 

diff --git a/gui/wxpython/dbmgr/g.gui.dbmgr.md b/gui/wxpython/dbmgr/g.gui.dbmgr.md
@@ -17,14 +17,12 @@ stand-alone module *g.gui.dbmgr*.
 - modify vector map DB connection settings - add, remove or modify
   layers.
 
-[<img src="dbmgr_frame.png" width="600" height="401"
-alt="Attribute Table Manager" />](dbmgr_frame.png)  
+![Attribute Table Manager](dbmgr_frame.png)  
 *Figure: Simple attribute filtering using Attribute Table Manager.*
 
 ### SQL Builder
 
-[<img src="dbmgr_sql_builder.png" width="700" height="287"
-alt="Attribute Table Manager and SQL Builder" />](dbmgr_sql_builder.png)  
+![Attribute Table Manager and SQL Builder](dbmgr_sql_builder.png)  
 *Figure: Attribute filtering using Attribute Table Manager and SQL
 Builder.*
 

diff --git a/gui/wxpython/docs/wxGUI.iscatt.md b/gui/wxpython/docs/wxGUI.iscatt.md
@@ -1,7 +1,7 @@
 ## KEYWORDS
 
 [display](display.md), [GUI](topic_GUI.md),
-[imagery](keywords.md#imagery), [scatterplot](keywords.md#scatterplot),
+[imagery](keywords.md#imagery), [scatterplot](keywords.md),
 [plot](keywords.md#plot)
 
 ## DESCRIPTION
@@ -26,8 +26,7 @@ interactivity, which allows user to:
 
 ## TOOL CONTROLS LAYOUT
 
-<img src="wxGUI_iscatt.jpg" data-border="1"
-alt="Interactive Scatter Plot Tool" />  
+![Interactive Scatter Plot Tool](wxGUI_iscatt.jpg)  
 
 If editing mode is activated (the green polygon tool in toolbar), the
 areas which were selected in the scatter plots are highlighted. In the