Provide a base class version of QgsFeatureSink::addFeature

Means that subclasses are only required to implement addFeatures
qgis · Apr 26, 2017 · 3dfc4cf · 3dfc4cf
1 parent dd7be73
commit 3dfc4cf
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/python/core/qgsfeaturesink.sip b/python/core/qgsfeaturesink.sip
@@ -24,7 +24,7 @@ class QgsFeatureSink
 
     virtual ~QgsFeatureSink();
 
-    virtual bool addFeature( QgsFeature &feature ) = 0;
+    virtual bool addFeature( QgsFeature &feature );
 %Docstring
  Adds a single ``feature`` to the sink.
  \see addFeatures()

diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip
@@ -197,7 +197,6 @@ class QgsVectorDataProvider : QgsDataProvider, QgsFeatureSink
      */
     virtual void enumValues( int index, QStringList& enumList /Out/ ) const;
 
-    virtual bool addFeature( QgsFeature &feature /In,Out/ );
     virtual bool addFeatures( QList<QgsFeature> &flist /In,Out/ );
 
     /**

diff --git a/src/core/qgsfeaturesink.cpp b/src/core/qgsfeaturesink.cpp
@@ -17,6 +17,17 @@
 
 #include "qgsfeaturestore.h"
 
+bool QgsFeatureSink::addFeature( QgsFeature &feature )
+{
+  QgsFeatureList features;
+  features << feature;
+  bool result = addFeatures( features );
+
+  // need to update the passed feature reference to the updated copy from the features list
+  feature = features.at( 0 );
+  return result;
+}
+
 bool QgsFeatureSink::addFeatures( QgsFeatureIterator &iterator )
 {
   QgsFeature f;

diff --git a/src/core/qgsfeaturesink.h b/src/core/qgsfeaturesink.h
@@ -41,7 +41,7 @@ class CORE_EXPORT QgsFeatureSink
      * \see addFeatures()
      * \returns true in case of success and false in case of failure
      */
-    virtual bool addFeature( QgsFeature &feature ) = 0;
+    virtual bool addFeature( QgsFeature &feature );
 
     /**
      * Adds a list of \a features to the sink.

diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
@@ -495,11 +495,6 @@ QVariant QgsVectorDataProvider::aggregate( QgsAggregateCalculator::Aggregate agg
   return QVariant();
 }
 
-bool QgsVectorDataProvider::addFeature( QgsFeature &feature )
-{
-  return addFeatures( QgsFeatureList() << feature );
-}
-
 void QgsVectorDataProvider::clearMinMaxCache()
 {
   mCacheMinMaxDirty = true;

diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -248,7 +248,6 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
      */
     virtual void enumValues( int index, QStringList &enumList ) const { Q_UNUSED( index ); enumList.clear(); }
 
-    virtual bool addFeature( QgsFeature &feature ) override;
     virtual bool addFeatures( QgsFeatureList &flist ) override;
 
     /**