Fix incorrect vertexAngle calculation for circular strings

Angle was always perpendicular to the tangent, instead of tangential to the curve
qgis · Sep 19, 2017 · bb3170f · bb3170f
1 parent 0fba03f
commit bb3170f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp
@@ -617,14 +617,18 @@ double QgsGeometryUtils::circleTangentDirection( const QgsPoint &tangentPoint, c
   double p1Angle = QgsGeometryUtils::ccwAngle( cp1.y() - mY, cp1.x() - mX );
   double p2Angle = QgsGeometryUtils::ccwAngle( cp2.y() - mY, cp2.x() - mX );
   double p3Angle = QgsGeometryUtils::ccwAngle( cp3.y() - mY, cp3.x() - mX );
+  double angle = 0;
   if ( circleClockwise( p1Angle, p2Angle, p3Angle ) )
   {
-    return lineAngle( tangentPoint.x(), tangentPoint.y(), mX, mY );
+    angle = lineAngle( tangentPoint.x(), tangentPoint.y(), mX, mY ) - M_PI_2;
   }
   else
   {
-    return lineAngle( mX, mY, tangentPoint.x(), tangentPoint.y() );
+    angle = lineAngle( mX, mY, tangentPoint.x(), tangentPoint.y() ) - M_PI_2;
   }
+  if ( angle < 0 )
+    angle += 2 * M_PI;
+  return angle;
 }
 
 void QgsGeometryUtils::segmentizeArc( const QgsPoint &p1, const QgsPoint &p2, const QgsPoint &p3, QgsPointSequence &points, double tolerance, QgsAbstractGeometry::SegmentationToleranceType toleranceType, bool hasZ, bool hasM )