Updates from Nyall's review

wonder-sk · wonder-sk · commit 7df062ba6331 · 2018-05-10T06:50:58.000-04:00
diff --git a/src/analysis/processing/qgsoverlayutils.cpp b/src/analysis/processing/qgsoverlayutils.cpp
@@ -270,7 +270,7 @@ void QgsOverlayUtils::resolveOverlaps( const QgsFeatureSource &source, QgsFeatur
   requestOnlyIds.setFlags( QgsFeatureRequest::NoGeometry );
   requestOnlyIds.setSubsetOfAttributes( QgsAttributeList() );
 
-  // make a set of used feature IDs so they we do not try to reuse them for newly added features
+  // make a set of used feature IDs so that we do not try to reuse them for newly added features
   QgsFeature f;
   QSet<QgsFeatureId> fids;
   QgsFeatureIterator it = source.getFeatures( requestOnlyIds );
@@ -296,6 +296,7 @@ void QgsOverlayUtils::resolveOverlaps( const QgsFeatureSource &source, QgsFeatur
 
     QgsFeatureId fid1 = f.id();
     QgsGeometry g1 = f.geometry();
+    std::unique_ptr< QgsGeometryEngine > g1engine;
 
     geometries.insert( fid1, g1 );
     index.insertFeature( f );
@@ -307,8 +308,15 @@ void QgsOverlayUtils::resolveOverlaps( const QgsFeatureSource &source, QgsFeatur
       if ( fid1 == fid2 )
         continue;
 
+      if ( !g1engine )
+      {
+        // use prepared geometries for faster intersection tests
+        g1engine.reset( QgsGeometry::createGeometryEngine( g1.constGet() ) );
+        g1engine->prepareGeometry();
+      }
+
       QgsGeometry g2 = geometries.value( fid2 );
-      if ( !g1.intersects( g2 ) )
+      if ( !g1engine->intersects( g2.constGet() ) )
         continue;
 
       QgsGeometry geomIntersection = g1.intersection( g2 );
@@ -384,6 +392,7 @@ void QgsOverlayUtils::resolveOverlaps( const QgsFeatureSource &source, QgsFeatur
 
       // update our temporary copy of the geometry to what is left from it
       g1 = g12;
+      g1engine.reset();
     }
 
     ++count;
diff --git a/src/analysis/processing/qgsoverlayutils.h b/src/analysis/processing/qgsoverlayutils.h
@@ -50,7 +50,7 @@ namespace QgsOverlayUtils
    * 2. a feature with geometry B - A with B's attributes
    * 3. two features with geometry intersection(A, B) - one with A's attributes, one with B's attributes.
    *
-   * As a result, for all pairs of features in the output, a pair either havs no common interior or their interior is the same.
+   * As a result, for all pairs of features in the output, a pair either has no common interior or their interior is the same.
    */
   void resolveOverlaps( const QgsFeatureSource &source, QgsFeatureSink &sink, QgsProcessingFeedback *feedback );
 }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ namespace QgsOverlayUtils`
`50`	`50`	`* 2. a feature with geometry B - A with B's attributes`
`51`	`51`	`* 3. two features with geometry intersection(A, B) - one with A's attributes, one with B's attributes.`
`52`	`52`	`*`
`53`		`- * As a result, for all pairs of features in the output, a pair either havs no common interior or their interior is the same.`
	`53`	`+ * As a result, for all pairs of features in the output, a pair either has no common interior or their interior is the same.`
`54`	`54`	`*/`
`55`	`55`	`void resolveOverlaps( const QgsFeatureSource &source, QgsFeatureSink &sink, QgsProcessingFeedback *feedback );`
`56`	`56`	`}`