[processing][gdal] More nodata handling fixes

Fixes #18748
2025-06-01 00:02:16 -04:00 · 2018-05-06 08:50:16 +10:00 · 2018-05-06 08:50:16 +10:00 · bddcb7dc42
commit bddcb7dc42
parent 739d4fab09
5 changed files with 374 additions and 8 deletions
--- a/python/plugins/processing/algs/gdal/gdal2tiles.py
+++ b/python/plugins/processing/algs/gdal/gdal2tiles.py
@ -189,8 +189,8 @@ class gdal2tiles(GdalAlgorithm):
            arguments.append('-s')
            arguments.append(crs.authid())

-        nodata = self.parameterAsDouble(parameters, self.NODATA, context)
-        if nodata:
+        if self.NODATA in parameters and parameters[self.NODATA] is not None:
+            nodata = self.parameterAsDouble(parameters, self.NODATA, context)
            arguments.append('-a')
            arguments.append(str(nodata))

--- a/python/plugins/processing/algs/gdal/proximity.py
+++ b/python/plugins/processing/algs/gdal/proximity.py
@ -138,7 +138,10 @@ class proximity(GdalAlgorithm):
        inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
        distance = self.parameterAsDouble(parameters, self.MAX_DISTANCE, context)
        replaceValue = self.parameterAsDouble(parameters, self.REPLACE, context)
-        nodata = self.parameterAsDouble(parameters, self.NODATA, context)
+        if self.NODATA in parameters and parameters[self.NODATA] is not None:
+            nodata = self.parameterAsDouble(parameters, self.NODATA, context)
+        else:
+            nodata = None
        options = self.parameterAsString(parameters, self.OPTIONS, context)
        out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)

@ -158,7 +161,7 @@ class proximity(GdalAlgorithm):
            arguments.append('-maxdist')
            arguments.append(str(distance))

-        if nodata:
+        if nodata is not None:
            arguments.append('-nodata')
            arguments.append(str(nodata))

--- a/python/plugins/processing/algs/gdal/rasterize.py
+++ b/python/plugins/processing/algs/gdal/rasterize.py
@ -192,8 +192,8 @@ class rasterize(GdalAlgorithm):
        if self.parameterAsBool(parameters, self.ALL_TOUCH, context):
            arguments.append('-at')

-        nodata = self.parameterAsDouble(parameters, self.NODATA, context)
-        if nodata:
+        if self.NODATA in parameters and parameters[self.NODATA] is not None:
+            nodata = self.parameterAsDouble(parameters, self.NODATA, context)
            arguments.append('-a_nodata')
            arguments.append(nodata)

--- a/python/plugins/processing/algs/gdal/warp.py
+++ b/python/plugins/processing/algs/gdal/warp.py
@ -166,7 +166,10 @@ class warp(GdalAlgorithm):
        out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
        sourceCrs = self.parameterAsCrs(parameters, self.SOURCE_CRS, context)
        targetCrs = self.parameterAsCrs(parameters, self.TARGET_CRS, context)
-        nodata = self.parameterAsDouble(parameters, self.NODATA, context)
+        if self.NODATA in parameters and parameters[self.NODATA] is not None:
+            nodata = self.parameterAsDouble(parameters, self.NODATA, context)
+        else:
+            nodata = None
        resolution = self.parameterAsDouble(parameters, self.TARGET_RESOLUTION, context)

        arguments = []
@ -178,7 +181,7 @@ class warp(GdalAlgorithm):
            arguments.append('-t_srs')
            arguments.append(targetCrs.authid())

-        if nodata:
+        if nodata is not None:
            arguments.append('-dstnodata')
            arguments.append(str(nodata))

--- a/python/plugins/processing/tests/GdalAlgorithmsTest.py
+++ b/python/plugins/processing/tests/GdalAlgorithmsTest.py
@ -30,8 +30,19 @@ from processing.algs.gdal.OgrToPostGis import OgrToPostGis
 from processing.algs.gdal.GdalUtils import GdalUtils
 from processing.algs.gdal.ClipRasterByExtent import ClipRasterByExtent
 from processing.algs.gdal.ClipRasterByMask import ClipRasterByMask
+from processing.algs.gdal.gdal2tiles import gdal2tiles
 from processing.algs.gdal.contour import contour
+from processing.algs.gdal.GridAverage import GridAverage
+from processing.algs.gdal.GridDataMetrics import GridDataMetrics
+from processing.algs.gdal.GridInverseDistance import GridInverseDistance
+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.proximity import proximity
+from processing.algs.gdal.rasterize import rasterize
 from processing.algs.gdal.translate import translate
+from processing.algs.gdal.warp import warp
+
 from qgis.core import (QgsProcessingContext,
                       QgsProcessingFeedback,
                       QgsApplication,
@ -390,6 +401,355 @@ class TestGdalAlgorithms(unittest.TestCase, AlgorithmsTestBase.AlgorithmsTest):
             source + ' ' +
             '"d:/temp/check.gpkg"'])

