Move allFeatureIds from QgsVectorLayer to QgsFeatureSource

nyalldawson · nyalldawson · commit f799d3afc8ef · 2017-09-08T20:09:29.000+10:00
diff --git a/python/core/qgsfeaturesource.sip b/python/core/qgsfeaturesource.sip
@@ -114,6 +114,12 @@ class QgsFeatureSource
  :rtype: QgsRectangle
 %End
 
+    virtual QgsFeatureIds allFeatureIds() const;
+%Docstring
+ Returns a list of all feature IDs for features present in the source.
+ :rtype: QgsFeatureIds
+%End
+
 };
 
 
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -576,12 +576,6 @@ Select not selected features and deselect selected ones
 Select all the features
 %End
 
-    QgsFeatureIds allFeatureIds() const;
-%Docstring
-Get all feature Ids
- :rtype: QgsFeatureIds
-%End
-
     void invertSelectionInRectangle( QgsRectangle &rect );
 %Docstring
  Invert selection of features found within the search rectangle (in layer's coordinates)
diff --git a/src/core/qgsfeaturesource.cpp b/src/core/qgsfeaturesource.cpp
@@ -103,3 +103,20 @@ QgsRectangle QgsFeatureSource::sourceExtent() const
   return r;
 }
 
+QgsFeatureIds QgsFeatureSource::allFeatureIds() const
+{
+  QgsFeatureIterator fit = getFeatures( QgsFeatureRequest()
+                                        .setFlags( QgsFeatureRequest::NoGeometry )
+                                        .setSubsetOfAttributes( QgsAttributeList() ) );
+
+  QgsFeatureIds ids;
+
+  QgsFeature fet;
+  while ( fit.nextFeature( fet ) )
+  {
+    ids << fet.id();
+  }
+
+  return ids;
+}
+
diff --git a/src/core/qgsfeaturesource.h b/src/core/qgsfeaturesource.h
@@ -117,6 +117,11 @@ class CORE_EXPORT QgsFeatureSource
      */
     virtual QgsRectangle sourceExtent() const;
 
+    /**
+     * Returns a list of all feature IDs for features present in the source.
+     */
+    virtual QgsFeatureIds allFeatureIds() const;
+
 };
 
 Q_DECLARE_METATYPE( QgsFeatureSource * )
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -516,23 +516,6 @@ void QgsVectorLayer::selectAll()
   selectByIds( allFeatureIds() );
 }
 
-QgsFeatureIds QgsVectorLayer::allFeatureIds() const
-{
-  QgsFeatureIterator fit = getFeatures( QgsFeatureRequest()
-                                        .setFlags( QgsFeatureRequest::NoGeometry )
-                                        .setSubsetOfAttributes( QgsAttributeList() ) );
-
-  QgsFeatureIds ids;
-
-  QgsFeature fet;
-  while ( fit.nextFeature( fet ) )
-  {
-    ids << fet.id();
-  }
-
-  return ids;
-}
-
 void QgsVectorLayer::invertSelectionInRectangle( QgsRectangle &rect )
 {
   // normalize the rectangle
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -608,9 +608,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
     //! Select all the features
     void selectAll();
 
-    //! Get all feature Ids
-    QgsFeatureIds allFeatureIds() const;
-
     /**
      * Invert selection of features found within the search rectangle (in layer's coordinates)
      *
diff --git a/tests/src/python/featuresourcetestbase.py b/tests/src/python/featuresourcetestbase.py
@@ -647,3 +647,7 @@ def testMinimumValue(self):
     def testMaximumValue(self):
         self.assertEqual(self.source.maximumValue(1), 400)
         self.assertEqual(self.source.maximumValue(2), 'Pear')
+
+    def testAllFeatureIds(self):
+        ids = set([f.id() for f in self.source.getFeatures()])
+        self.assertEqual(set(self.source.allFeatureIds()),ids)

Original file line number	Diff line number	Diff line change
`@@ -608,9 +608,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte`
`608`	`608`	`//! Select all the features`
`609`	`609`	`void selectAll();`
`610`	`610`
`611`		`- //! Get all feature Ids`
`612`		`- QgsFeatureIds allFeatureIds() const;`
`613`		`-`
`614`	`611`	`/**`
`615`	`612`	`* Invert selection of features found within the search rectangle (in layer's coordinates)`
`616`	`613`	`*`