Keep Z/M information when digitizing from a snapped point (fixes #14318)

Hugo Mercier · Hugo Mercier · commit bcded3c2d499 · 2016-02-18T08:59:35.000+01:00
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -376,13 +376,14 @@ int QgsMapToolCapture::fetchLayerPoint( QgsPointLocator::Match match , QgsPointV
   {
     QgsFeature f;
     QgsFeatureRequest request;
-    QgsPoint foundPoint;
     request.setFilterFid( match.featureId() );
     bool fetched = match.layer()->getFeatures( request ).nextFeature( f );
     if ( fetched )
     {
-      foundPoint = f.geometry()->vertexAt( match.vertexIndex() );
-      layerPoint = QgsPointV2( foundPoint.x(), foundPoint.y() );
+      QgsVertexId vId;
+      if ( !f.geometry()->vertexIdFromVertexNr( match.vertexIndex(), vId ) )
+        return 2;
+      layerPoint = f.geometry()->geometry()->vertexAt( vId );
       return 0;
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -376,13 +376,14 @@ int QgsMapToolCapture::fetchLayerPoint( QgsPointLocator::Match match , QgsPointV`
`376`	`376`	`{`
`377`	`377`	`QgsFeature f;`
`378`	`378`	`QgsFeatureRequest request;`
`379`		`- QgsPoint foundPoint;`
`380`	`379`	`request.setFilterFid( match.featureId() );`
`381`	`380`	`bool fetched = match.layer()->getFeatures( request ).nextFeature( f );`
`382`	`381`	`if ( fetched )`
`383`	`382`	`{`
`384`		`- foundPoint = f.geometry()->vertexAt( match.vertexIndex() );`
`385`		`- layerPoint = QgsPointV2( foundPoint.x(), foundPoint.y() );`
	`383`	`+ QgsVertexId vId;`
	`384`	`+ if ( !f.geometry()->vertexIdFromVertexNr( match.vertexIndex(), vId ) )`
	`385`	`+ return 2;`
	`386`	`+ layerPoint = f.geometry()->geometry()->vertexAt( vId );`
`386`	`387`	`return 0;`
`387`	`388`	`}`
`388`	`389`	`else`