Fix adding curves with Z/M to non Z/M compound curves

nyalldawson · nyalldawson · commit 148a906cb546 · 2017-09-22T09:54:23.000+10:00
Z/M for these curves should be dropped to ensure consistent
dimensionality for the whole compound curve
diff --git a/src/core/geometry/qgscompoundcurve.cpp b/src/core/geometry/qgscompoundcurve.cpp
@@ -407,10 +407,18 @@ void QgsCompoundCurve::addCurve( QgsCurve *c )
     {
       c->addZValue();
     }
+    else if ( !QgsWkbTypes::hasZ( mWkbType ) && QgsWkbTypes::hasZ( c->wkbType() ) )
+    {
+      c->dropZValue();
+    }
     if ( QgsWkbTypes::hasM( mWkbType ) && !QgsWkbTypes::hasM( c->wkbType() ) )
     {
       c->addMValue();
     }
+    else if ( !QgsWkbTypes::hasM( mWkbType ) && QgsWkbTypes::hasM( c->wkbType() ) )
+    {
+      c->dropMValue();
+    }
     clearCache();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -407,10 +407,18 @@ void QgsCompoundCurve::addCurve( QgsCurve *c )`
`407`	`407`	`{`
`408`	`408`	`c->addZValue();`
`409`	`409`	`}`
	`410`	`+ else if ( !QgsWkbTypes::hasZ( mWkbType ) && QgsWkbTypes::hasZ( c->wkbType() ) )`
	`411`	`+ {`
	`412`	`+ c->dropZValue();`
	`413`	`+ }`
`410`	`414`	`if ( QgsWkbTypes::hasM( mWkbType ) && !QgsWkbTypes::hasM( c->wkbType() ) )`
`411`	`415`	`{`
`412`	`416`	`c->addMValue();`
`413`	`417`	`}`
	`418`	`+ else if ( !QgsWkbTypes::hasM( mWkbType ) && QgsWkbTypes::hasM( c->wkbType() ) )`
	`419`	`+ {`
	`420`	`+ c->dropMValue();`
	`421`	`+ }`
`414`	`422`	`clearCache();`
`415`	`423`	`}`
`416`	`424`	`}`