[processing] expose resampling and format options in the gdaladdo

algorithm (fix #20432) These options actually were here but not added to the UI. (cherry picked from commit 3d33b9f)
qgis · Jan 1, 2019 · be60f12 · be60f12
1 parent 19d8605
commit be60f12
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 0 deletions.
diff --git a/python/plugins/processing/algs/gdal/gdaladdo.py b/python/plugins/processing/algs/gdal/gdaladdo.py
@@ -30,6 +30,7 @@
 from qgis.PyQt.QtGui import QIcon
 
 from qgis.core import (QgsProcessingException,
+                       QgsProcessingParameterDefinition,
                        QgsProcessingParameterRasterLayer,
                        QgsProcessingParameterEnum,
                        QgsProcessingParameterString,
@@ -88,6 +89,9 @@ def initAlgorithm(self, config=None):
                                                  options=self.formats,
                                                  allowMultiple=False,
                                                  defaultValue=0))
+        for p in params:
+            p.setFlags(p.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
+            self.addParameter(p)
 
         self.addOutput(QgsProcessingOutputRasterLayer(self.OUTPUT, self.tr('Pyramidized')))
 

diff --git a/python/plugins/processing/tests/GdalAlgorithmsTest.py b/python/plugins/processing/tests/GdalAlgorithmsTest.py
@@ -59,6 +59,8 @@
 from processing.algs.gdal.warp import warp
 from processing.algs.gdal.fillnodata import fillnodata
 from processing.algs.gdal.rearrange_bands import rearrange_bands
+from processing.algs.gdal.gdaladdo import gdaladdo
+
 from processing.tools.system import isWindows
 
 from qgis.core import (QgsProcessingContext,
@@ -2369,6 +2371,75 @@ def testPointsAlongLines(self):
                  '-dialect sqlite -sql "SELECT ST_Line_Interpolate_Point(geometry, 0.2) AS geometry,* FROM \'polys2\'" ' +
                  '-f "ESRI Shapefile"'])
 
+    def testGdalAddo(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'dem.tif')
+
+        with tempfile.TemporaryDirectory() as outdir:
+            alg = gdaladdo()
+            alg.initAlgorithm()
+
+            # defaults
+            self.assertEqual(
+                alg.getConsoleCommands({'INPUT': source,
+                                        'LEVELS': '2 4 8 16',
+                                        'CLEAN': False,
+                                        'RESAMPLING': 0,
+                                        'FORMAT': 0}, context, feedback),
+                ['gdaladdo',
+                 source + ' ' + '-r nearest 2 4 8 16'])
+
+            # with "clean" option
+            self.assertEqual(
+                alg.getConsoleCommands({'INPUT': source,
+                                        'LEVELS': '2 4 8 16',
+                                        'CLEAN': True,
+                                        'RESAMPLING': 0,
+                                        'FORMAT': 0}, context, feedback),
+                ['gdaladdo',
+                 source + ' ' + '-r nearest -clean 2 4 8 16'])
+
+            # ovr format
+            self.assertEqual(
+                alg.getConsoleCommands({'INPUT': source,
+                                        'LEVELS': '2 4 8 16',
+                                        'CLEAN': False,
+                                        'RESAMPLING': 0,
+                                        'FORMAT': 1}, context, feedback),
+                ['gdaladdo',
+                 source + ' ' + '-r nearest -ro 2 4 8 16'])
+
+            # Erdas format
+            self.assertEqual(
+                alg.getConsoleCommands({'INPUT': source,
+                                        'LEVELS': '2 4 8 16',
+                                        'CLEAN': False,
+                                        'RESAMPLING': 0,
+                                        'FORMAT': 2}, context, feedback),
+                ['gdaladdo',
+                 source + ' ' + '-r nearest --config USE_RRD YES 2 4 8 16'])
+
+            # custom resampling method format
+            self.assertEqual(
+                alg.getConsoleCommands({'INPUT': source,
+                                        'LEVELS': '2 4 8 16',
+                                        'CLEAN': False,
+                                        'RESAMPLING': 4,
+                                        'FORMAT': 0}, context, feedback),
+                ['gdaladdo',
+                 source + ' ' + '-r cubicspline 2 4 8 16'])
+
+            # more levels
+            self.assertEqual(
+                alg.getConsoleCommands({'INPUT': source,
+                                        'LEVELS': '2 4 8 16 32 64',
+                                        'CLEAN': False,
+                                        'RESAMPLING': 0,
+                                        'FORMAT': 0}, context, feedback),
+                ['gdaladdo',
+                 source + ' ' + '-r nearest 2 4 8 16 32 64'])
+
 
 class TestGdalOgrToPostGis(unittest.TestCase):