Merge pull request #42666 from vcloarec/fix42626

Fix digitizing polygons with curves
qgis · Apr 8, 2021 · 90001639bc0b9cc17939c194507e528a8d0fdb46 · 9000163
1 parent 84e6bae
commit 90001639bc0b9cc17939c194507e528a8d0fdb46
Unified Split

Showing with 42 additions and 3 deletions.

+2 −2 src/app/qgsmaptooladdcircularstring.cpp

+1 −1 src/gui/qgsmaptoolcapture.cpp

+39 −0 tests/src/app/testqgsmaptoolcircularstring.cpp
diff --git a/src/app/qgsmaptooladdcircularstring.cpp b/src/app/qgsmaptooladdcircularstring.cpp
@@ -144,8 +144,8 @@ void QgsMapToolAddCircularString::activate()
         {
           //mParentTool->captureCurve() is in layer coordinates, but we need map coordinates
           QgsPoint endPointLayerCoord = curve->endPoint();
-          QgsPointXY mapPoint = toMapCoordinates( mCanvas->currentLayer(), QgsPointXY( endPointLayerCoord.x(), endPointLayerCoord.y() ) );
-          mPoints.append( QgsPoint( mapPoint ) );
+          QgsPoint mapPoint = toMapCoordinates( mCanvas->currentLayer(),  endPointLayerCoord );
+          mPoints.append( mapPoint );
           if ( !mTempRubberBand )
           {
             mTempRubberBand = createGeometryRubberBand( mLayerType, true );

diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -603,7 +603,7 @@ int QgsMapToolCapture::addVertex( const QgsPointXY &point, const QgsPointLocator
         mCaptureLastPoint = mapPoint;
         mTempRubberBand->reset( mCaptureMode == CapturePolygon ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, mDigitizingType, firstCapturedMapPoint() );
       }
-      else if ( mCaptureCurve.numPoints() == 0 )
+      else if ( mTempRubberBand->pointsCount() == 0 )
       {
         mCaptureLastPoint = mapPoint;
         mCaptureCurve.addVertex( layerPoint );

diff --git a/tests/src/app/testqgsmaptoolcircularstring.cpp b/tests/src/app/testqgsmaptoolcircularstring.cpp
@@ -42,6 +42,7 @@ class TestQgsMapToolCircularString : public QObject
     void testAddCircularStringRadius();
     void testAddCircularStringCurvePointWithDeletedVertex();
     void testAddCircularStringRadiusWithDeletedVertex();
+    void testAddCircularStringAfterClassicDigitizing();
 
   private:
     QgisApp *mQgisApp = nullptr;
@@ -187,5 +188,43 @@ void TestQgsMapToolCircularString::testAddCircularStringRadiusWithDeletedVertex(
   mLayer->rollBack();
   QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 0 );
 }
+
+void TestQgsMapToolCircularString::testAddCircularStringAfterClassicDigitizing()
+{
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 333 );
+  mLayer->startEditing();
+
+  TestQgsMapToolAdvancedDigitizingUtils utilsClassic( mParentTool );
+
+  mCanvas->setMapTool( mParentTool );
+  utilsClassic.mouseClick( 2, 1, Qt::LeftButton );
+  utilsClassic.mouseClick( 2, 0, Qt::LeftButton );
+  utilsClassic.mouseClick( 0, 0, Qt::LeftButton );
+
+  QgsMapToolCircularStringCurvePoint mapTool( mParentTool, mCanvas );
+  mCanvas->setMapTool( &mapTool );
+
+  TestQgsMapToolAdvancedDigitizingUtils utilsCircular( &mapTool );
+  utilsCircular.mouseClick( 1, 1, Qt::LeftButton );
+  utilsCircular.mouseClick( 0, 2, Qt::LeftButton );
+
+  mCanvas->setMapTool( mParentTool );
+  utilsClassic.mouseClick( 2, 2, Qt::LeftButton );
+  utilsClassic.mouseClick( 4, 2, Qt::LeftButton );
+
+  utilsCircular.mouseClick( 4, 2, Qt::RightButton );
+  QgsFeatureId newFid = utilsCircular.newFeatureId();
+
+  QCOMPARE( mLayer->featureCount(), ( long )1 );
+  QgsFeature f = mLayer->getFeature( newFid );
+
+  qDebug() << f.geometry().asWkt();
+
+  QString wkt = "CompoundCurveZ ((2 1 333, 2 0 333, 0 0 333),CircularStringZ (0 0 333, 1 1 333, 0 2 333),(0 2 333, 2 2 333, 4 2 333))";
+  QCOMPARE( f.geometry().asWkt(), wkt );
+
+  mLayer->rollBack();
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 0 );
+}
 QGSTEST_MAIN( TestQgsMapToolCircularString )
 #include "testqgsmaptoolcircularstring.moc"