In-place moved check logic into QgsAlgorithm

+ new tests
+ fixed fixer function
+ drop z/m

Author: elpaso

python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in

@@ -810,6 +810,16 @@ should correspond to the invalid source parameter name.
 .. seealso:: :py:func:`invalidRasterError`
 
 .. versionadded:: 3.2
+%End
+
+    virtual bool supportInPlaceEdit( const QgsVectorLayer *layer ) const;
+%Docstring
+Checks whether this algorithm supports in-place editing on the given ``layer``
+Default implementation returns false.
+
+:return: true if the algorithm supports in-place editing
+
+.. versionadded:: 3.4
 %End
 
   private:
@@ -964,6 +974,17 @@ called from a subclasses' processFeature() implementation.
 %Docstring
 Returns the feature request used for fetching features to process from the
 source layer. The default implementation requests all attributes and geometry.
+%End
+
+    virtual bool supportInPlaceEdit( const QgsVectorLayer *layer ) const;
+%Docstring
+Checks whether this algorithm supports in-place editing on the given ``layer``
+Default implementation for feature based algorithms run some basic compatibility
+checks based on the geometry type of the layer.
+
+:return: true if the algorithm supports in-place editing
+
+.. versionadded:: 3.4
 %End
 
 };

python/gui/auto_generated/processing/qgsprocessingtoolboxmodel.sip.in

@@ -418,7 +418,7 @@ Returns any filters that affect how toolbox content is filtered.
 .. seealso:: :py:func:`setFilters`
 %End
 
-    void setInPlaceLayerType( QgsWkbTypes::GeometryType type );
+    void setInPlaceLayer( QgsVectorLayer *layer );
 
     void setFilterString( const QString &filter );
 %Docstring

python/gui/auto_generated/processing/qgsprocessingtoolboxtreeview.sip.in

@@ -74,10 +74,11 @@ Sets ``filters`` controlling the view's contents.
 %End
 
 
-    void setInPlaceLayerType( QgsWkbTypes::GeometryType type );
+    void setInPlaceLayer( QgsVectorLayer *layer );
 %Docstring
 Sets geometry \type for the in-place algorithms
-@param type
+
+:param layer: the vector layer for in-place algorithm filter
 %End
 
   public slots:

python/plugins/processing/gui/AlgorithmDialog.py

@@ -105,6 +105,11 @@ def getParameterValues(self):
             if param.flags() & QgsProcessingParameterDefinition.FlagHidden:
                 continue
             if not param.isDestination():
+
+                if self.in_place and param.name() == 'INPUT':
+                    parameters[param.name()] = iface.activeLayer()
+                    continue
+
                 try:
                     wrapper = self.mainWidget().wrappers[param.name()]
                 except KeyError:
@@ -124,9 +129,6 @@ def getParameterValues(self):
 
                 value = wrapper.parameterValue()
                 parameters[param.name()] = value
-                if self.in_place and param.name() == 'INPUT':
-                    parameters[param.name()] = iface.activeLayer()
-                    continue
 
                 wrapper = self.mainWidget().wrappers[param.name()]
                 value = None

python/plugins/processing/gui/AlgorithmExecutor.py

@@ -39,7 +39,8 @@
                        QgsFeatureRequest,
                        QgsFeature,
                        QgsExpression,
-                       QgsWkbTypes)
+                       QgsWkbTypes,
+                       QgsGeometry)
 from processing.gui.Postprocessing import handleAlgorithmResults
 from processing.tools import dataobjects
 from qgis.utils import iface
@@ -86,27 +87,53 @@ def make_feature_compatible(new_features, input_layer):
 
     result_features = []
     for new_f in new_features:
