fix: apply requested changes

qgis · Nov 30, 2022 · 6ce6da4 · 6ce6da4
1 parent 635564f
commit 6ce6da4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -2418,7 +2418,7 @@ void QgsVertexTool::applyEditsToLayers( QgsVertexTool::VertexEdits &edits )
             break;
         }
         // if the geometry has been changed
-        if ( avoidIntersectionsReturn != 4 )
+        if ( avoidIntersectionsReturn != 1 && avoidIntersectionsReturn != 4 )
         {
           layer->changeGeometry( it2.key(), featGeom );
           edits[layer][it2.key()] = featGeom;

diff --git a/src/core/geometry/qgsgeometryeditutils.h b/src/core/geometry/qgsgeometryeditutils.h
@@ -73,6 +73,7 @@ class QgsGeometryEditUtils
      * \param avoidIntersectionsLayers list of layers to check for intersections
      * \param haveInvalidGeometry returns true if at least one geometry intersected is invalid. In this case, the algorithm may not work and return the same geometry as the input. You must fix your intersecting geometries.
      * \param ignoreFeatures map of layer to feature id of features to ignore
+     * \return the modified geometry or a null unique_ptr if the \a geom polygon doesn't intersect any geometry in \a avoidIntersectionsLayers
      */
     static std::unique_ptr< QgsAbstractGeometry > avoidIntersections( const QgsAbstractGeometry &geom,
         const QList<QgsVectorLayer *> &avoidIntersectionsLayers,