[tracer] Skip duplicate points in the path (to avoid geometry errors)

wonder-sk · wonder-sk · commit bf8571dde58b · 2016-01-10T20:32:01.000+01:00
diff --git a/src/core/qgstracer.cpp b/src/core/qgstracer.cpp
@@ -444,7 +444,6 @@ void extract_linework( QgsGeometry* g, QgsMultiPolyline& mpl )
   }
 }
 
-
 // -------------
 
 
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -208,6 +208,8 @@ bool QgsMapToolCapture::tracingAddVertex( const QgsPoint& point )
 
   for ( int i = 1; i < points.count(); ++i )
   {
+    if ( points[i] == points[i-1] )
+      continue; // avoid duplicate vertices if there are any
     mRubberBand->addPoint( points[i], i == points.count() - 1 );
     mCaptureCurve.addVertex( layerPoints[i-1] );
   }

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,6 @@ void extract_linework( QgsGeometry* g, QgsMultiPolyline& mpl )`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`
`447`		`-`
`448`	`447`	`// -------------`
`449`	`448`
`450`	`449`
Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,8 @@ bool QgsMapToolCapture::tracingAddVertex( const QgsPoint& point )`
`208`	`208`
`209`	`209`	`for ( int i = 1; i < points.count(); ++i )`
`210`	`210`	`{`
	`211`	`+ if ( points[i] == points[i-1] )`
	`212`	`+ continue; // avoid duplicate vertices if there are any`
`211`	`213`	`mRubberBand->addPoint( points[i], i == points.count() - 1 );`
`212`	`214`	`mCaptureCurve.addVertex( layerPoints[i-1] );`
`213`	`215`	`}`