Projecting a 2D point with inclination assumes 0 for Z

m-kuhn · m-kuhn · commit 96cf4b7026f4 · 2017-06-14T07:37:31.000+02:00
diff --git a/python/core/geometry/qgspoint.sip b/python/core/geometry/qgspoint.sip
@@ -269,7 +269,7 @@ class QgsPoint: QgsAbstractGeometry
  M value is preserved.
  \param distance distance to project
  \param azimuth angle to project in X Y, clockwise in degrees starting from north
- \param inclination angle to project in Z (3D)
+ \param inclination angle to project in Z (3D). If the point is 2D, the Z value is assumed to be 0.
  :return: The point projected. If a 2D point is projected a 3D point will be returned except if
   inclination is 90. A 3D point is always returned if a 3D point is projected.
  Example:
diff --git a/src/core/geometry/qgspoint.cpp b/src/core/geometry/qgspoint.cpp
@@ -546,5 +546,6 @@ QgsPoint QgsPoint::project( double distance, double azimuth, double inclination
     pType = QgsWkbTypes::addM( pType );
   }
 
-  return QgsPoint( mX + dx, mY + dy, mZ + dz, mM, pType );
+  double z = qIsNaN( mZ ) ? 0 : mZ;
+  return QgsPoint( mX + dx, mY + dy, z + dz, mM, pType );
 }
diff --git a/src/core/geometry/qgspoint.h b/src/core/geometry/qgspoint.h
@@ -294,7 +294,7 @@ class CORE_EXPORT QgsPoint: public QgsAbstractGeometry
      * M value is preserved.
      * \param distance distance to project
      * \param azimuth angle to project in X Y, clockwise in degrees starting from north
-     * \param inclination angle to project in Z (3D)
+     * \param inclination angle to project in Z (3D). If the point is 2D, the Z value is assumed to be 0.
      * \returns The point projected. If a 2D point is projected a 3D point will be returned except if
      *  inclination is 90. A 3D point is always returned if a 3D point is projected.
      * Example:

Original file line number	Diff line number	Diff line change
`@@ -546,5 +546,6 @@ QgsPoint QgsPoint::project( double distance, double azimuth, double inclination`
`546`	`546`	`pType = QgsWkbTypes::addM( pType );`
`547`	`547`	`}`
`548`	`548`
`549`		`- return QgsPoint( mX + dx, mY + dy, mZ + dz, mM, pType );`
	`549`	`+ double z = qIsNaN( mZ ) ? 0 : mZ;`
	`550`	`+ return QgsPoint( mX + dx, mY + dy, z + dz, mM, pType );`
`550`	`551`	`}`