Fix Z and M support for add point feature (fixes #17427)

qgis · Nov 9, 2017 · 0ccf6fa · 0ccf6fa
1 parent ba62ffc
commit 0ccf6fa
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -154,15 +154,15 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
       {
         g = QgsGeometry::fromPointXY( savePoint );
       }
-      else if ( layerWKBType == QgsWkbTypes::Point25D )
+      else if ( !QgsWkbTypes::isMultiType( layerWKBType ) && QgsWkbTypes::hasZ( layerWKBType ) )
       {
         g = QgsGeometry( new QgsPoint( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), defaultZValue() ) );
       }
-      else if ( layerWKBType == QgsWkbTypes::MultiPoint )
+      else if ( QgsWkbTypes::isMultiType( layerWKBType ) && !QgsWkbTypes::hasZ( layerWKBType ) )
       {
         g = QgsGeometry::fromMultiPointXY( QgsMultiPointXY() << savePoint );
       }
-      else if ( layerWKBType == QgsWkbTypes::MultiPoint25D )
+      else if ( QgsWkbTypes::isMultiType( layerWKBType ) && QgsWkbTypes::hasZ( layerWKBType ) )
       {
         QgsMultiPoint *mp = new QgsMultiPoint();
         mp->addGeometry( new QgsPoint( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), defaultZValue() ) );
@@ -174,6 +174,11 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
         g = QgsGeometry::fromPointXY( savePoint );
       }
 
+      if ( QgsWkbTypes::hasM( layerWKBType ) )
+      {
+        g.get()->addMValue();
+      }
+
       f.setGeometry( g );
       f.setValid( true );