[processing][gdal] Fix execution of hillshade with multidirectional argument

And add tests

Author: nyalldawson

python/plugins/processing/algs/gdal/hillshade.py

@@ -147,8 +147,13 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         arguments.append(str(self.parameterAsDouble(parameters, self.Z_FACTOR, context)))
         arguments.append('-s')
         arguments.append(str(self.parameterAsDouble(parameters, self.SCALE, context)))
-        arguments.append('-az')
-        arguments.append(str(self.parameterAsDouble(parameters, self.AZIMUTH, context)))
+
+        multidirectional = self.parameterAsBool(parameters, self.MULTIDIRECTIONAL, context)
+        # azimuth and multidirectional are mutually exclusive
+        if not multidirectional:
+            arguments.append('-az')
+            arguments.append(str(self.parameterAsDouble(parameters, self.AZIMUTH, context)))
+
         arguments.append('-alt')
         arguments.append(str(self.parameterAsDouble(parameters, self.ALTITUDE, context)))
 
@@ -162,7 +167,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         if self.parameterAsBool(parameters, self.COMBINED, context):
             arguments.append('-combined')
 
-        if self.parameterAsBool(parameters, self.MULTIDIRECTIONAL, context):
+        if multidirectional:
             arguments.append('-multidirectional')
 
         options = self.parameterAsString(parameters, self.OPTIONS, context)

python/plugins/processing/tests/GdalAlgorithmsTest.py

@@ -41,6 +41,7 @@
 from processing.algs.gdal.GridInverseDistanceNearestNeighbor import GridInverseDistanceNearestNeighbor
 from processing.algs.gdal.GridLinear import GridLinear
 from processing.algs.gdal.GridNearestNeighbor import GridNearestNeighbor
+from processing.algs.gdal.hillshade import hillshade
 from processing.algs.gdal.ogr2ogr import ogr2ogr
 from processing.algs.gdal.proximity import proximity
 from processing.algs.gdal.rasterize import rasterize
@@ -926,6 +927,101 @@ def testOgr2Ogr(self):
              '-f "LIBKML" "d:/temp/my out/check.kml" ' +
              source + ' polys2'])
 
+    def testHillshade(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'dem.tif')
+        alg = hillshade()
+        alg.initAlgorithm()
+
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'BAND': 1,
+                                    'Z_FACTOR': 5,
+                                    'SCALE': 2,
+                                    'AZIMUTH': 90,
+                                    'ALTITUDE': 20,
+                                    'OUTPUT': 'd:/temp/check.tif'}, context, feedback),
+            ['gdaldem',
+             'hillshade ' +
+             source + ' ' +
+             'd:/temp/check.tif -of GTiff -b 1 -z 5.0 -s 2.0 -az 90.0 -alt 20.0'])
+
+        #paths with space
+        source_with_space = os.path.join(testDataPath, 'raster with spaces.tif')
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source_with_space,
+                                    'BAND': 1,
+                                    'Z_FACTOR': 5,
+                                    'SCALE': 2,
+                                    'AZIMUTH': 90,
+                                    'ALTITUDE': 20,
+                                    'OUTPUT': 'd:/temp/check out.tif'}, context, feedback),
+            ['gdaldem',
+             'hillshade ' +
+             '"' + source_with_space + '" ' +
+             '"d:/temp/check out.tif" -of GTiff -b 1 -z 5.0 -s 2.0 -az 90.0 -alt 20.0'])
+
+        # compute edges
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'BAND': 1,
+                                    'Z_FACTOR': 5,
+                                    'SCALE': 2,
+                                    'AZIMUTH': 90,
+                                    'ALTITUDE': 20,
+                                    'COMPUTE_EDGES': True,
+                                    'OUTPUT': 'd:/temp/check.tif'}, context, feedback),
+            ['gdaldem',
+             'hillshade ' +
+             source + ' ' +
+             'd:/temp/check.tif -of GTiff -b 1 -z 5.0 -s 2.0 -az 90.0 -alt 20.0 -compute_edges'])
+
+        # with ZEVENBERGEN
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'BAND': 1,
+                                    'Z_FACTOR': 5,
+                                    'SCALE': 2,
+                                    'AZIMUTH': 90,
+                                    'ALTITUDE': 20,
+                                    'ZEVENBERGEN': True,
+                                    'OUTPUT': 'd:/temp/check.tif'}, context, feedback),
+            ['gdaldem',
+             'hillshade ' +
+             source + ' ' +
+             'd:/temp/check.tif -of GTiff -b 1 -z 5.0 -s 2.0 -az 90.0 -alt 20.0 -alg ZevenbergenThorne'])
+
+        # with COMBINED
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'BAND': 1,
+                                    'Z_FACTOR': 5,
+                                    'SCALE': 2,
+                                    'AZIMUTH': 90,
+                                    'ALTITUDE': 20,
+                                    'COMBINED': True,
+                                    'OUTPUT': 'd:/temp/check.tif'}, context, feedback),
+            ['gdaldem',
+             'hillshade ' +
+             source + ' ' +
+             'd:/temp/check.tif -of GTiff -b 1 -z 5.0 -s 2.0 -az 90.0 -alt 20.0 -combined'])
+
+        # with multidirectional - "az" argument is not allowed!
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'BAND': 1,
+                                    'Z_FACTOR': 5,
+                                    'SCALE': 2,
+                                    'AZIMUTH': 90,
+                                    'ALTITUDE': 20,
+                                    'MULTIDIRECTIONAL': True,
+                                    'OUTPUT': 'd:/temp/check.tif'}, context, feedback),
+            ['gdaldem',
+             'hillshade ' +
+             source + ' ' +
+             'd:/temp/check.tif -of GTiff -b 1 -z 5.0 -s 2.0 -alt 20.0 -multidirectional'])
+
     def testProximity(self):
         context = QgsProcessingContext()
         feedback = QgsProcessingFeedback()