Merge pull request #40670 from vcloarec/fixTinInterpolation

fix TIN interpolation #40668
qgis · Dec 19, 2020 · 14f6c9e52810305fcb6bdad1337d78714b8f01ee · 14f6c9e
2 parents 677ccf5 + 30510e4
commit 14f6c9e52810305fcb6bdad1337d78714b8f01ee
Unified Split

Showing with 11 additions and 4 deletions.

+11 −4 src/analysis/interpolation/qgstininterpolator.cpp
diff --git a/src/analysis/interpolation/qgstininterpolator.cpp b/src/analysis/interpolation/qgstininterpolator.cpp
@@ -294,14 +294,21 @@ 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() );
+                  break;
+                case ValueZ:
                   break;
               }
             }