[processing] restore nearest neighbor interpolation

qgis · Oct 11, 2017 · 26f8035 · 26f8035
1 parent ad591c7
commit 26f8035
Show file tree

Hide file tree

Showing 4 changed files with 171 additions and 136 deletions.
diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py b/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
@@ -43,6 +43,7 @@
 from .GridAverage import GridAverage
 from .GridDataMetrics import GridDataMetrics
 from .GridInverseDistance import GridInverseDistance
+from .GridNearestNeighbor import GridNearestNeighbor
 from .hillshade import hillshade
 from .information import information
 from .nearblack import nearblack
@@ -65,7 +66,6 @@
 # from .proximity import proximity
 # from .extractprojection import ExtractProjection
 # from .gdal2xyz import gdal2xyz
-# from .GridNearest import GridNearest
 # from .gdalcalc import gdalcalc
 # from .rasterize_over import rasterize_over
 # from .retile import retile
@@ -144,6 +144,7 @@ def loadAlgorithms(self):
             GridAverage(),
             GridDataMetrics(),
             GridInverseDistance(),
+            GridNearestNeighbor(),
             hillshade(),
             information(),
             nearblack(),
@@ -165,7 +166,6 @@ def loadAlgorithms(self):
             # proximity(),
             # ExtractProjection(),
             # gdal2xyz(),
-            # GridNearest(),
             # gdalcalc(),
             # rasterize_over(),
             # retile(),

diff --git a/python/plugins/processing/algs/gdal/GridNearest.py b/python/plugins/processing/algs/gdal/GridNearest.py
diff --git a/python/plugins/processing/algs/gdal/GridNearestNeighbor.py b/python/plugins/processing/algs/gdal/GridNearestNeighbor.py
@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    GridNearestNeighbor.py
+    ---------------------
+    Date                 : October 2013
+    Copyright            : (C) 2013 by Alexander Bruy
+    Email                : alexander dot bruy at gmail dot com
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+
+__author__ = 'Alexander Bruy'
+__date__ = 'October 2013'
+__copyright__ = '(C) 2013, Alexander Bruy'
+
+# This will get replaced with a git SHA1 when you do a git archive
+
+__revision__ = '$Format:%H$'
+
+
+import os
+
+from qgis.PyQt.QtGui import QIcon
+
+from qgis.core import (QgsRasterFileWriter,
+                       QgsProcessing,
+                       QgsProcessingParameterDefinition,
+                       QgsProcessingParameterVectorLayer,
+                       QgsProcessingParameterEnum,
+                       QgsProcessingParameterField,
+                       QgsProcessingParameterNumber,
+                       QgsProcessingParameterRasterDestination)
+from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
+from processing.algs.gdal.GdalUtils import GdalUtils
+
+pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
+
+
+class GridNearestNeighbor(GdalAlgorithm):
+
+    INPUT = 'INPUT'
+    Z_FIELD = 'Z_FIELD'
+    RADIUS_1 = 'RADIUS_1'
+    RADIUS_2 = 'RADIUS_2'
+    ANGLE = 'ANGLE'
+    NODATA = 'NODATA'
+    DATA_TYPE = 'DATA_TYPE'
+    OUTPUT = 'OUTPUT'
+
+    TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64', 'CInt16', 'CInt32', 'CFloat32', 'CFloat64']
+
+    def __init__(self):
+        super().__init__()
+
+    def initAlgorithm(self, config=None):
+        self.addParameter(QgsProcessingParameterVectorLayer(self.INPUT,
+                                                            self.tr('Point layer'),
+                                                            [QgsProcessing.TypeVectorPoint]))
+
+        z_field_param = QgsProcessingParameterField(self.Z_FIELD,
+                                                    self.tr('Z value from field'),
+                                                    None,
+                                                    self.INPUT,
+                                                    QgsProcessingParameterField.Numeric,
+                                                    optional=True)
+        z_field_param.setFlags(z_field_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
+        self.addParameter(z_field_param)
+
+        self.addParameter(QgsProcessingParameterNumber(self.RADIUS_1,
+                                                       self.tr('The first radius of search ellipse'),
+                                                       type=QgsProcessingParameterNumber.Double,
+                                                       minValue=0.0,
+                                                       maxValue=99999999.999999,
+                                                       defaultValue=0.0))
+        self.addParameter(QgsProcessingParameterNumber(self.RADIUS_2,
+                                                       self.tr('The second radius of search ellipse'),
+                                                       type=QgsProcessingParameterNumber.Double,
+                                                       minValue=0.0,
+                                                       maxValue=99999999.999999,
+                                                       defaultValue=0.0))
+        self.addParameter(QgsProcessingParameterNumber(self.ANGLE,
+                                                       self.tr('Angle of search ellipse rotation in degrees (counter clockwise)'),
+                                                       type=QgsProcessingParameterNumber.Double,
+                                                       minValue=0.0,
+                                                       maxValue=360.0,
+                                                       defaultValue=0.0))
+        self.addParameter(QgsProcessingParameterNumber(self.NODATA,
+                                                       self.tr('NODATA marker to fill empty points'),
+                                                       type=QgsProcessingParameterNumber.Double,
+                                                       minValue=-99999999.999999,
+                                                       maxValue=99999999.999999,
+                                                       defaultValue=0.0))
+        self.addParameter(QgsProcessingParameterEnum(self.DATA_TYPE,
+                                                     self.tr('Output data type'),
+                                                     self.TYPE,
+                                                     allowMultiple=False,
+                                                     defaultValue=5))
+
+        self.addParameter(QgsProcessingParameterRasterDestination(self.OUTPUT,
+                                                                  self.tr('Interpolated (Nearest neighbor)')))
+
+    def name(self):
+        return 'gridnearestneighbor'
+
+    def displayName(self):
+        return self.tr('Grid (Nearest neighbor)')
+
+    def group(self):
+        return self.tr('Raster analysis')
+
+    def icon(self):
+        return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'grid.png'))
+
+    def getConsoleCommands(self, parameters, context, feedback):
+        inLayer = self.parameterAsVectorLayer(parameters, self.INPUT, context)
+        connectionString = GdalUtils.ogrConnectionString(inLayer.source(), context)
+
+        arguments = ['-l']
+        arguments.append(GdalUtils.ogrLayerName(connectionString))
+
+        fieldName = self.parameterAsString(parameters, self.Z_FIELD, context)
+        if fieldName:
+            arguments.append('-zfield')
+            arguments.append(fieldName)
+
+        params = 'nearest'
+        params += ':radius1={}'.format(self.parameterAsDouble(parameters, self.RADIUS_1, context))
+        params += ':radius2={}'.format(self.parameterAsDouble(parameters, self.RADIUS_2, context))
+        params += ':angle={}'.format(self.parameterAsDouble(parameters, self.ANGLE, context))
+        params += ':nodata={}'.format(self.parameterAsDouble(parameters, self.NODATA, context))
+
+        arguments.append('-a')
+        arguments.append(params)
+        arguments.append('-ot')
+        arguments.append(self.TYPE[self.parameterAsEnum(parameters, self.DATA_TYPE, context)])
+
+        out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
+        arguments.append('-of')
+        arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
+
+        arguments.append(connectionString)
+        arguments.append(out)
+
+        return ['gdal_grid', GdalUtils.escapeAndJoin(arguments)]
diff --git a/python/plugins/processing/tests/testdata/gdal_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/gdal_algorithm_tests.yaml
@@ -435,6 +435,23 @@ tests:
         hash: 2033731d6fd653da391a2633158f0ea755d96e1b2b2c60a9100332b1
         type: rasterhash
 
