Fix build and multi-arc duplicated points

strk · strk · commit 320c305d929f · 2017-08-25T23:06:52.000+02:00
diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp
@@ -779,15 +779,15 @@ void QgsGeometryUtils::segmentizeArc( const QgsPoint &p1, const QgsPoint &p2, co
       {
         if ( clockwise )
         {
-          if ( *stringPoints.begin() != circlePoint2 )
+          if ( stringPoints.empty() || stringPoints.front() != circlePoint2 )
           {
             QgsDebugMsg( QString( "Adding control point, with angle %1 (%2)" ) . arg( a2 ) .arg( a2 * 180 / M_PI ) );
             stringPoints.insert( 0, circlePoint2 );
           }
         }
         else
         {
-          if ( *stringPoints.rbegin() != circlePoint2 )
+          if ( stringPoints.empty() || stringPoints.back() != circlePoint2 )
           {
             QgsDebugMsg( QString( "Adding control point, with angle %1 (%2)" ) . arg( a2 ) .arg( a2 * 180 / M_PI ) );
             stringPoints.insert( stringPoints.size(), circlePoint2 );
@@ -822,6 +822,7 @@ void QgsGeometryUtils::segmentizeArc( const QgsPoint &p1, const QgsPoint &p2, co
   {
     std::reverse( stringPoints.begin(), stringPoints.end() );
   }
+  if ( ! points.empty() && stringPoints.front() == points.back() ) stringPoints.pop_front();
   points.append( stringPoints );
 }
 
diff --git a/tests/src/core/testqgscurve.cpp b/tests/src/core/testqgscurve.cpp
@@ -67,7 +67,7 @@ class TestQgsCurve : public QObject
                     ); \
     std::unique_ptr< QgsLineString > expgeom( \
         dynamic_cast<QgsLineString *>( \
-                                       QgsGeometryFactory::geomFromWkt( exp ) \
+                                       QgsGeometryFactory::geomFromWkt( exp ).release() \
                                      ) \
                                             ); \
     expgeom.reset( expgeom->reversed() ); \
@@ -80,10 +80,11 @@ void TestQgsCurve::curveToLine()
   std::unique_ptr< QgsCircularString > circularString;
 
   /* input: 2 quadrants arc (180 degrees, PI radians) */
-  circularString.reset( dynamic_cast<QgsCircularString *>(
+  circularString.reset( dynamic_cast< QgsCircularString *>(
                           QgsGeometryFactory::geomFromWkt( QString(
                                 "CIRCULARSTRING(0 0,100 100,200 0)"
-                              ) )
+                              )
+                                                         ).release()
                         ) );
   QVERIFY( circularString.get() );
 
@@ -105,13 +106,13 @@ void TestQgsCurve::curveToLine()
   circularString.reset( dynamic_cast<QgsCircularString *>(
                           QgsGeometryFactory::geomFromWkt( QString(
                                 "CIRCULARSTRING(0 0,100 100,200 0,300 -100,400 0)"
-                              ) )
+                              ) ).release()
                         ) );
   QVERIFY( circularString.get() );
 
   /* op: Maximum of M_PI / 3 degrees of angle */
   TEST_C2L( circularString, M_PI / 3, QgsAbstractGeometry::MaximumAngle,
-            "LineString (0 0, 50 86.6, 150 86.6, 200 0, 200 0, 250 -86.6, 350 -86.6, 400 0)", 2 );
+            "LineString (0 0, 50 86.6, 150 86.6, 200 0, 250 -86.6, 350 -86.6, 400 0)", 2 );
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -779,15 +779,15 @@ void QgsGeometryUtils::segmentizeArc( const QgsPoint &p1, const QgsPoint &p2, co`
`779`	`779`	`{`
`780`	`780`	`if ( clockwise )`
`781`	`781`	`{`
`782`		`- if ( *stringPoints.begin() != circlePoint2 )`
	`782`	`+ if ( stringPoints.empty() \|\| stringPoints.front() != circlePoint2 )`
`783`	`783`	`{`
`784`	`784`	`QgsDebugMsg( QString( "Adding control point, with angle %1 (%2)" ) . arg( a2 ) .arg( a2 * 180 / M_PI ) );`
`785`	`785`	`stringPoints.insert( 0, circlePoint2 );`
`786`	`786`	`}`
`787`	`787`	`}`
`788`	`788`	`else`
`789`	`789`	`{`
`790`		`- if ( *stringPoints.rbegin() != circlePoint2 )`
	`790`	`+ if ( stringPoints.empty() \|\| stringPoints.back() != circlePoint2 )`
`791`	`791`	`{`
`792`	`792`	`QgsDebugMsg( QString( "Adding control point, with angle %1 (%2)" ) . arg( a2 ) .arg( a2 * 180 / M_PI ) );`
`793`	`793`	`stringPoints.insert( stringPoints.size(), circlePoint2 );`
`@@ -822,6 +822,7 @@ void QgsGeometryUtils::segmentizeArc( const QgsPoint &p1, const QgsPoint &p2, co`
`822`	`822`	`{`
`823`	`823`	`std::reverse( stringPoints.begin(), stringPoints.end() );`
`824`	`824`	`}`
	`825`	`+ if ( ! points.empty() && stringPoints.front() == points.back() ) stringPoints.pop_front();`
`825`	`826`	`points.append( stringPoints );`
`826`	`827`	`}`
`827`	`828`