+    def testGdal2Tiles(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'dem.tif')
+        alg = gdal2tiles()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'OUTPUT': 'd:/temp/'}, context, feedback),
+            ['gdal2tiles.py',
+             '-p mercator -w all -r average ' +
+             source + ' ' +
+             'd:/temp/'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': -9999,
+                                    'OUTPUT': 'd:/temp/'}, context, feedback),
+            ['gdal2tiles.py',
+             '-p mercator -w all -r average -a -9999.0 ' +
+             source + ' ' +
+             'd:/temp/'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'OUTPUT': 'd:/temp/'}, context, feedback),
+            ['gdal2tiles.py',
+             '-p mercator -w all -r average -a 0.0 ' +
+             source + ' ' +
+             'd:/temp/'])
+
+    def testGridAverage(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'points.gml')
+        alg = GridAverage()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a average:radius1=0.0:radius2=0.0:angle=0.0:min_points=0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 9999,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a average:radius1=0.0:radius2=0.0:angle=0.0:min_points=0:nodata=9999.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a average:radius1=0.0:radius2=0.0:angle=0.0:min_points=0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+
+    def testGridDataMetrics(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'points.gml')
+        alg = GridDataMetrics()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a minimum:radius1=0.0:radius2=0.0:angle=0.0:min_points=0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 9999,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a minimum:radius1=0.0:radius2=0.0:angle=0.0:min_points=0:nodata=9999.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a minimum:radius1=0.0:radius2=0.0:angle=0.0:min_points=0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+
+    def testGridInverseDistance(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'points.gml')
+        alg = GridInverseDistance()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a invdist:power=2.0:smothing=0.0:radius1=0.0:radius2=0.0:angle=0.0:max_points=0:min_points=0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 9999,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a invdist:power=2.0:smothing=0.0:radius1=0.0:radius2=0.0:angle=0.0:max_points=0:min_points=0:nodata=9999.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a invdist:power=2.0:smothing=0.0:radius1=0.0:radius2=0.0:angle=0.0:max_points=0:min_points=0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+
+    def testGridInverseDistanceNearestNeighbour(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'points.gml')
+        alg = GridInverseDistanceNearestNeighbor()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a invdistnn:power=2.0:smothing=0.0:radius=1.0:max_points=0:min_points=0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 9999,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a invdistnn:power=2.0:smothing=0.0:radius=1.0:max_points=0:min_points=0:nodata=9999.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a invdistnn:power=2.0:smothing=0.0:radius=1.0:max_points=0:min_points=0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+
+    def testGridLinear(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'points.gml')
+        alg = GridLinear()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a linear:radius=-1.0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 9999,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a linear:radius=-1.0:nodata=9999.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a linear:radius=-1.0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+
+    def testGridNearestNeighbour(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'points.gml')
+        alg = GridNearestNeighbor()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a nearest:radius1=0.0:radius2=0.0:angle=0.0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 9999,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a nearest:radius1=0.0:radius2=0.0:angle=0.0:nodata=9999.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_grid',
+             '-l points -a nearest:radius1=0.0:radius2=0.0:angle=0.0:nodata=0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+
+    def testProximity(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'dem.tif')
+        alg = proximity()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'BAND': 1,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_proximity.py',
+             '-srcband 1 -distunits PIXEL -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 9999,
+                                    'BAND': 2,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_proximity.py',
+             '-srcband 2 -distunits PIXEL -nodata 9999.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'BAND': 1,
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_proximity.py',
+             '-srcband 1 -distunits PIXEL -nodata 0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+
+    def testRasterize(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'polys.gml')
+        alg = rasterize()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'FIELD': 'id',
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_rasterize',
+             '-l polys2 -a id -ts 0.0 0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 9999,
+                                    'FIELD': 'id',
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_rasterize',
+             '-l polys2 -a id -ts 0.0 0.0 -a_nodata 9999.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'FIELD': 'id',
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdal_rasterize',
+             '-l polys2 -a id -ts 0.0 0.0 -a_nodata 0.0 -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+
+    def testWarp(self):
+        context = QgsProcessingContext()
+        feedback = QgsProcessingFeedback()
+        source = os.path.join(testDataPath, 'dem.tif')
+        alg = warp()
+        alg.initAlgorithm()
+
+        # with no NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'CRS': 'EPSG:3111',
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdalwarp',
+             '-t_srs EPSG:4326 -r near -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 9999,
+                                    'CRS': 'EPSG:3111',
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdalwarp',
+             '-t_srs EPSG:4326 -dstnodata 9999.0 -r near -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+        # with "0" NODATA value
+        self.assertEqual(
+            alg.getConsoleCommands({'INPUT': source,
+                                    'NODATA': 0,
+                                    'CRS': 'EPSG:3111',
+                                    'OUTPUT': 'd:/temp/check.jpg'}, context, feedback),
+            ['gdalwarp',
+             '-t_srs EPSG:4326 -dstnodata 0.0 -r near -ot Float32 -of JPEG ' +
+             source + ' ' +
+             'd:/temp/check.jpg'])
+

 class TestGdalOgrToPostGis(unittest.TestCase):