Fix test failure

nyalldawson · nyalldawson · commit c360e3746033 · 2018-06-29T07:12:48.000+10:00
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -1873,7 +1873,10 @@ QgsGeometry QgsGeometry::centroid() const
   // avoid calling geos for trivial point centroids
   if ( QgsWkbTypes::flatType( d->geometry->wkbType() ) == QgsWkbTypes::Point )
   {
-    return *this;
+    QgsGeometry c = *this;
+    c.get()->dropZValue();
+    c.get()->dropMValue();
+    return c;
   }
 
   QgsGeos geos( d->geometry.get() );

Original file line number	Diff line number	Diff line change
`@@ -1873,7 +1873,10 @@ QgsGeometry QgsGeometry::centroid() const`
`1873`	`1873`	`// avoid calling geos for trivial point centroids`
`1874`	`1874`	`if ( QgsWkbTypes::flatType( d->geometry->wkbType() ) == QgsWkbTypes::Point )`
`1875`	`1875`	`{`
`1876`		`- return *this;`
	`1876`	`+ QgsGeometry c = *this;`
	`1877`	`+ c.get()->dropZValue();`
	`1878`	`+ c.get()->dropMValue();`
	`1879`	`+ return c;`
`1877`	`1880`	`}`
`1878`	`1881`
`1879`	`1882`	`QgsGeos geos( d->geometry.get() );`