Merge remote-tracking branch 'origin/test/additionaal-logs-fss3' into…

… test/additionaal-logs-fss3
linz · Feb 24, 2025 · fc917b6 · fc917b6
2 parents 3b2240e + bc111ab
commit fc917b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)