-        if (new_f.geometry().wkbType() != input_layer.wkbType() and
-                QgsWkbTypes.isMultiType(input_layer.wkbType()) and not
-                new_f.geometry().isMultipart()):
-            new_geom = new_f.geometry()
-            new_geom.convertToMultiType()
-            new_f.setGeometry(new_geom)
-        if len(new_f.fields()) > len(input_layer.fields()):
+        if new_f.geometry().wkbType() != input_layer.wkbType():
+            # Single -> Multi
+            if (QgsWkbTypes.isMultiType(input_layer.wkbType()) and not
+                    new_f.geometry().isMultipart()):
+                new_geom = new_f.geometry()
+                new_geom.convertToMultiType()
+                new_f.setGeometry(new_geom)
+            # Drop Z/M
+            if ((QgsWkbTypes.hasZ(new_f.geometry().wkbType()) and not QgsWkbTypes.hasZ(input_layer.wkbType())) or
+                    (QgsWkbTypes.hasM(new_f.geometry().wkbType()) and not QgsWkbTypes.hasM(input_layer.wkbType()))):
+                # FIXME: there must be a better way!!!
+                if new_f.geometry().type() == QgsWkbTypes.PointGeometry:
+                    if new_f.geometry().isMultipart():
+                        new_geom = QgsGeometry.fromWkt(new_f.geometry().asMultiPoint().asWkt())
+                    else:
+                        new_geom = QgsGeometry.fromWkt(new_f.geometry().asPoint().asWkt())
+                elif new_f.geometry().type() == QgsWkbTypes.PolygonGeometry:
+                    if new_f.geometry().isMultipart():
+                        new_geom = QgsGeometry.fromWkt(new_f.geometry().asMultiPolygon().asWkt())
+                    else:
+                        new_geom = QgsGeometry.fromWkt(new_f.geometry().asPolygon().asWkt())
+                elif new_f.geometry().type() == QgsWkbTypes.LineGeometry:  # Linestring
+                    if new_f.geometry().isMultipart():
+                        new_geom = QgsGeometry.fromWkt(new_f.geometry().asPolyline().asWkt())
+                    else:
+                        new_geom = QgsGeometry.fromWkt(new_f.geometry().asMultiPolyline().asWkt())
+                else:
+                    new_geom = QgsGeometry()
+                new_f.setGeometry(new_geom)
+        if len(new_f.attributes()) > len(input_layer.fields()):
             f = QgsFeature(input_layer.fields())
             f.setGeometry(new_f.geometry())
             f.setAttributes(new_f.attributes()[:len(input_layer.fields())])
+            new_f = f
         result_features.append(new_f)
     return result_features
 
 
