Remove QgsFeatureRequest::FilterRect from providers/iterators

m-kuhn · m-kuhn · commit 5be0ee734fa2 · 2015-07-29T12:09:44.000+02:00
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -801,7 +801,12 @@ class QgsVectorLayer : QgsMapLayer
     /** Return the extent of the layer as a QRect */
     QgsRectangle extent();
 
-    /** Returns field list in the to-be-committed state */
+    /**
+     * Returns the list of fields of this layer.
+     * This also includes fields which have not yet been saved to the provider.
+     *
+     * @return A list of fields
+     */
     const QgsFields &pendingFields() const;
 
     /** Returns list of attributes */
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2220,11 +2220,6 @@ bool QgsVectorLayer::deleteFeature( QgsFeatureId fid )
   return res;
 }
 
-const QgsFields &QgsVectorLayer::pendingFields() const
-{
-  return mUpdatedFields;
-}
-
 QgsAttributeList QgsVectorLayer::pendingAllAttributesList()
 {
   return mUpdatedFields.allAttributesList();
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1300,8 +1300,13 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Return the extent of the layer as a QRect */
     QgsRectangle extent() override;
 
-    /** Returns field list in the to-be-committed state */
-    const QgsFields &pendingFields() const;
+    /**
+     * Returns the list of fields of this layer.
+     * This also includes fields which have not yet been saved to the provider.
+     *
+     * @return A list of fields
+     */
+    const QgsFields &pendingFields() const { return mUpdatedFields; }
 
     /** Returns list of attributes */
     QgsAttributeList pendingAllAttributesList();
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -176,7 +176,7 @@ bool QgsVectorLayerFeatureIterator::fetchFeature( QgsFeature& f )
     return res;
   }
 
