Also call invalidGeometryCallback when skipping features

qgis · Jun 23, 2017 · 5ea0768 · 5ea0768
1 parent a8cdde5
commit 5ea0768
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/python/core/qgsfeaturerequest.sip b/python/core/qgsfeaturerequest.sip
@@ -364,7 +364,7 @@ Get feature IDs that should be fetched.
     QgsFeatureRequest &setInvalidGeometryCallback( SIP_PYCALLABLE / AllowNone / );
 %Docstring
  Sets a callback function to use when encountering an invalid geometry and
- invalidGeometryCheck() is set to GeometryAbortOnInvalid. This function will be
+ invalidGeometryCheck() is set to GeometryAbortOnInvalid or GeometrySkipInvalid. This function will be
  called using the feature with invalid geometry as a parameter.
 .. versionadded:: 3.0
 .. seealso:: invalidGeometryCallback()

diff --git a/python/plugins/processing/tools/dataobjects.py b/python/plugins/processing/tools/dataobjects.py
@@ -77,6 +77,14 @@ def createContext(feedback=None):
         invalid_features_method = QgsFeatureRequest.GeometryAbortOnInvalid
     context.setInvalidGeometryCheck(invalid_features_method)
 
+    def raise_invalid_geometry_error(f, feedback=feedback):
+        if feedback:
+            feedback.pushInfo(QCoreApplication.translate("FeatureIterator",
+                                                         'Feature with id {} has invalid geometry, skipping feature.'.format(f.id())))
+
+    if context.invalidGeometryCheck() == QgsFeatureRequest.GeometrySkipInvalid:
+        context.setInvalidGeometryCallback(raise_invalid_geometry_error)
+
     def raise_transform_error(f, feedback=feedback):
         if feedback:
             feedback.pushInfo(QCoreApplication.translate("FeatureIterator",

diff --git a/src/core/qgsfeaturerequest.h b/src/core/qgsfeaturerequest.h
@@ -346,7 +346,7 @@ class CORE_EXPORT QgsFeatureRequest
 
     /**
      * Sets a callback function to use when encountering an invalid geometry and
-     * invalidGeometryCheck() is set to GeometryAbortOnInvalid. This function will be
+     * invalidGeometryCheck() is set to GeometryAbortOnInvalid or GeometrySkipInvalid. This function will be
      * called using the feature with invalid geometry as a parameter.
      * \since QGIS 3.0
      * \see invalidGeometryCallback()
@@ -373,7 +373,7 @@ class CORE_EXPORT QgsFeatureRequest
 
     /**
      * Returns the callback function to use when encountering an invalid geometry and
-     * invalidGeometryCheck() is set to GeometryAbortOnInvalid.
+     * invalidGeometryCheck() is set to GeometryAbortOnInvalid or GeometrySkipInvalid.
      * \since QGIS 3.0
      * \note not available in Python bindings
      * \see setInvalidGeometryCallback()

diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -746,6 +746,10 @@ bool QgsVectorLayerFeatureIterator::checkGeometryValidity( const QgsFeature &fea
       if ( !feature.geometry().isGeosValid() )
       {
         QgsMessageLog::logMessage( QObject::tr( "Geometry error: One or more input features have invalid geometry." ), QString(), QgsMessageLog::CRITICAL );
+        if ( mRequest.invalidGeometryCallback() )
+        {
+          mRequest.invalidGeometryCallback()( feature );
+        }
         return false;
       }
       break;