Skip to content
Permalink
Browse files
spelling
  • Loading branch information
elpaso committed Jan 6, 2022
1 parent fb7b3e0 commit 055a02c0697ba05dac4736708f2347efd54c7433
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/core/expression/qgsexpressionfunction.cpp
@@ -6653,7 +6653,7 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
// Ninth parameter (for intersects only) is the sort_by_intersection_size flag
double minOverlap { -1 };
double minInscribedCircleRadius { -1 };
bool returnDetails = false;
bool returnDetails = false; //#spellok
bool sortByMeasure = false;
bool sortAscending = false;
bool requireMeasures = false;
@@ -6680,13 +6680,13 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
#endif
node = QgsExpressionUtils::getNode( values.at( 7 ), parent );
// Return measures is only effective when an expression is set
returnDetails = !testOnly && node->eval( parent, context ).toBool();
returnDetails = !testOnly && node->eval( parent, context ).toBool(); //#spellok
node = QgsExpressionUtils::getNode( values.at( 8 ), parent );
// Sort by measures is only effective when an expression is set
const QString sorting { node->eval( parent, context ).toString().toLower() };
sortByMeasure = !testOnly && ( sorting.startsWith( "asc" ) || sorting.startsWith( "des" ) );
sortAscending = sorting.startsWith( "asc" );
requireMeasures = sortByMeasure || returnDetails;
requireMeasures = sortByMeasure || returnDetails; //#spellok
overlapOrRadiusFilter = minInscribedCircleRadius != -1 || minOverlap != -1;
}

@@ -7042,7 +7042,7 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
results.erase( results.begin() + limit );
}

if ( ! returnDetails )
if ( ! returnDetails ) //#spellok
{
QVariantList expResults;
for ( auto it = results.constBegin(); it != results.constEnd(); ++it )

0 comments on commit 055a02c

Please sign in to comment.