Skip to content
Permalink
Browse files

Fix GeometryCollect aggregate detection of geometry result type when …

…running from external python applications
  • Loading branch information
nyalldawson committed Feb 5, 2021
1 parent 364f960 commit 45ad2f1de31c6708fecffe78cc2c1ca763e03997
Showing with 22 additions and 14 deletions.
  1. +22 −14 src/core/qgsaggregatecalculator.cpp
@@ -102,23 +102,31 @@ QVariant QgsAggregateCalculator::calculate( QgsAggregateCalculator::Aggregate ag
QVariant::Type resultType = QVariant::Double;
if ( attrNum == -1 )
{
// evaluate first feature, check result type
QgsFeatureRequest testRequest( request );
testRequest.setLimit( 1 );
QgsFeature f;
QgsFeatureIterator fit = mLayer->getFeatures( testRequest );
if ( !fit.nextFeature( f ) )
if ( aggregate == GeometryCollect )
{
//no matching features
if ( ok )
*ok = true;
return defaultValue( aggregate );
// in this case we know the result should be a geometry value, so no need to sniff it out...
resultType = QVariant::UserType;
}
else
{
// evaluate first feature, check result type
QgsFeatureRequest testRequest( request );
testRequest.setLimit( 1 );
QgsFeature f;
QgsFeatureIterator fit = mLayer->getFeatures( testRequest );
if ( !fit.nextFeature( f ) )
{
//no matching features
if ( ok )
*ok = true;
return defaultValue( aggregate );
}

if ( context )
context->setFeature( f );
QVariant v = expression->evaluate( context );
resultType = v.type();
if ( context )
context->setFeature( f );
QVariant v = expression->evaluate( context );
resultType = v.type();
}
}
else
resultType = mLayer->fields().at( attrNum ).type();

0 comments on commit 45ad2f1

Please sign in to comment.