[processing] support MultiPoint geometries in Delaunay triangulation

p0cisk · m-kuhn · commit 41fafd69823c · 2016-10-19T11:15:38.000+02:00
diff --git a/python/plugins/processing/algs/qgis/Delaunay.py b/python/plugins/processing/algs/qgis/Delaunay.py
@@ -82,12 +82,16 @@ def processAlgorithm(self, progress):
         total = 100.0 / len(features)
         for current, inFeat in enumerate(features):
             geom = inFeat.geometry()
-            point = geom.asPoint()
-            x = point.x()
-            y = point.y()
-            pts.append((x, y))
-            ptNdx += 1
-            ptDict[ptNdx] = inFeat.id()
+            if geom.isMultipart():
+                points = geom.asMultiPoint()
+            else:
+                points = [ geom.asPoint() ]
+            for n, point in enumerate(points):
+                x = point.x()
+                y = point.y()
+                pts.append((x, y))
+                ptNdx += 1
+                ptDict[ptNdx] = (inFeat.id(), n)
             progress.setPercentage(int(current * total))
 
         if len(pts) < 3:
@@ -111,10 +115,14 @@ def processAlgorithm(self, progress):
             attrs = []
             step = 0
             for index in indicies:
-                request = QgsFeatureRequest().setFilterFid(ptDict[ids[index]])
+                fid, n = ptDict[ids[index]]
+                request = QgsFeatureRequest().setFilterFid(fid)
                 inFeat = next(layer.getFeatures(request))
                 geom = inFeat.geometry()
-                point = QgsPoint(geom.asPoint())
+                if geom.isMultipart():
+                    point = QgsPoint(geom.asMultiPoint()[n])
+                else:
+                    point = QgsPoint(geom.asPoint())
                 polygon.append(point)
                 if step <= 3:
                     attrs.append(ids[index])
