[selfsnap] followup : snap to closing line of poly and fix geos error message

olivierdalang · olivierdalang · commit 02c7a9a7e182 · 2020-05-22T14:13:49.000+02:00
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -526,7 +526,6 @@ int QgsMapToolCapture::addVertex( const QgsPointXY &point, const QgsPointLocator
     // ordinary digitizing
     mRubberBand->addPoint( point );
     mCaptureCurve.addVertex( layerPoint );
-    updateExtraSnapLayer();
     mSnappingMatches.append( match );
   }
 
@@ -542,6 +541,7 @@ int QgsMapToolCapture::addVertex( const QgsPointXY &point, const QgsPointLocator
     mTempRubberBand->addPoint( point );
   }
 
+  updateExtraSnapLayer();
   validateGeometry();
 
   return 0;
@@ -892,11 +892,16 @@ QgsPoint QgsMapToolCapture::mapPoint( const QgsMapMouseEvent &e ) const
 
 void QgsMapToolCapture::updateExtraSnapLayer()
 {
-  if ( canvas()->snappingUtils()->config().selfSnapping() && mCanvas->currentLayer() )
+  if ( canvas()->snappingUtils()->config().selfSnapping() && mCanvas->currentLayer() && mCaptureCurve.numPoints() >= 2 )
   {
     // the current layer may have changed
     mExtraSnapLayer->setCrs( mCanvas->currentLayer()->crs() );
     QgsGeometry geom = QgsGeometry( mCaptureCurve.clone() );
+    // we close the curve to allow snapping on last segment
+    if ( mCaptureMode == CapturePolygon && mCaptureCurve.numPoints() >= 3 )
+    {
+      qgsgeometry_cast<QgsCompoundCurve *>( geom.get() )->close();
+    }
     mExtraSnapLayer->changeGeometry( mExtraSnapFeatureId, geom );
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,6 @@ int QgsMapToolCapture::addVertex( const QgsPointXY &point, const QgsPointLocator`
`526`	`526`	`// ordinary digitizing`
`527`	`527`	`mRubberBand->addPoint( point );`
`528`	`528`	`mCaptureCurve.addVertex( layerPoint );`
`529`		`- updateExtraSnapLayer();`
`530`	`529`	`mSnappingMatches.append( match );`
`531`	`530`	`}`
`532`	`531`
`@@ -542,6 +541,7 @@ int QgsMapToolCapture::addVertex( const QgsPointXY &point, const QgsPointLocator`
`542`	`541`	`mTempRubberBand->addPoint( point );`
`543`	`542`	`}`
`544`	`543`
	`544`	`+ updateExtraSnapLayer();`
`545`	`545`	`validateGeometry();`
`546`	`546`
`547`	`547`	`return 0;`
`@@ -892,11 +892,16 @@ QgsPoint QgsMapToolCapture::mapPoint( const QgsMapMouseEvent &e ) const`
`892`	`892`
`893`	`893`	`void QgsMapToolCapture::updateExtraSnapLayer()`
`894`	`894`	`{`
`895`		`- if ( canvas()->snappingUtils()->config().selfSnapping() && mCanvas->currentLayer() )`
	`895`	`+ if ( canvas()->snappingUtils()->config().selfSnapping() && mCanvas->currentLayer() && mCaptureCurve.numPoints() >= 2 )`
`896`	`896`	`{`
`897`	`897`	`// the current layer may have changed`
`898`	`898`	`mExtraSnapLayer->setCrs( mCanvas->currentLayer()->crs() );`
`899`	`899`	`QgsGeometry geom = QgsGeometry( mCaptureCurve.clone() );`
	`900`	`+ // we close the curve to allow snapping on last segment`
	`901`	`+ if ( mCaptureMode == CapturePolygon && mCaptureCurve.numPoints() >= 3 )`
	`902`	`+ {`
	`903`	`+ qgsgeometry_cast<QgsCompoundCurve *>( geom.get() )->close();`
	`904`	`+ }`
`900`	`905`	`mExtraSnapLayer->changeGeometry( mExtraSnapFeatureId, geom );`
`901`	`906`	`}`
`902`	`907`	`else`