-  if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )
+  if ( !mRequest.filterRect().isNull() )
   {
     if ( fetchNextChangedGeomFeature( f ) )
       return true;
@@ -352,21 +352,18 @@ bool QgsVectorLayerFeatureIterator::fetchNextChangedAttributeFeature( QgsFeature
 {
   while ( mChangedFeaturesIterator.nextFeature( f ) )
   {
+    if ( mFetchConsidered.contains( f.id() ) )
+      // skip deleted features and those already handled by the geometry
+      continue;
+
     mFetchConsidered << f.id();
 
     updateChangedAttributes( f );
 
     if ( mHasVirtualAttributes )
       addVirtualAttributes( f );
 
-    if ( mRequest.filterType() == QgsFeatureRequest::FilterExpression )
-    {
-      if ( mRequest.filterExpression()->evaluate( &f ).toBool() )
-      {
-        return true;
-      }
-    }
-    else
+    if ( mRequest.filterExpression()->evaluate( &f ).toBool() )
     {
       return true;
     }
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -136,6 +136,7 @@ bool QgsVectorLayerRenderer::render()
 
   QgsRenderOptions opts = mRendererV2->startRender( mContext, mFields );
 
+  QgsDebugMsg( opts.whereClause() );
   QgsRectangle requestExtent = mContext.extent();
   mRendererV2->modifyRequestExtent( requestExtent, mContext );
 
diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
@@ -44,21 +44,8 @@ QgsDelimitedTextFeatureIterator::QgsDelimitedTextFeatureIterator( QgsDelimitedTe
   mTestGeometry = false;
 
   mMode = FileScan;
-  if ( request.filterType() == QgsFeatureRequest::FilterFid )
-  {
-    QgsDebugMsg( "Configuring for returning single id" );
-    mFeatureIds.append( request.filterFid() );
-    mMode = FeatureIds;
-    mTestSubset = false;
-  }
-  // If have geometry and testing geometry then evaluate options...
-  // If we don't have geometry then all records pass geometry filter.
-  // CC: 2013-05-09
-  // Not sure about intended relationship between filtering on geometry and
-  // requesting no geometry? Have preserved current logic of ignoring spatial filter
-  // if not requesting geometry.
 
-  else if ( request.filterType() == QgsFeatureRequest::FilterRect && hasGeometry )
+  if ( !request.filterRect().isNull() && hasGeometry )
   {
     QgsDebugMsg( "Configuring for rectangle select" );
     mTestGeometry = true;
@@ -98,13 +85,32 @@ QgsDelimitedTextFeatureIterator::QgsDelimitedTextFeatureIterator( QgsDelimitedTe
     }
   }
 
-  // If we have a subset index then use it..
-  if ( mMode == FileScan && mSource->mUseSubsetIndex )
+  if ( request.filterType() == QgsFeatureRequest::FilterFid )
   {
-    QgsDebugMsg( QString( "Layer has subset index - use %1 items from subset index" ).arg( mSource->mSubsetIndex.size() ) );
+    QgsDebugMsg( "Configuring for returning single id" );
+    if ( request.filterRect().isNull() || ( !request.filterRect().isNull() && mFeatureIds.contains( request.filterFid() ) ) )
+    {
+      mFeatureIds = QList<QgsFeatureId>() << request.filterFid();
+    }
+    mMode = FeatureIds;
     mTestSubset = false;
-    mMode = SubsetIndex;
   }
+  // If have geometry and testing geometry then evaluate options...
+  // If we don't have geometry then all records pass geometry filter.
+  // CC: 2013-05-09
+  // Not sure about intended relationship between filtering on geometry and
+  // requesting no geometry? Have preserved current logic of ignoring spatial filter
+  // if not requesting geometry.
+
+  else
+
+    // If we have a subset index then use it..
+    if ( mMode == FileScan && mSource->mUseSubsetIndex )
+    {
+      QgsDebugMsg( QString( "Layer has subset index - use %1 items from subset index" ).arg( mSource->mSubsetIndex.size() ) );
+      mTestSubset = false;
+      mMode = SubsetIndex;
+    }
 
   // Otherwise just have to scan the file
   if ( mMode == FileScan )
diff --git a/src/providers/gpx/qgsgpxfeatureiterator.cpp b/src/providers/gpx/qgsgpxfeatureiterator.cpp
@@ -176,7 +176,7 @@ bool QgsGPXFeatureIterator::readFid( QgsFeature& feature )
 
 bool QgsGPXFeatureIterator::readWaypoint( const QgsWaypoint& wpt, QgsFeature& feature )
 {
-  if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )
+  if ( !mRequest.filterRect().isNull() )
   {
     const QgsRectangle& rect = mRequest.filterRect();
     if ( ! rect.contains( QgsPoint( wpt.lon, wpt.lat ) ) )
@@ -206,7 +206,7 @@ bool QgsGPXFeatureIterator::readRoute( const QgsRoute& rte, QgsFeature& feature
 
   QgsGeometry* theGeometry = readRouteGeometry( rte );
 
-  if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )
+  if ( !mRequest.filterRect().isNull() )
   {
     const QgsRectangle& rect = mRequest.filterRect();
     if (( rte.xMax < rect.xMinimum() ) || ( rte.xMin > rect.xMaximum() ) ||
@@ -248,7 +248,7 @@ bool QgsGPXFeatureIterator::readTrack( const QgsTrack& trk, QgsFeature& feature
 
   QgsGeometry* theGeometry = readTrackGeometry( trk );
 
-  if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )
+  if ( !mRequest.filterRect().isNull() )
   {
     const QgsRectangle& rect = mRequest.filterRect();
     if (( trk.xMax < rect.xMinimum() ) || ( trk.xMin > rect.xMaximum() ) ||
diff --git a/src/providers/grass/qgsgrassfeatureiterator.cpp b/src/providers/grass/qgsgrassfeatureiterator.cpp
@@ -80,7 +80,7 @@ QgsGrassFeatureIterator::QgsGrassFeatureIterator( QgsGrassFeatureSource* source,
   allocateSelection( mSource->mMap );
   resetSelection( 1 );
 
-  if ( request.filterType() == QgsFeatureRequest::FilterRect )
+  if ( !request.filterRect().isNull() )
   {
     setSelectionRect( request.filterRect(), request.flags() & QgsFeatureRequest::ExactIntersect );
   }
diff --git a/src/providers/memory/qgsmemoryfeatureiterator.cpp b/src/providers/memory/qgsmemoryfeatureiterator.cpp
@@ -33,14 +33,14 @@ QgsMemoryFeatureIterator::QgsMemoryFeatureIterator( QgsMemoryFeatureSource* sour
     mSubsetExpression->prepare( mSource->mFields );
   }
 
-  if ( mRequest.filterType() == QgsFeatureRequest::FilterRect && mRequest.flags() & QgsFeatureRequest::ExactIntersect )
+  if ( !mRequest.filterRect().isNull() && mRequest.flags() & QgsFeatureRequest::ExactIntersect )
   {
     mSelectRectGeom = QgsGeometry::fromRect( request.filterRect() );
   }
 
   // if there's spatial index, use it!
   // (but don't use it when selection rect is not specified)
-  if ( mRequest.filterType() == QgsFeatureRequest::FilterRect && mSource->mSpatialIndex )
+  if ( !mRequest.filterRect().isNull() && mSource->mSpatialIndex )
   {
     mUsingFeatureIdList = true;
     mFeatureIdList = mSource->mSpatialIndex->intersects( mRequest.filterRect() );
@@ -90,7 +90,7 @@ bool QgsMemoryFeatureIterator::nextFeatureUsingList( QgsFeature& feature )
   // option 1: we have a list of features to traverse
   while ( mFeatureIdListIterator != mFeatureIdList.constEnd() )
   {
-    if ( mRequest.filterType() == QgsFeatureRequest::FilterRect && mRequest.flags() & QgsFeatureRequest::ExactIntersect )
+    if ( !mRequest.filterRect().isNull() && mRequest.flags() & QgsFeatureRequest::ExactIntersect )
     {
       // do exact check in case we're doing intersection
       if ( mSource->mFeatures[*mFeatureIdListIterator].geometry() && mSource->mFeatures[*mFeatureIdListIterator].geometry()->intersects( mSelectRectGeom ) )
@@ -131,7 +131,7 @@ bool QgsMemoryFeatureIterator::nextFeatureTraverseAll( QgsFeature& feature )
   // option 2: traversing the whole layer
   while ( mSelectIterator != mSource->mFeatures.constEnd() )
   {
-    if ( mRequest.filterType() != QgsFeatureRequest::FilterRect )
+    if ( mRequest.filterRect().isNull() )
     {
       // selection rect empty => using all features
       hasFeature = true;
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -89,7 +89,7 @@ void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest& request )
 
   bool filterAdded = false;
   // set spatial filter
-  if ( request.filterType() == QgsFeatureRequest::FilterRect && mSource->isSpatial() && !request.filterRect().isEmpty() )
+  if ( !request.filterRect().isNull() && mSource->isSpatial() && !request.filterRect().isEmpty() )
   {
     // polygons should be CCW for SqlGeography
     QString r;
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -58,20 +58,20 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
     mSubsetStringSet = true;
   }
 
-  mFetchGeometry = ( mRequest.filterType() == QgsFeatureRequest::FilterRect ) || !( mRequest.flags() & QgsFeatureRequest::NoGeometry );
+  mFetchGeometry = ( !mRequest.filterRect().isNull() ) || !( mRequest.flags() & QgsFeatureRequest::NoGeometry );
   QgsAttributeList attrs = ( mRequest.flags() & QgsFeatureRequest::SubsetOfAttributes ) ? mRequest.subsetOfAttributes() : mSource->mFields.allAttributesList();
 
   // make sure we fetch just relevant fields
   // unless it's a VRT data source filtered by geometry as we don't know which
   // attributes make up the geometry and OGR won't fetch them to evaluate the
   // filter if we choose to ignore them (fixes #11223)
-  if (( mSource->mDriverName != "VRT" && mSource->mDriverName != "OGR_VRT" ) || mRequest.filterType() != QgsFeatureRequest::FilterRect )
+  if (( mSource->mDriverName != "VRT" && mSource->mDriverName != "OGR_VRT" ) || mRequest.filterRect().isNull() )
   {
     QgsOgrUtils::setRelevantFields( ogrLayer, mSource->mFields.count(), mFetchGeometry, attrs );
   }
 
   // spatial query to select features
-  if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )
+  if ( !mRequest.filterRect().isNull() )
   {
     const QgsRectangle& rect = mRequest.filterRect();
 
@@ -179,7 +179,7 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature& feature )
     if ( !readFeature( fet, feature ) )
       continue;
 
-    if ( mRequest.filterType() == QgsFeatureRequest::FilterRect && !feature.constGeometry() )
+    if ( !mRequest.filterRect().isNull() && !feature.constGeometry() )
       continue;
 
     // we have a feature, end this cycle
diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp
@@ -46,45 +46,49 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
 
   QString whereClause;
 
+  if ( !mRequest.filterRect().isNull && !mSource->mGeometryColumn.isNull() && mSource->mHasSpatialIndex )
+  {
+    QgsRectangle rect( mRequest.filterRect() );
+    QString bbox = QString( "mdsys.sdo_geometry(2003,%1,NULL,"
+                            "mdsys.sdo_elem_info_array(1,1003,3),"
+                            "mdsys.sdo_ordinate_array(%2,%3,%4,%5)"
+                            ")" )
+                   .arg( mSource->mSrid < 1 ? "NULL" : QString::number( mSource->mSrid ) )
+                   .arg( qgsDoubleToString( rect.xMinimum() ) )
+                   .arg( qgsDoubleToString( rect.yMinimum() ) )
+                   .arg( qgsDoubleToString( rect.xMaximum() ) )
+                   .arg( qgsDoubleToString( rect.yMaximum() ) );
+
+    whereClause = QString( "sdo_filter(%1,%2)='TRUE'" ).arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) ).arg( bbox );
+
+    if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect && mConnection->hasSpatial() )
+    {
+      whereClause += QString( " AND sdo_relate(%1,%2,'mask=ANYINTERACT')='TRUE'" )
+                     .arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) )
+                     .arg( bbox );
+    }
+  }
+
   switch ( request.filterType() )
   {
-    case QgsFeatureRequest::FilterExpression:
+    case QgsFeatureRequest::FilterFid:
+      QString fidWhereClause = QgsOracleUtils::whereClause( request.filterFid(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared );
+      whereClause = QgsPostgresUtils::andWhereClauses( whereClause, fidWhereClause );
       break;
 
-    case QgsFeatureRequest::FilterRect:
-      if ( !mSource->mGeometryColumn.isNull() && mSource->mHasSpatialIndex )
-      {
-        QgsRectangle rect( mRequest.filterRect() );
-        QString bbox = QString( "mdsys.sdo_geometry(2003,%1,NULL,"
-                                "mdsys.sdo_elem_info_array(1,1003,3),"
-                                "mdsys.sdo_ordinate_array(%2,%3,%4,%5)"
-                                ")" )
-                       .arg( mSource->mSrid < 1 ? "NULL" : QString::number( mSource->mSrid ) )
-                       .arg( qgsDoubleToString( rect.xMinimum() ) )
-                       .arg( qgsDoubleToString( rect.yMinimum() ) )
-                       .arg( qgsDoubleToString( rect.xMaximum() ) )
-                       .arg( qgsDoubleToString( rect.yMaximum() ) );
-
-        whereClause = QString( "sdo_filter(%1,%2)='TRUE'" ).arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) ).arg( bbox );
-
-        if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect && mConnection->hasSpatial() )
-        {
-          whereClause += QString( " AND sdo_relate(%1,%2,'mask=ANYINTERACT')='TRUE'" )
-                         .arg( QgsOracleProvider::quotedIdentifier( mSource->mGeometryColumn ) )
-                         .arg( bbox );
-        }
-      }
+    case QgsFeatureRequest::FilterFids:
+      QString fidsWhereClause = QgsOracleUtils::whereClause( request.filterFids(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared );
+      whereClause = QgsPostgresUtils::andWhereClauses( whereClause, fidsWhereClause );
       break;
 
-    case QgsFeatureRequest::FilterFid:
-      whereClause = QgsOracleUtils::whereClause( request.filterFid(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared );
+    case QgsFeatureRequest::FilterNone:
       break;
 
-    case QgsFeatureRequest::FilterFids:
-      whereClause = QgsOracleUtils::whereClause( request.filterFids(), mSource->mFields, mSource->mPrimaryKeyType, mSource->mPrimaryKeyAttrs, mSource->mShared );
+    case QgsFeatureRequest::FilterExpression:
       break;
 
-    case QgsFeatureRequest::FilterNone:
+    case QgsFeatureRequest::FilterRect:
+      // Handled in the if-statement above
       break;
   }
 
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -464,6 +464,15 @@ QString QgsOracleUtils::whereClause( QgsFeatureIds featureIds, const QgsFields &
   return whereClauses.isEmpty() ? "" : whereClauses.join( " OR " ).prepend( "(" ).append( ")" );
 }
 
+QString QgsOracleUtils::andWhereClauses( const QString& c1, const QString& c2 )
+{
+  if ( c1.isNull() )
+    return c2;
+  if ( c2.isNull() )
+    return c1;
+
+  return QString( "(%1) AND (%2)" ).arg( c1 ).arg( c2 );
+}
 
 QString QgsOracleProvider::whereClause( QgsFeatureId featureId ) const
 {
diff --git a/src/providers/oracle/qgsoracleprovider.h b/src/providers/oracle/qgsoracleprovider.h
@@ -423,6 +423,8 @@ class QgsOracleUtils
                                 QgsOraclePrimaryKeyType primaryKeyType,
                                 const QList<int>& primaryKeyAttrs,
                                 QSharedPointer<QgsOracleSharedData> sharedData );
+
+    static QString andWhereClauses( const QString& c1, const QString& c2 );
 };
 
 
diff --git a/src/providers/postgres/qgspostgresexpressioncompiler.cpp b/src/providers/postgres/qgspostgresexpressioncompiler.cpp
@@ -184,9 +184,32 @@ QgsPostgresExpressionCompiler::Result QgsPostgresExpressionCompiler::compile( co
       return Complete;
     }
 
+    case QgsExpression::ntInOperator:
+    {
+      const QgsExpression::NodeInOperator* n = static_cast<const QgsExpression::NodeInOperator*>( node );
+      QStringList list;
+
+      Q_FOREACH ( const QgsExpression::Node* ln, n->list()->list() )
+      {
+        QString s;
+        Result r = compile( ln, s );
+        if ( r == Complete )
+          list << s;
+        else
+          return r;
+      }
+
+      QString nd;
+      Result rn = compile( n->node(), nd );
+      if ( rn != Complete )
+        return rn;
+
+      result = QString( "%1 %2IN(%3)" ).arg( nd ).arg( n->isNotIn() ? "NOT " : "" ).arg( list.join( "," ) );
+      return Complete;
+    }
+
     case QgsExpression::ntFunction:
     case QgsExpression::ntCondition:
-    case QgsExpression::ntInOperator:
       break;
   }
 
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp
diff --git a/tests/src/python/providertestbase.py b/tests/src/python/providertestbase.py

Original file line number	Diff line number	Diff line change
`@@ -2220,11 +2220,6 @@ bool QgsVectorLayer::deleteFeature( QgsFeatureId fid )`
`2220`	`2220`	`return res;`
`2221`	`2221`	`}`
`2222`	`2222`
`2223`		`-const QgsFields &QgsVectorLayer::pendingFields() const`
`2224`		`-{`
`2225`		`- return mUpdatedFields;`
`2226`		`-}`
`2227`		`-`
`2228`	`2223`	`QgsAttributeList QgsVectorLayer::pendingAllAttributesList()`
`2229`	`2224`	`{`
`2230`	`2225`	`return mUpdatedFields.allAttributesList();`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ bool QgsVectorLayerFeatureIterator::fetchFeature( QgsFeature& f )`
`176`	`176`	`return res;`
`177`	`177`	`}`
`178`	`178`
`179`		`- if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )`
	`179`	`+ if ( !mRequest.filterRect().isNull() )`
`180`	`180`	`{`
`181`	`181`	`if ( fetchNextChangedGeomFeature( f ) )`
`182`	`182`	`return true;`
`@@ -352,21 +352,18 @@ bool QgsVectorLayerFeatureIterator::fetchNextChangedAttributeFeature( QgsFeature`
`352`	`352`	`{`
`353`	`353`	`while ( mChangedFeaturesIterator.nextFeature( f ) )`
`354`	`354`	`{`
	`355`	`+ if ( mFetchConsidered.contains( f.id() ) )`
	`356`	`+ // skip deleted features and those already handled by the geometry`
	`357`	`+ continue;`
	`358`	`+`
`355`	`359`	`mFetchConsidered << f.id();`
`356`	`360`
`357`	`361`	`updateChangedAttributes( f );`
`358`	`362`
`359`	`363`	`if ( mHasVirtualAttributes )`
`360`	`364`	`addVirtualAttributes( f );`
`361`	`365`
`362`		`- if ( mRequest.filterType() == QgsFeatureRequest::FilterExpression )`
`363`		`- {`
`364`		`- if ( mRequest.filterExpression()->evaluate( &f ).toBool() )`
`365`		`- {`
`366`		`- return true;`
`367`		`- }`
`368`		`- }`
`369`		`- else`
	`366`	`+ if ( mRequest.filterExpression()->evaluate( &f ).toBool() )`
`370`	`367`	`{`
`371`	`368`	`return true;`
`372`	`369`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ bool QgsGPXFeatureIterator::readFid( QgsFeature& feature )`
`176`	`176`
`177`	`177`	`bool QgsGPXFeatureIterator::readWaypoint( const QgsWaypoint& wpt, QgsFeature& feature )`
`178`	`178`	`{`
`179`		`- if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )`
	`179`	`+ if ( !mRequest.filterRect().isNull() )`
`180`	`180`	`{`
`181`	`181`	`const QgsRectangle& rect = mRequest.filterRect();`
`182`	`182`	`if ( ! rect.contains( QgsPoint( wpt.lon, wpt.lat ) ) )`
`@@ -206,7 +206,7 @@ bool QgsGPXFeatureIterator::readRoute( const QgsRoute& rte, QgsFeature& feature`
`206`	`206`
`207`	`207`	`QgsGeometry* theGeometry = readRouteGeometry( rte );`
`208`	`208`
`209`		`- if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )`
	`209`	`+ if ( !mRequest.filterRect().isNull() )`
`210`	`210`	`{`
`211`	`211`	`const QgsRectangle& rect = mRequest.filterRect();`
`212`	`212`	`if (( rte.xMax < rect.xMinimum() ) \|\| ( rte.xMin > rect.xMaximum() ) \|\|`
`@@ -248,7 +248,7 @@ bool QgsGPXFeatureIterator::readTrack( const QgsTrack& trk, QgsFeature& feature`
`248`	`248`
`249`	`249`	`QgsGeometry* theGeometry = readTrackGeometry( trk );`
`250`	`250`
`251`		`- if ( mRequest.filterType() == QgsFeatureRequest::FilterRect )`
	`251`	`+ if ( !mRequest.filterRect().isNull() )`
`252`	`252`	`{`
`253`	`253`	`const QgsRectangle& rect = mRequest.filterRect();`
`254`	`254`	`if (( trk.xMax < rect.xMinimum() ) \|\| ( trk.xMin > rect.xMaximum() ) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ QgsGrassFeatureIterator::QgsGrassFeatureIterator( QgsGrassFeatureSource* source,`
`80`	`80`	`allocateSelection( mSource->mMap );`
`81`	`81`	`resetSelection( 1 );`
`82`	`82`
`83`		`- if ( request.filterType() == QgsFeatureRequest::FilterRect )`
	`83`	`+ if ( !request.filterRect().isNull() )`
`84`	`84`	`{`
`85`	`85`	`setSelectionRect( request.filterRect(), request.flags() & QgsFeatureRequest::ExactIntersect );`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,14 @@ QgsMemoryFeatureIterator::QgsMemoryFeatureIterator( QgsMemoryFeatureSource* sour`
`33`	`33`	`mSubsetExpression->prepare( mSource->mFields );`
`34`	`34`	`}`
`35`	`35`
`36`		`- if ( mRequest.filterType() == QgsFeatureRequest::FilterRect && mRequest.flags() & QgsFeatureRequest::ExactIntersect )`
	`36`	`+ if ( !mRequest.filterRect().isNull() && mRequest.flags() & QgsFeatureRequest::ExactIntersect )`
`37`	`37`	`{`
`38`	`38`	`mSelectRectGeom = QgsGeometry::fromRect( request.filterRect() );`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`// if there's spatial index, use it!`
`42`	`42`	`// (but don't use it when selection rect is not specified)`
`43`		`- if ( mRequest.filterType() == QgsFeatureRequest::FilterRect && mSource->mSpatialIndex )`
	`43`	`+ if ( !mRequest.filterRect().isNull() && mSource->mSpatialIndex )`
`44`	`44`	`{`
`45`	`45`	`mUsingFeatureIdList = true;`
`46`	`46`	`mFeatureIdList = mSource->mSpatialIndex->intersects( mRequest.filterRect() );`
`@@ -90,7 +90,7 @@ bool QgsMemoryFeatureIterator::nextFeatureUsingList( QgsFeature& feature )`
`90`	`90`	`// option 1: we have a list of features to traverse`
`91`	`91`	`while ( mFeatureIdListIterator != mFeatureIdList.constEnd() )`
`92`	`92`	`{`
`93`		`- if ( mRequest.filterType() == QgsFeatureRequest::FilterRect && mRequest.flags() & QgsFeatureRequest::ExactIntersect )`
	`93`	`+ if ( !mRequest.filterRect().isNull() && mRequest.flags() & QgsFeatureRequest::ExactIntersect )`
`94`	`94`	`{`
`95`	`95`	`// do exact check in case we're doing intersection`
`96`	`96`	`if ( mSource->mFeatures[mFeatureIdListIterator].geometry() && mSource->mFeatures[mFeatureIdListIterator].geometry()->intersects( mSelectRectGeom ) )`
`@@ -131,7 +131,7 @@ bool QgsMemoryFeatureIterator::nextFeatureTraverseAll( QgsFeature& feature )`
`131`	`131`	`// option 2: traversing the whole layer`
`132`	`132`	`while ( mSelectIterator != mSource->mFeatures.constEnd() )`
`133`	`133`	`{`
`134`		`- if ( mRequest.filterType() != QgsFeatureRequest::FilterRect )`
	`134`	`+ if ( mRequest.filterRect().isNull() )`
`135`	`135`	`{`
`136`	`136`	`// selection rect empty => using all features`
`137`	`137`	`hasFeature = true;`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest& request )`
`89`	`89`
`90`	`90`	`bool filterAdded = false;`
`91`	`91`	`// set spatial filter`
`92`		`- if ( request.filterType() == QgsFeatureRequest::FilterRect && mSource->isSpatial() && !request.filterRect().isEmpty() )`
	`92`	`+ if ( !request.filterRect().isNull() && mSource->isSpatial() && !request.filterRect().isEmpty() )`
`93`	`93`	`{`
`94`	`94`	`// polygons should be CCW for SqlGeography`
`95`	`95`	`QString r;`