Use sample instead of identify in raster sampling alg

About 25x faster on large layers
qgis · Jul 19, 2018 · 8b2d5d0 · 8b2d5d0
1 parent 0f41ca9
commit 8b2d5d0
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/python/plugins/processing/algs/qgis/RasterSampling.py b/python/plugins/processing/algs/qgis/RasterSampling.py
@@ -31,7 +31,8 @@
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtCore import QVariant
 
-from qgis.core import (QgsApplication,
+from qgis.core import (NULL,
+                       QgsApplication,
                        QgsField,
                        QgsFeatureSink,
                        QgsRaster,
@@ -179,20 +180,12 @@ def processAlgorithm(self, parameters, context, feedback):
                 feedback.reportError(self.tr('Could not reproject feature {} to raster CRS').format(i.id()))
                 continue
 
-            if sampled_raster.bandCount() > 1:
+            for b in range(sampled_raster.bandCount()):
-
+                value, ok = sampled_raster.dataProvider().sample(point, b + 1)
-                for b in range(sampled_raster.bandCount()):
+                if ok:
-                    attrs.append(
+                    attrs.append(value)
-                        sampled_raster.dataProvider().identify(
+                else:
-                            point,
+                    attrs.append(NULL)
-                            QgsRaster.IdentifyFormatValue).results()[b + 1]
-                    )
-
-            attrs.append(
-                sampled_raster.dataProvider().identify(
-                    point,
-                    QgsRaster.IdentifyFormatValue).results()[1]
-            )
 
             i.setAttributes(attrs)