Fix self-snapping for layers with CRS that differs from project CRS

Fixes #39268
qgis · Oct 25, 2020 · 7a14973 · 7a14973
1 parent c03c441
commit 7a14973
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
@@ -288,7 +288,7 @@ QgsPointLocator::Match QgsSnappingUtils::snapToMap( const QgsPointXY &pointMap,
 
     for ( QgsVectorLayer *vl : mExtraSnapLayers )
     {
-      QgsPointLocator *loc = locatorForLayer( vl );
+      QgsPointLocator *loc = locatorForLayerUsingStrategy( vl, pointMap, tolerance );
       _updateBestMatch( bestMatch, pointMap, loc, type, tolerance, filter, false );
       if ( mSnappingConfig.intersectionSnapping() )
         edges << loc->edgesInRect( pointMap, tolerance );
@@ -357,7 +357,7 @@ QgsPointLocator::Match QgsSnappingUtils::snapToMap( const QgsPointXY &pointMap,
 
     for ( QgsVectorLayer *vl : mExtraSnapLayers )
     {
-      QgsPointLocator *loc = locatorForLayer( vl );
+      QgsPointLocator *loc = locatorForLayerUsingStrategy( vl, pointMap, maxTolerance );
       _updateBestMatch( bestMatch, pointMap, loc, maxTypes, maxTolerance, filter, false );
       if ( mSnappingConfig.intersectionSnapping() )
         edges << loc->edgesInRect( pointMap, maxTolerance );
@@ -399,7 +399,7 @@ QgsPointLocator::Match QgsSnappingUtils::snapToMap( const QgsPointXY &pointMap,
 
     for ( QgsVectorLayer *vl : mExtraSnapLayers )
     {
-      QgsPointLocator *loc = locatorForLayer( vl );
+      QgsPointLocator *loc = locatorForLayerUsingStrategy( vl, pointMap, tolerance );
       _updateBestMatch( bestMatch, pointMap, loc, type, tolerance, filter, false );
       if ( mSnappingConfig.intersectionSnapping() )
         edges << loc->edgesInRect( pointMap, tolerance );