[BUGFIX][SERVER] GetFeatureInfo not evaluated for maptip context when using FILTER param

rldhont · rldhont · commit b51d4efa83c0 · 2017-07-26T15:18:00.000+02:00
fixed #16670
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2363,16 +2363,15 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
       break;
     }
 
+    renderContext.expressionContext().setFeature( feature );
+
     if ( layer->wkbType() != QGis::WKBNoGeometry && ! searchRect.isEmpty() )
     {
       if ( !r2 )
       {
         continue;
       }
 
-      renderContext.expressionContext().setFeature( feature );
-
-
       //check if feature is rendered at all
       bool render = r2->willRenderFeature( feature, renderContext );
       if ( !render )

Original file line number	Diff line number	Diff line change
`@@ -2363,16 +2363,15 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,`
`2363`	`2363`	`break;`
`2364`	`2364`	`}`
`2365`	`2365`
	`2366`	`+ renderContext.expressionContext().setFeature( feature );`
	`2367`	`+`
`2366`	`2368`	`if ( layer->wkbType() != QGis::WKBNoGeometry && ! searchRect.isEmpty() )`
`2367`	`2369`	`{`
`2368`	`2370`	`if ( !r2 )`
`2369`	`2371`	`{`
`2370`	`2372`	`continue;`
`2371`	`2373`	`}`
`2372`	`2374`
`2373`		`- renderContext.expressionContext().setFeature( feature );`
`2374`		`-`
`2375`		`-`
`2376`	`2375`	`//check if feature is rendered at all`
`2377`	`2376`	`bool render = r2->willRenderFeature( feature, renderContext );`
`2378`	`2377`	`if ( !render )`