[WIP][BUGFIX] Fix interpolation on split geometry

qgis · May 18, 2020 · bd7e9d6 · bd7e9d6
1 parent 6f86c4b
commit bd7e9d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/python/core/auto_generated/geometry/qgsgeometry.sip.in b/python/core/auto_generated/geometry/qgsgeometry.sip.in
@@ -839,22 +839,6 @@ Rotate this geometry around the Z axis
 :return: OperationResult a result code: success or reason of failure
 %End
 
- OperationResult splitGeometry( const QVector<QgsPointXY> &splitLine, QVector<QgsGeometry> &newGeometries /Out/, bool topological, QVector<QgsPointXY> &topologyTestPoints /Out/, bool splitFeature = true ) /Deprecated/;
-%Docstring
-Splits this geometry according to a given line.
-
-:param splitLine: the line that splits the geometry
-\param[out] newGeometries list of new geometries that have been created with the split
-:param topological: ``True`` if topological editing is enabled
-\param[out] topologyTestPoints points that need to be tested for topological completeness in the dataset
-:param splitFeature: Set to True if you want to split a feature, otherwise set to False to split parts
-
-:return: OperationResult a result code: success or reason of failure
-
-.. deprecated:: QGIS 3.12
-   - will be removed in QGIS 4.0. Use the variant which accepts QgsPoint objects instead of QgsPointXY.
-%End
-
     OperationResult splitGeometry( const QgsPointSequence &splitLine, QVector<QgsGeometry> &newGeometries /Out/, bool topological, QgsPointSequence &topologyTestPoints /Out/, bool splitFeature = true );
 %Docstring
 Splits this geometry according to a given line.

diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -829,6 +829,8 @@ QgsGeometry::OperationResult QgsGeometry::splitGeometry( const QgsPointSequence
 
   QVector<QgsGeometry > newGeoms;
   QgsLineString splitLineString( splitLine );
+  splitLineString.dropZValue();
+  splitLineString.dropMValue();
 
   QgsGeos geos( d->geometry.get() );
   mLastError.clear();