[ogr] Also discard features with empty geometries

nyalldawson · nyalldawson · commit f4d3152eea3e · 2017-11-01T21:48:20.000+11:00
when feature request specifies a filter rect OGR sometimes returns a feature with empty geometry (e.g. a multipolygon with a polygon child with no rings) even when OGR_L_SetSpatialFilterRect has been set for the layer. Refs #17365
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -266,7 +266,7 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature &feature )
     if ( !readFeature( std::move( fet ), feature ) )
       continue;
 
-    if ( !mFilterRect.isNull() && !feature.hasGeometry() )
+    if ( !mFilterRect.isNull() && ( !feature.hasGeometry() || feature.geometry().isEmpty() ) )
       continue;
 
     // we have a feature, end this cycle
