diff --git a/.github/workflows/format-tests.yml b/.github/workflows/format-tests.yml index 5171bd95..d9d9b487 100644 --- a/.github/workflows/format-tests.yml +++ b/.github/workflows/format-tests.yml @@ -42,12 +42,12 @@ jobs: - name: End to end test - Hillshade Greyscale run: | - docker run -v "${{ runner.temp }}:/tmp/" topo-imagery python3 generate_hillshade.py --from-file ./tests/data/hillshade.json --preset greyscale --target /tmp/ --force + docker run -v "${{ runner.temp }}:/tmp/" topo-imagery python3 generate_hillshade.py --from-file ./tests/data/hillshade.json --preset hillshade --target /tmp/ --force cmp --silent "${{ runner.temp }}/BK39_10000_0101.tiff" ./scripts/tests/data/output/BK39_10000_0101_greyscale.tiff - name: End to end test - Hillshade Igor run: | - docker run -v "${{ runner.temp }}:/tmp/" topo-imagery python3 generate_hillshade.py --from-file ./tests/data/hillshade.json --preset igor --target /tmp/ --force + docker run -v "${{ runner.temp }}:/tmp/" topo-imagery python3 generate_hillshade.py --from-file ./tests/data/hillshade.json --preset hillshade-igor --target /tmp/ --force cmp --silent "${{ runner.temp }}/BK39_10000_0101.tiff" ./scripts/tests/data/output/BK39_10000_0101_igor.tiff - name: End to end test - Historical Aerial Imagery diff --git a/scripts/gdal/gdal_presets.py b/scripts/gdal/gdal_presets.py index b0972f6f..cf6bd17c 100644 --- a/scripts/gdal/gdal_presets.py +++ b/scripts/gdal/gdal_presets.py @@ -90,5 +90,5 @@ class CompressionPreset(str, Enum): class HillshadePreset(str, Enum): """Enum for the different type of hillshade available for generating from a DEM.""" - GREYSCALE = "greyscale" # Standard/default mono-directional hillshade - IGOR = "igor" # Whiter hillshade (see http://maperitive.net/docs/Commands/GenerateReliefImageIgor.html) + GREYSCALE = "hillshade" # Standard/default mono-directional hillshade + IGOR = "hillshade-igor" # Whiter hillshade (see http://maperitive.net/docs/Commands/GenerateReliefImageIgor.html)