When constructing a QgsPoint with explicit WKB type specified,

nyalldawson · nyalldawson · commit 1956a381995a · 2017-09-19T17:22:33.000+10:00
ignore any explicit z/m value if the WKB type does not have
that dimensionality

Brings consistent behavior to all QgsPoint constructors
diff --git a/src/core/geometry/qgscircularstring.cpp b/src/core/geometry/qgscircularstring.cpp
@@ -496,11 +496,13 @@ void QgsCircularString::setPoints( const QgsPointSequence &points )
     mY[i] = points[i].y();
     if ( hasZ )
     {
-      mZ[i] = points[i].z();
+      double z = points.at( i ).z();
+      mZ[i] = std::isnan( z ) ? 0 : z;
     }
     if ( hasM )
     {
-      mM[i] = points[i].m();
+      double m = points.at( i ).m();
+      mM[i] = std::isnan( m ) ? 0 : m;
     }
   }
 }
diff --git a/src/core/geometry/qgslinestring.cpp b/src/core/geometry/qgslinestring.cpp
@@ -535,11 +535,13 @@ void QgsLineString::setPoints( const QgsPointSequence &points )
     mY[i] = points.at( i ).y();
     if ( hasZ )
     {
-      mZ[i] = points.at( i ).z();
+      double z = points.at( i ).z();
+      mZ[i] = std::isnan( z ) ? 0 : z;
     }
     if ( hasM )
     {
-      mM[i] = points.at( i ).m();
+      double m = points.at( i ).m();
+      mM[i] = std::isnan( m ) ? 0 : m;
     }
   }
 }
diff --git a/src/core/geometry/qgspoint.cpp b/src/core/geometry/qgspoint.cpp
@@ -80,8 +80,8 @@ QgsPoint::QgsPoint( QgsWkbTypes::Type wkbType, double x, double y, double z, dou
   : QgsAbstractGeometry()
   , mX( x )
   , mY( y )
-  , mZ( z )
-  , mM( m )
+  , mZ( QgsWkbTypes::hasZ( wkbType ) ? z : std::numeric_limits<double>::quiet_NaN() )
+  , mM( QgsWkbTypes::hasM( wkbType ) ? m : std::numeric_limits<double>::quiet_NaN() )
 {
   Q_ASSERT( QgsWkbTypes::flatType( wkbType ) == QgsWkbTypes::Point );
   mWkbType = wkbType;

Original file line number	Diff line number	Diff line change
`@@ -496,11 +496,13 @@ void QgsCircularString::setPoints( const QgsPointSequence &points )`
`496`	`496`	`mY[i] = points[i].y();`
`497`	`497`	`if ( hasZ )`
`498`	`498`	`{`
`499`		`- mZ[i] = points[i].z();`
	`499`	`+ double z = points.at( i ).z();`
	`500`	`+ mZ[i] = std::isnan( z ) ? 0 : z;`
`500`	`501`	`}`
`501`	`502`	`if ( hasM )`
`502`	`503`	`{`
`503`		`- mM[i] = points[i].m();`
	`504`	`+ double m = points.at( i ).m();`
	`505`	`+ mM[i] = std::isnan( m ) ? 0 : m;`
`504`	`506`	`}`
`505`	`507`	`}`
`506`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -535,11 +535,13 @@ void QgsLineString::setPoints( const QgsPointSequence &points )`
`535`	`535`	`mY[i] = points.at( i ).y();`
`536`	`536`	`if ( hasZ )`
`537`	`537`	`{`
`538`		`- mZ[i] = points.at( i ).z();`
	`538`	`+ double z = points.at( i ).z();`
	`539`	`+ mZ[i] = std::isnan( z ) ? 0 : z;`
`539`	`540`	`}`
`540`	`541`	`if ( hasM )`
`541`	`542`	`{`
`542`		`- mM[i] = points.at( i ).m();`
	`543`	`+ double m = points.at( i ).m();`
	`544`	`+ mM[i] = std::isnan( m ) ? 0 : m;`
`543`	`545`	`}`
`544`	`546`	`}`
`545`	`547`	`}`