Fix dropping M/Z values from geometry collections

This commit is contained in:
Nyall Dawson 2017-09-25 16:47:20 +10:00
parent 94b44855e7
commit b2bd0ac182

View File

@ -690,7 +690,7 @@ bool QgsGeometryCollection::addMValue( double mValue )
bool QgsGeometryCollection::dropZValue()
{
if ( !is3D() )
if ( mWkbType != QgsWkbTypes::GeometryCollection && !is3D() )
return false;
mWkbType = QgsWkbTypes::dropZ( mWkbType );
@ -704,7 +704,7 @@ bool QgsGeometryCollection::dropZValue()
bool QgsGeometryCollection::dropMValue()
{
if ( !isMeasure() )
if ( mWkbType != QgsWkbTypes::GeometryCollection && !isMeasure() )
return false;
mWkbType = QgsWkbTypes::dropM( mWkbType );