-def execute_in_place_run(alg, parameters, context=None, feedback=None):
+def execute_in_place_run(alg, active_layer, parameters, context=None, feedback=None, raise_exceptions=False):
     """Executes an algorithm modifying features in-place in the input layer.
 
     The input layer must be editable or an exception is raised.
 
     :param alg: algorithm to run
     :type alg: QgsProcessingAlgorithm
+    :param active_layer: the editable layer
+    :type active_layer: QgsVectoLayer
     :param parameters: parameters of the algorithm
     :type parameters: dict
     :param context: context, defaults to None
@@ -123,16 +150,11 @@ def execute_in_place_run(alg, parameters, context=None, feedback=None):
     if context is None:
         context = dataobjects.createContext(feedback)
 
-    # It would be nicer to get the layer from INPUT with
-    # alg.parameterAsVectorLayer(parameters, 'INPUT', context)
-    # but it does not work.
-    active_layer_id, ok = parameters['INPUT'].source.value(context.expressionContext())
-    if ok:
-        active_layer = QgsProject.instance().mapLayer(active_layer_id)
-        if active_layer is None or not active_layer.isEditable():
-            raise QgsProcessingException(tr("Layer is not editable or layer with id '%s' could not be found in the current project.") % active_layer_id)
-    else:
-        return False, {}
+    if active_layer is None or not active_layer.isEditable():
+        raise QgsProcessingException(tr("Layer is not editable or layer is None."))
+
+    if not alg.supportInPlaceEdit(active_layer):
+        raise QgsProcessingException(tr("Selected algorithm and parameter configuration are not compatible with in-place modifications."))
 
     parameters['OUTPUT'] = 'memory:'
 
@@ -147,7 +169,13 @@ def execute_in_place_run(alg, parameters, context=None, feedback=None):
 
         # Checks whether the algorithm has a processFeature method
         if hasattr(alg, 'processFeature'):  # in-place feature editing
+            # Make a clone or it will crash the second time the dialog
+            # is opened and run
+            alg = alg.create()
             alg.prepare(parameters, context, feedback)
+            # Check again for compatibility after prepare
+            if not alg.supportInPlaceEdit(active_layer):
+                raise QgsProcessingException(tr("Selected algorithm and parameter configuration are not compatible with in-place modifications."))
             field_idxs = range(len(active_layer.fields()))
             feature_iterator = active_layer.getFeatures(QgsFeatureRequest(active_layer.selectedFeatureIds())) if parameters['INPUT'].selectedFeaturesOnly else active_layer.getFeatures()
             for f in feature_iterator:
@@ -166,7 +194,8 @@ def execute_in_place_run(alg, parameters, context=None, feedback=None):
                     active_layer.deleteFeature(f.id())
                     # Get the new ids
                     old_ids = set([f.id() for f in active_layer.getFeatures(req)])
-                    active_layer.addFeatures(new_features)
+                    if not active_layer.addFeatures(new_features):
+                        raise QgsProcessingException(tr("Error adding processed features back into the layer."))
                     new_ids = set([f.id() for f in active_layer.getFeatures(req)])
                     new_feature_ids += list(new_ids - old_ids)
 
@@ -188,21 +217,24 @@ def execute_in_place_run(alg, parameters, context=None, feedback=None):
             new_ids = set([f.id() for f in active_layer.getFeatures(req)])
             new_feature_ids += list(new_ids - old_ids)
 
+        active_layer.endEditCommand()
+
         if ok and new_feature_ids:
             active_layer.selectByIds(new_feature_ids)
         elif not ok:
             active_layer.rollback()
 
-        active_layer.endEditCommand()
-
         return ok, results
 
     except QgsProcessingException as e:
+        active_layer.endEditCommand()
+        if raise_exceptions:
+            raise e
         QgsMessageLog.logMessage(str(sys.exc_info()[0]), 'Processing', Qgis.Critical)
         if feedback is not None:
-            feedback.reportError(e.msg)
+            feedback.reportError(getattr(e, 'msg', str(e)))
 
-        return False, {}
+    return False, {}
 
 
 def execute_in_place(alg, parameters, context=None, feedback=None):
@@ -224,7 +256,7 @@ def execute_in_place(alg, parameters, context=None, feedback=None):
     """
 
     parameters['INPUT'] = QgsProcessingFeatureSourceDefinition(iface.activeLayer().id(), True)
-    ok, results = execute_in_place_run(alg, parameters, context=context, feedback=feedback)
+    ok, results = execute_in_place_run(alg, iface.activeLayer(), parameters, context=context, feedback=feedback)
     if ok:
         iface.activeLayer().triggerRepaint()
     return ok, results

python/plugins/processing/gui/ProcessingToolbox.py

@@ -124,7 +124,7 @@ def set_in_place_edit_mode(self, enabled):
     def layer_changed(self, layer):
         if layer is None or layer.type() != QgsMapLayer.VectorLayer:
             return
-        self.algorithmTree.setInPlaceLayerType(QgsWkbTypes.geometryType(layer.wkbType()))
+        self.algorithmTree.setInPlaceLayer(layer)
 
     def disabledProviders(self):
         showTip = ProcessingConfig.getSetting(ProcessingConfig.SHOW_PROVIDERS_TOOLTIP)

src/analysis/processing/qgsalgorithmdropmzvalues.cpp

@@ -59,6 +59,12 @@ QgsDropMZValuesAlgorithm *QgsDropMZValuesAlgorithm::createInstance() const
   return new QgsDropMZValuesAlgorithm();
 }
 
