[Geometry Checker] Don't add geometry-less features to feature-pool

qgis · Dec 6, 2016 · 97eb0f742f6501b981407a17b2e2293cabbad1c9 · 97eb0f7
1 parent adff069
commit 97eb0f742f6501b981407a17b2e2293cabbad1c9
Showing with 12 additions and 1 deletion.

+12 −1 src/plugins/geometry_checker/utils/qgsfeaturepool.cpp
diff --git a/src/plugins/geometry_checker/utils/qgsfeaturepool.cpp b/src/plugins/geometry_checker/utils/qgsfeaturepool.cpp
@@ -44,7 +44,18 @@ QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer, bool selectedOnly )
   QgsFeature feature;
   QgsFeatureRequest req;
   req.setSubsetOfAttributes( QgsAttributeList() );
-  mIndex = QgsSpatialIndex( layer->getFeatures( req ) );
+  QgsFeatureIterator it = layer->getFeatures( req );
+  while ( it.nextFeature( feature ) )
+  {
+    if ( feature.geometry() )
+    {
+      mIndex.insertFeature( feature );
+    }
+    else
+    {
+      mFeatureIds.remove( feature.id() );
+    }
+  }
 }
 
 bool QgsFeaturePool::get( QgsFeatureId id , QgsFeature& feature )