Distance within for virtual provider

qgis · Aug 5, 2021 · 12de6e8 · 12de6e8
1 parent 2cab3bb
commit 12de6e8
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 14 deletions.
diff --git a/src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp b/src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp
@@ -58,6 +58,23 @@ QgsVirtualLayerFeatureIterator::QgsVirtualLayerFeatureIterator( QgsVirtualLayerF
     return;
   }
 
+  // prepare spatial filter geometries for optimal speed
+  switch ( mRequest.spatialFilterType() )
+  {
+    case Qgis::SpatialFilterType::NoFilter:
+    case Qgis::SpatialFilterType::BoundingBox:
+      break;
+
+    case Qgis::SpatialFilterType::DistanceWithin:
+      if ( !mRequest.referenceGeometry().isEmpty() )
+      {
+        mDistanceWithinGeom = mRequest.referenceGeometry();
+        mDistanceWithinEngine.reset( QgsGeometry::createGeometryEngine( mDistanceWithinGeom.constGet() ) );
+        mDistanceWithinEngine->prepareGeometry();
+      }
+      break;
+  }
+
   try
   {
     QString tableName = mSource->mTableName;
@@ -118,8 +135,8 @@ QgsVirtualLayerFeatureIterator::QgsVirtualLayerFeatureIterator( QgsVirtualLayerF
         else // never return a feature if the id is negative
           offset = QStringLiteral( " LIMIT 0" );
       }
-      if ( !mFilterRect.isNull() &&
-           mRequest.flags() & QgsFeatureRequest::ExactIntersect )
+      if ( !mFilterRect.isNull() && mRequest.spatialFilterType() == Qgis::SpatialFilterType::BoundingBox
+           && mRequest.flags() & QgsFeatureRequest::ExactIntersect )
       {
         // if an exact intersection is requested, prepare the geometry to intersect
         QgsGeometry rectGeom = QgsGeometry::fromRect( mFilterRect );
@@ -264,14 +281,14 @@ bool QgsVirtualLayerFeatureIterator::fetchFeature( QgsFeature &feature )
     return false;
   }
 
-
   bool skipFeature = false;
   do
   {
     if ( mQuery->step() != SQLITE_ROW )
     {
       return false;
     }
+    skipFeature = false;
 
     feature.setFields( mSource->mFields, /* init */ true );
 
@@ -305,7 +322,7 @@ bool QgsVirtualLayerFeatureIterator::fetchFeature( QgsFeature &feature )
         default:
           feature.setAttribute( idx, mQuery->columnText( i + 1 ) );
           break;
-      };
+      }
       i++;
     }
     if ( n > mAttributes.size() + 1 )
@@ -327,19 +344,28 @@ bool QgsVirtualLayerFeatureIterator::fetchFeature( QgsFeature &feature )
 
     // if the FilterRect has not been applied on the query
     // apply it here by skipping features until they intersect
-    if ( mSource->mDefinition.uid().isNull() && feature.hasGeometry() && mSource->mDefinition.hasDefinedGeometry() && !mFilterRect.isNull() )
+    if ( mSource->mDefinition.uid().isNull() && feature.hasGeometry() && mSource->mDefinition.hasDefinedGeometry() )
     {
-      if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect )
+      if ( !mFilterRect.isNull() )
       {
-        // using exact test when checking for intersection
-        skipFeature = !mRectEngine->intersects( feature.geometry().constGet() );
-      }
-      else
-      {
-        // check just bounding box against rect when not using intersection
-        skipFeature = !feature.geometry().boundingBox().intersects( mFilterRect );
+        if ( mRequest.spatialFilterType() == Qgis::SpatialFilterType::BoundingBox && mRequest.flags() & QgsFeatureRequest::ExactIntersect )
+        {
+          // using exact test when checking for intersection
+          skipFeature = !mRectEngine->intersects( feature.geometry().constGet() );
+        }
+        else
+        {
+          // check just bounding box against rect when not using intersection
+          skipFeature = !feature.geometry().boundingBox().intersects( mFilterRect );
+        }
       }
     }
+
+    if ( !skipFeature && mDistanceWithinEngine )
+    {
+      if ( mDistanceWithinEngine->distance( feature.geometry().constGet() ) > mRequest.distanceWithin() )
+        skipFeature = true;
+    }
   }
   while ( skipFeature );
 

diff --git a/src/providers/virtual/qgsvirtuallayerfeatureiterator.h b/src/providers/virtual/qgsvirtuallayerfeatureiterator.h
@@ -74,7 +74,8 @@ class QgsVirtualLayerFeatureIterator final: public QgsAbstractFeatureIteratorFro
     QgsFeatureId mFid = 0;
     QgsCoordinateTransform mTransform;
     QgsRectangle mFilterRect;
-
+    QgsGeometry mDistanceWithinGeom;
+    std::unique_ptr< QgsGeometryEngine > mDistanceWithinEngine;
     std::unique_ptr< QgsGeometryEngine > mRectEngine;
 };