Use a prepared geometry in topology checker overlap check

qgis · Oct 5, 2019 · 70fe6c8 · 70fe6c8
1 parent b4c1f0a
commit 70fe6c8
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/plugins/topology/topolTest.cpp b/src/plugins/topology/topolTest.cpp
@@ -387,6 +387,9 @@ ErrorList topolTest::checkOverlaps( QgsVectorLayer *layer1, QgsVectorLayer *laye
       continue;
     }
 
+    std::unique_ptr< QgsGeometryEngine > engine1( QgsGeometry::createGeometryEngine( g1.constGet() ) );
+    engine1->prepareGeometry();
+
     QgsRectangle bb = g1.boundingBox();
 
     QList<QgsFeatureId> crossingIds;
@@ -397,7 +400,7 @@ ErrorList topolTest::checkOverlaps( QgsVectorLayer *layer1, QgsVectorLayer *laye
 
     bool duplicate = false;
 
-    QgsGeometry canvasExtentPoly = QgsGeometry::fromWkt( qgsInterface->mapCanvas()->extent().asWktPolygon() );
+    QgsGeometry canvasExtentPoly = QgsGeometry::fromRect( qgsInterface->mapCanvas()->extent() );
 
     for ( ; cit != crossingIdsEnd; ++cit )
     {
@@ -416,21 +419,14 @@ ErrorList topolTest::checkOverlaps( QgsVectorLayer *layer1, QgsVectorLayer *laye
         continue;
       }
 
-      if ( !_canExportToGeos( g2 ) )
-      {
-        QgsMessageLog::logMessage( tr( "Failed to import second geometry into GEOS in overlaps test." ), tr( "Topology plugin" ) );
-        continue;
-      }
-
       if ( !g2.isGeosValid() )
       {
         QgsMessageLog::logMessage( tr( "Skipping invalid second geometry of feature %1 in overlaps test." ).arg( it->feature.id() ), tr( "Topology plugin" ) );
         continue;
       }
 
-
       qDebug() << "checking overlap for" << it->feature.id();
-      if ( g1.overlaps( g2 ) )
+      if ( engine1->overlaps( g2.constGet() ) )
       {
         duplicate = true;
         duplicateIds->append( mFeatureMap2[*cit].feature.id() );