Create proper expression context

m-kuhn · m-kuhn · commit 0204e446f908 · 2018-04-09T13:10:47.000+02:00
diff --git a/src/analysis/processing/qgsalgorithmfilter.cpp b/src/analysis/processing/qgsalgorithmfilter.cpp
@@ -84,11 +84,11 @@ void QgsFilterAlgorithm::initAlgorithm( const QVariantMap &configuration )
 
 QVariantMap QgsFilterAlgorithm::processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
 {
-  std::unique_ptr< QgsFeatureSource > source( parameterAsSource( parameters, QStringLiteral( "INPUT" ), context ) );
+  std::unique_ptr< QgsProcessingFeatureSource > source( parameterAsSource( parameters, QStringLiteral( "INPUT" ), context ) );
   if ( !source )
     return QVariantMap();
 
-  QgsExpressionContext expressionContext = context.expressionContext();
+  QgsExpressionContext expressionContext = createExpressionContext( parameters, context, source.get() );
   for ( Output *output : qgis::as_const( mOutputs ) )
   {
     output->sink.reset( parameterAsSink( parameters, output->name, context, output->destinationIdentifier, source->fields(), source->wkbType(), source->sourceCrs() ) );

Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,11 @@ void QgsFilterAlgorithm::initAlgorithm( const QVariantMap &configuration )`
`84`	`84`
`85`	`85`	`QVariantMap QgsFilterAlgorithm::processAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )`
`86`	`86`	`{`
`87`		`- std::unique_ptr< QgsFeatureSource > source( parameterAsSource( parameters, QStringLiteral( "INPUT" ), context ) );`
	`87`	`+ std::unique_ptr< QgsProcessingFeatureSource > source( parameterAsSource( parameters, QStringLiteral( "INPUT" ), context ) );`
`88`	`88`	`if ( !source )`
`89`	`89`	`return QVariantMap();`
`90`	`90`
`91`		`- QgsExpressionContext expressionContext = context.expressionContext();`
	`91`	`+ QgsExpressionContext expressionContext = createExpressionContext( parameters, context, source.get() );`
`92`	`92`	`for ( Output *output : qgis::as_const( mOutputs ) )`
`93`	`93`	`{`
`94`	`94`	`output->sink.reset( parameterAsSink( parameters, output->name, context, output->destinationIdentifier, source->fields(), source->wkbType(), source->sourceCrs() ) );`