Skip to content

Commit

Permalink
Merge branch 'main' into simwe-fix-coverity-scan
Browse files Browse the repository at this point in the history
  • Loading branch information
wenzeslaus authored Feb 13, 2025
2 parents 9f44e55 + 6b652b6 commit c1cf8da
Show file tree
Hide file tree
Showing 46 changed files with 94 additions and 262 deletions.
2 changes: 0 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ docker
!docker/alpine/grass_tests.sh
.gitignore
.github
.travis
.travis.yml
# Do not copy files from previous compilations
dist.*

Expand Down
2 changes: 0 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ CI:
- changed-files:
- any-glob-to-any-file:
- .github/**
- .travis/**
- binder/**
- .travis.yml
- renovate.json
- .pre-commit-config.yaml
Windows:
Expand Down
45 changes: 0 additions & 45 deletions .travis.yml

This file was deleted.

8 changes: 0 additions & 8 deletions .travis/linux.before_install.sh

This file was deleted.

9 changes: 0 additions & 9 deletions .travis/linux.install.sh

This file was deleted.

38 changes: 0 additions & 38 deletions .travis/linux.script.sh

This file was deleted.

12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# GRASS GIS Repository

[![Build Status](https://api.travis-ci.com/OSGeo/grass.svg?branch=main)](https://travis-ci.com/OSGeo/grass)
[![GCC C/C++ standards check](https://github.com/OSGeo/grass/workflows/GCC%20C/C++%20standards%20check/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3A%22GCC+C%2FC%2B%2B+standards+check%22)
[![Python code quality check](https://github.com/OSGeo/grass/workflows/Python%20code%20quality%20check/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3A%22Python+code+quality+check%22)
[![General linting](https://github.com/OSGeo/grass/workflows/General%20linting/badge.svg)](https://github.com/OSGeo/grass/actions?query=workflow%3A%22General+linting%22)
Expand Down
3 changes: 1 addition & 2 deletions display/d.geodesic/d.geodesic.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions display/d.grid/d.grid.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions display/d.histogram/d.histogram.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 3 additions & 6 deletions display/d.legend/d.legend.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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:

Expand All @@ -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

Expand Down
5 changes: 2 additions & 3 deletions display/d.mon/d.mon.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions display/d.rast.num/d.rast.num.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)*

Expand Down
8 changes: 3 additions & 5 deletions display/d.rast/d.rast.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion display/d.rgb/d.rgb.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)*

Expand Down
3 changes: 1 addition & 2 deletions display/d.vect.thematic/d.vect.thematic.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions doc/infrastructure.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,7 @@ Maintainer: Vaclav Petras
- Details: <https://github.com/OSGeo/grass/pull/525>
- CI workflow with:
- A build job which is not parallelized and is meant for clear & relatively fast
check of compilation and building in general. (Duplicating what is running
on Travis)
check of compilation and building in general.
- A test job which of course needs to build, but the main focus is to run tests,
so the compilation is parallelized (depending on nproc) and thus potentially
less readable. This runs the whole test suite. (You need to run it locally to
Expand Down
13 changes: 7 additions & 6 deletions docker/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ ENV GRASS_BUILD_PACKAGES="\
build-base \
bzip2-dev \
cairo-dev \
cmake \
fftw-dev \
freetype-dev \
geos-dev \
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion general/g.region/g.region.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion gui/wxpython/docs/wxGUI.iscatt.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions imagery/i.atcorr/i.atcorr.md
Original file line number Diff line number Diff line change
Expand Up @@ -882,8 +882,7 @@ To apply atmospheric correction to the remaining bands, only the last
line in the 6S parameters file (i.e., the sensor band) needs to be
changed. The other parameters will remain the same.

[<img src="i_atcorr_B02_atcorr.png" data-border="0" width="600"
height="486" alt="i.atcorr example" />](i_atcorr_B02_atcorr.png)
![i.atcorr example](i_atcorr_B02_atcorr.png)
*Figure: Sentinel-2A Band 02 with applied atmospheric correction
(histogram equalization grayscale color scheme)*

Expand Down
Loading

0 comments on commit c1cf8da

Please sign in to comment.