sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-13 00:07:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix GeometryCollect aggregate detection of geometry result type when running from external python applications

Browse Source
This commit is contained in:
Nyall Dawson 2021-02-04 17:04:18 +10:00
parent b0994a5574
commit 23ed6e9cd0
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/qgsaggregatecalculator.cpp
View File

@ -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();