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

Z/M for these curves should be dropped to ensure consistent dimensionality for the whole compound curve
qgis · Sep 21, 2017 · 148a906 · 148a906
1 parent f268ccc
commit 148a906
Showing 1 changed file with 8 additions and 0 deletions.
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();
   }
 }