Merge pull request #40676 from vcloarec/backport#40670

backport TIN interpolation fix
qgis · Dec 20, 2020 · f536dd8cb829cedefa1126b4acd840912f33dfb8 · f536dd8
2 parents c2d0231 + 38b1371
commit f536dd8cb829cedefa1126b4acd840912f33dfb8
Unified Split

Showing with 10 additions and 4 deletions.

+10 −4 src/analysis/interpolation/qgstininterpolator.cpp
diff --git a/src/analysis/interpolation/qgstininterpolator.cpp b/src/analysis/interpolation/qgstininterpolator.cpp
@@ -294,14 +294,20 @@ int QgsTinInterpolator::insertData( const QgsFeature &f, QgsInterpolator::ValueS
               switch ( source )
               {
                 case ValueAttribute:
-                  point.setZ( attributeValue );
+                  if ( point.is3D() )
+                    point.setZ( attributeValue );
+                  else
+                    point.addZValue( attributeValue );
                   break;
 
-                case ValueZ:
+                case ValueM:
+                  if ( point.is3D() )
+                    point.setZ( point.m() );
+                  else
+                    point.addZValue( point.m() );
                   break;
 
-                case ValueM:
-                  point.setZ( point.m() );
+                case ValueZ:
                   break;
               }
             }