+bool QgsDropMZValuesAlgorithm::supportInPlaceEdit( const QgsVectorLayer *layer ) const
+{
+  Q_UNUSED( layer );
+  return false;
+}
+
 void QgsDropMZValuesAlgorithm::initParameters( const QVariantMap & )
 {
   addParameter( new QgsProcessingParameterBoolean( QStringLiteral( "DROP_M_VALUES" ), QObject::tr( "Drop M Values" ), false ) );

src/analysis/processing/qgsalgorithmdropmzvalues.h

@@ -41,6 +41,7 @@ class QgsDropMZValuesAlgorithm : public QgsProcessingFeatureBasedAlgorithm
     QString groupId() const override;
     QString shortHelpString() const override;
     QgsDropMZValuesAlgorithm *createInstance() const override SIP_FACTORY;
+    bool supportInPlaceEdit( const QgsVectorLayer *layer ) const override;
 
   protected:
 
@@ -55,6 +56,7 @@ class QgsDropMZValuesAlgorithm : public QgsProcessingFeatureBasedAlgorithm
 
     bool mDropM = false;
     bool mDropZ = false;
+
 };
 
 ///@endcond PRIVATE

src/analysis/processing/qgsalgorithmtranslate.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsalgorithmtranslate.h"
+#include "qgsvectorlayer.h"
 
 ///@cond PRIVATE
 
@@ -141,9 +142,9 @@ QgsFeatureList QgsTranslateAlgorithm::processFeature( const QgsFeature &feature,
     if ( mDynamicDeltaM )
       deltaM = mDeltaMProperty.valueAsDouble( context.expressionContext(), deltaM );
 
-    if ( deltaZ != 0 && !geometry.constGet()->is3D() )
+    if ( deltaZ != 0.0 && !geometry.constGet()->is3D() )
       geometry.get()->addZValue( 0 );
-    if ( deltaM != 0 && !geometry.constGet()->isMeasure() )
+    if ( deltaM != 0.0 && !geometry.constGet()->isMeasure() )
       geometry.get()->addMValue( 0 );
 
     geometry.translate( deltaX, deltaY, deltaZ, deltaM );
@@ -155,13 +156,27 @@ QgsFeatureList QgsTranslateAlgorithm::processFeature( const QgsFeature &feature,
 QgsWkbTypes::Type QgsTranslateAlgorithm::outputWkbType( QgsWkbTypes::Type inputWkbType ) const
 {
   QgsWkbTypes::Type wkb = inputWkbType;
-  if ( mDeltaZ != 0 )
+  if ( mDeltaZ != 0.0 )
     wkb = QgsWkbTypes::addZ( wkb );
-  if ( mDeltaM != 0 )
+  if ( mDeltaM != 0.0 )
     wkb = QgsWkbTypes::addM( wkb );
   return wkb;
 }
 
+
+bool QgsTranslateAlgorithm::supportInPlaceEdit( const QgsVectorLayer *layer ) const
+{
+  if ( ! QgsProcessingFeatureBasedAlgorithm::supportInPlaceEdit( layer ) )
+    return false;
+
+  // Check if we can drop Z/M and still have some work done
+  if ( mDeltaX != 0.0 || mDeltaY != 0.0 )
+    return true;
+
+  // If the type differs there is no sense in executing the algorithm and drop the result
+  QgsWkbTypes::Type inPlaceWkbType = layer->wkbType();
+  return inPlaceWkbType == outputWkbType( inPlaceWkbType );
+}
 ///@endcond
 
 

src/analysis/processing/qgsalgorithmtranslate.h

@@ -42,6 +42,7 @@ class QgsTranslateAlgorithm : public QgsProcessingFeatureBasedAlgorithm
     QString shortHelpString() const override;
     QgsTranslateAlgorithm *createInstance() const override SIP_FACTORY;
     void initParameters( const QVariantMap &configuration = QVariantMap() ) override;
+    bool supportInPlaceEdit( const QgsVectorLayer *layer ) const override;
 
   protected:
     QString outputName() const override;