[Backport release-3_40] Fix regression introduced by #58755

src/gui/maptools/qgsmaptoolcapture.cpp

@@ -492,11 +492,15 @@ void QgsMapToolCapture::setCurrentShapeMapTool( const QgsMapToolShapeMetadata *s
 
 void QgsMapToolCapture::cadCanvasMoveEvent( QgsMapMouseEvent *e )
 {
+  // If we are adding a record to a non-spatial layer, just return
+  if ( mCaptureModeFromLayer && !canvas()->currentLayer()->isSpatial() )
+    return;
+
   QgsMapToolAdvancedDigitizing::cadCanvasMoveEvent( e );
 
   const QgsPointXY point = e->mapPoint();
-  if ( canvas()->currentLayer() && canvas()->currentLayer()->isSpatial() )
-    mSnapIndicator->setMatch( e->mapPointMatch() );
+
+  mSnapIndicator->setMatch( e->mapPointMatch() );
 
   if ( mCurrentCaptureTechnique == Qgis::CaptureTechnique::Shape )
   {

tests/src/app/CMakeLists.txt

@@ -3,6 +3,7 @@
 # the UI file won't be wrapped!
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/test
+  ${CMAKE_SOURCE_DIR}/tests/src/gui
   ${CMAKE_CURRENT_BINARY_DIR}
 )
 

tests/src/app/testqgsadvanceddigitizing.cpp

@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgisapp.h"
 #include "qgstest.h"
 
 #include "qgsadvanceddigitizingdockwidget.h"

tests/src/app/testqgsmaptoolsplitfeatures.cpp

@@ -13,15 +13,14 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgssnappingutils.h"
 #include "qgstest.h"
 
 #include "qgisapp.h"
 #include "qgsgeometry.h"
 #include "qgsmapcanvas.h"
-#include "qgssettings.h"
 #include "qgsvectorlayer.h"
 #include "qgsmaptoolsplitfeatures.h"
-#include "qgsgeometryutils.h"
 
 #include "testqgsmaptoolutils.h"
 

tests/src/app/testqgsvertextool.cpp

@@ -14,19 +14,17 @@
  ***************************************************************************/
 
 #include "qgstest.h"
+#include "qgisapp.h"
 
 #include "qgsadvanceddigitizingdockwidget.h"
 #include "qgsgeometry.h"
-#include "qgsgeometryoptions.h"
 #include "qgsgeos.h"
 #include "qgsmapcanvas.h"
 #include "qgsmapcanvassnappingutils.h"
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"
 #include "qgsmapmouseevent.h"
 #include "vertextool/qgsvertextool.h"
-#include "qgslinestring.h"
-#include "qgscircularstring.h"
 #include "qgssnappingconfig.h"
 #include "qgssettingsregistrycore.h"
 #include "testqgsmaptoolutils.h"

tests/src/gui/testqgsmaptoolcapture.cpp

@@ -14,14 +14,16 @@
  ***************************************************************************/
 #include <QCoreApplication>
 
+#include "qgsmapcanvassnappingutils.h"
 #include "qgstest.h"
-#include "qgsguiutils.h"
 #include "qgsmaptoolcapture.h"
 #include "qgsapplication.h"
 #include "qgsmapcanvas.h"
 #include "qgslogger.h"
 #include "qgsannotationlayer.h"
 #include "qgsadvanceddigitizingdockwidget.h"
+#include "testqgsmaptoolutils.h"
+
 
 class TestQgsMapToolCapture : public QObject
 {
@@ -36,6 +38,7 @@ class TestQgsMapToolCapture : public QObject
     void cleanup();         // will be called after every testfunction.
 
     void addVertexNoLayer();
+    void addPointNoLayerSnapping();
     void addVertexNonVectorLayer();
     void addVertexNonVectorLayerTransform();
 };
@@ -88,6 +91,64 @@ void TestQgsMapToolCapture::addVertexNoLayer()
   QCOMPARE( layerPoint.y(), 6.0 );
 }
 
+void TestQgsMapToolCapture::addPointNoLayerSnapping()
+{
+  // checks that snapping works even if no layer is set as current layer
+
+  QgsPoint p = QgsPoint( 2556607, 1115175 );
+
+  QgsProject::instance()->clear();
+
+  QgsMapCanvas canvas;
+  canvas.resize( 600, 600 );
+  canvas.setDestinationCrs( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:2056" ) ) );
+  canvas.setFrameStyle( QFrame::NoFrame );
+  canvas.setExtent( QgsRectangle( p.x() - 50, p.y() - 50, p.x() + 50, p.y() + 50 ) );
+  canvas.show(); // to make the canvas resize
+
+  QgsVectorLayer *layer = new QgsVectorLayer( QStringLiteral( "Point?crs=EPSG:2056" ), QStringLiteral( "point" ), QStringLiteral( "memory" ) );
+  QgsProject::instance()->addMapLayer( layer );
+  QgsFeature f( layer->fields() );
+  f.setGeometry( QgsGeometry( p.clone() ) );
+  QgsFeatureList flist { f };
+  layer->dataProvider()->addFeatures( flist );
+  canvas.setLayers( { layer } );
+
+  QgsMapSettings mapSettings = canvas.mapSettings();
+  QVERIFY( mapSettings.hasValidSettings() );
+
+  QgsSnappingUtils u;
+  u.setMapSettings( mapSettings );
+
+  QgsSnappingConfig snappingConfig = u.config();
+  snappingConfig.setEnabled( true );
+  snappingConfig.setTolerance( 10 );
+  snappingConfig.setUnits( Qgis::MapToolUnit::Pixels );
+  snappingConfig.setMode( Qgis::SnappingMode::AllLayers );
+  snappingConfig.setTypeFlag( Qgis::SnappingType::Vertex );
+  u.setConfig( snappingConfig );
+
+  QgsMapCanvasSnappingUtils *snappingUtils = new QgsMapCanvasSnappingUtils( &canvas, this );
+  snappingUtils->setConfig( snappingConfig );
+  snappingUtils->setMapSettings( mapSettings );
+  snappingUtils->locatorForLayer( layer )->init();
+
+  canvas.setSnappingUtils( snappingUtils );
+
+  canvas.setCurrentLayer( nullptr );
+
+  QgsAdvancedDigitizingDockWidget cadDock( &canvas );
+
+  QgsMapToolCapture tool( &canvas, &cadDock, QgsMapToolCapture::CaptureLine );
+  canvas.setMapTool( &tool );
+
+  TestQgsMapToolAdvancedDigitizingUtils utils( &tool );
+  utils.mouseClick( p.x() + .5, p.y() + .5, Qt::LeftButton, Qt::KeyboardModifiers(), true );
+
+  QgsPoint toolPoint = tool.captureCurve()->vertexAt( QgsVertexId( 0, 0, 0 ) );
+  QCOMPARE( toolPoint, p );
+}
+
 void TestQgsMapToolCapture::addVertexNonVectorLayer()
 {
   QgsProject::instance()->clear();

tests/src/app/testqgsmaptoolutils.h → tests/src/gui/testqgsmaptoolutils.h

@@ -15,13 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgstest.h"
-
-#include "qgisapp.h"
+//#include "qgisapp.h"
 #include "qgsgeometry.h"
 #include "qgsmapcanvas.h"
 #include "qgsmapmouseevent.h"
-#include "qgssnappingutils.h"
 #include "qgsmaptooladvanceddigitizing.h"
 
 /**