+  - algorithm: gdal:gridnearestneighbor
+    name: Nearest Neighbor interpolation
+    params:
+      ANGLE: 0.0
+      INPUT:
+        name: custom/points_values.gml
+        type: vector
+      NODATA: 0.0
+      RADIUS_1: 0.01
+      RADIUS_2: 0.02
+      RTYPE: '5'
+      Z_FIELD: EC
+    results:
+      OUTPUT:
+        hash: 6ee933d53e1a2ffadfd88333919255e68bb945e833e50d112124bfd5
+        type: rasterhash
+
 #  - algorithm: gdal:merge
 #    name: Merge 2 raster layers
 #    params:
@@ -501,20 +518,3 @@ tests:
 #      OUTPUT:
 #        hash: 2d0585dc8166fbe3cec7d9e6fd66e95cc9bdb1043b3b0fa7cbdfef4c
 #        type: rasterhash
-#
-#  - algorithm: gdal:gridnearestneighbor
-#    name: Nearest Neighbor interpolation
-#    params:
-#      ANGLE: 0.0
-#      INPUT:
-#        name: custom/points_values.gml
-#        type: vector
-#      NODATA: 0.0
-#      RADIUS_1: 0.01
-#      RADIUS_2: 0.02
-#      RTYPE: '5'
-#      Z_FIELD: EC
-#    results:
-#      OUTPUT:
-#        hash: 6ee933d53e1a2ffadfd88333919255e68bb945e833e50d112124bfd5
-#        type: rasterhash