Regenerate fids for "multipart to singlepart algorithm"

m-kuhn · m-kuhn · commit d72e4342828b · 2018-10-31T13:48:39.000+01:00
diff --git a/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in b/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in
@@ -922,6 +922,13 @@ this is possible to determine in advance.
     virtual QgsProcessingFeatureSource::Flag sourceFlags() const;
 %Docstring
 Returns the processing feature source flags to be used in the algorithm.
+%End
+
+    virtual QgsProcessingFeatureSink::SinkFlags sinkFlags() const;
+%Docstring
+Returns the feature sink flags to be used for the output.
+
+.. versionadded:: 3.4.1
 %End
 
     virtual QgsWkbTypes::Type outputWkbType( QgsWkbTypes::Type inputWkbType ) const;
diff --git a/src/analysis/processing/qgsalgorithmmultiparttosinglepart.cpp b/src/analysis/processing/qgsalgorithmmultiparttosinglepart.cpp
@@ -74,6 +74,11 @@ QgsProcessingFeatureSource::Flag QgsMultipartToSinglepartAlgorithm::sourceFlags(
   return QgsProcessingFeatureSource::FlagSkipGeometryValidityChecks;
 }
 
+QgsFeatureSink::SinkFlags QgsMultipartToSinglepartAlgorithm::sinkFlags() const
+{
+  return QgsFeatureSink::RegeneratePrimaryKey;
+}
+
 QgsFeatureList QgsMultipartToSinglepartAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )
 {
   if ( !feature.hasGeometry() )
diff --git a/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h b/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h
@@ -49,6 +49,7 @@ class QgsMultipartToSinglepartAlgorithm : public QgsProcessingFeatureBasedAlgori
   protected:
 
     QgsProcessingFeatureSource::Flag sourceFlags() const override;
+    QgsFeatureSink::SinkFlags sinkFlags() const override;
     QgsFeatureList processFeature( const QgsFeature &feature,
                                    QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override;
 
diff --git a/src/core/processing/qgsprocessingalgorithm.cpp b/src/core/processing/qgsprocessingalgorithm.cpp
@@ -824,6 +824,11 @@ QgsProcessingFeatureSource::Flag QgsProcessingFeatureBasedAlgorithm::sourceFlags
   return static_cast<QgsProcessingFeatureSource::Flag>( 0 );
 }
 
+QgsFeatureSink::SinkFlags QgsProcessingFeatureBasedAlgorithm::sinkFlags() const
+{
+  return nullptr;
+}
+
 QgsWkbTypes::Type QgsProcessingFeatureBasedAlgorithm::outputWkbType( QgsWkbTypes::Type inputWkbType ) const
 {
   return inputWkbType;
@@ -858,7 +863,8 @@ QVariantMap QgsProcessingFeatureBasedAlgorithm::processAlgorithm( const QVariant
   std::unique_ptr< QgsFeatureSink > sink( parameterAsSink( parameters, QStringLiteral( "OUTPUT" ), context, dest,
                                           outputFields( mSource->fields() ),
                                           outputWkbType( mSource->wkbType() ),
-                                          outputCrs( mSource->sourceCrs() ) ) );
+                                          outputCrs( mSource->sourceCrs() ),
+                                          sinkFlags() ) );
   if ( !sink )
     throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "OUTPUT" ) ) );
 
diff --git a/src/core/processing/qgsprocessingalgorithm.h b/src/core/processing/qgsprocessingalgorithm.h
@@ -929,6 +929,13 @@ class CORE_EXPORT QgsProcessingFeatureBasedAlgorithm : public QgsProcessingAlgor
      */
     virtual QgsProcessingFeatureSource::Flag sourceFlags() const;
 
+    /**
+     * Returns the feature sink flags to be used for the output.
+     *
+     * \since QGIS 3.4.1
+     */
+    virtual QgsProcessingFeatureSink::SinkFlags sinkFlags() const;
+
     /**
      * Maps the input WKB geometry type (\a inputWkbType) to the corresponding
      * output WKB type generated by the algorithm. The default behavior is that the algorithm maintains

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,11 @@ QgsProcessingFeatureSource::Flag QgsMultipartToSinglepartAlgorithm::sourceFlags(`
`74`	`74`	`return QgsProcessingFeatureSource::FlagSkipGeometryValidityChecks;`
`75`	`75`	`}`
`76`	`76`
	`77`	`+QgsFeatureSink::SinkFlags QgsMultipartToSinglepartAlgorithm::sinkFlags() const`
	`78`	`+{`
	`79`	`+ return QgsFeatureSink::RegeneratePrimaryKey;`
	`80`	`+}`
	`81`	`+`
`77`	`82`	`QgsFeatureList QgsMultipartToSinglepartAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &, QgsProcessingFeedback * )`
`78`	`83`	`{`
`79`	`84`	`if ( !feature.hasGeometry() )`