[processing] Much faster random points in polygon by using

prepared geometries
qgis · Feb 14, 2018 · 2defaff · 2defaff
1 parent 81aa2f9
commit 2defaff
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/python/plugins/processing/algs/qgis/RandomPointsPolygons.py b/python/plugins/processing/algs/qgis/RandomPointsPolygons.py
@@ -136,6 +136,9 @@ def processAlgorithm(self, parameters, context, feedback):
             if feedback.isCanceled():
                 break
 
+            if not f.hasGeometry():
+                continue
+
             current_progress = total * current
             feedback.setProgress(current_progress)
 
@@ -147,6 +150,9 @@ def processAlgorithm(self, parameters, context, feedback):
                 continue
 
             fGeom = f.geometry()
+            engine = QgsGeometry.createGeometryEngine(fGeom.constGet())
+            engine.prepareGeometry()
+
             bbox = fGeom.boundingBox()
             if strategy == 0:
                 pointCount = int(value)
@@ -176,7 +182,7 @@ def processAlgorithm(self, parameters, context, feedback):
 
                 p = QgsPointXY(rx, ry)
                 geom = QgsGeometry.fromPointXY(p)
-                if geom.within(fGeom) and \
+                if engine.contains(geom.constGet()) and \
                         vector.checkMinDistance(p, index, minDistance, points):
                     f = QgsFeature(nPoints)
                     f.initAttributes(1)