Add z/m values to new curves of compound curve

mhugent · mhugent · commit caad9897f496 · 2016-04-28T15:01:41.000+02:00
diff --git a/src/core/geometry/qgscompoundcurvev2.cpp b/src/core/geometry/qgscompoundcurvev2.cpp
@@ -390,6 +390,15 @@ void QgsCompoundCurveV2::addCurve( QgsCurveV2* c )
     {
       setZMTypeFromSubGeometry( c, QgsWKBTypes::CompoundCurve );
     }
+
+    if ( QgsWKBTypes::hasZ( mWkbType ) && !QgsWKBTypes::hasZ( c->wkbType() ) )
+    {
+      c->addZValue();
+    }
+    if ( QgsWKBTypes::hasM( mWkbType ) && !QgsWKBTypes::hasM( c->wkbType() ) )
+    {
+      c->addMValue();
+    }
     clearCache();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -390,6 +390,15 @@ void QgsCompoundCurveV2::addCurve( QgsCurveV2* c )`
`390`	`390`	`{`
`391`	`391`	`setZMTypeFromSubGeometry( c, QgsWKBTypes::CompoundCurve );`
`392`	`392`	`}`
	`393`	`+`
	`394`	`+ if ( QgsWKBTypes::hasZ( mWkbType ) && !QgsWKBTypes::hasZ( c->wkbType() ) )`
	`395`	`+ {`
	`396`	`+ c->addZValue();`
	`397`	`+ }`
	`398`	`+ if ( QgsWKBTypes::hasM( mWkbType ) && !QgsWKBTypes::hasM( c->wkbType() ) )`
	`399`	`+ {`
	`400`	`+ c->addMValue();`
	`401`	`+ }`
`393`	`402`	`clearCache();`
`394`	`403`	`}`
`395`	`404`	`}`