[BUGFIX] GetFeatureInfo STYLES and FILTER used together

rldhont · rldhont · commit 263d89c33423 · 2015-05-21T13:56:42.000+02:00
In GetFeatureInfo WMS Request, if STYLES and FILTER are used together, it's
 like FILTER is not applied.

To fix it, we check in the QgsMapLayerRegistry if the layers associated to
 QUERY_LAYERS has already created.
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -1497,6 +1497,11 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
       {
         continue;
       }
+      QgsMapLayer * registeredMapLayer = QgsMapLayerRegistry::instance()->mapLayer( currentLayer->id() );
+      if ( registeredMapLayer )
+      {
+        currentLayer = registeredMapLayer;
+      }
 
       //skip layer if not visible at current map scale
       bool useScaleConstraint = ( scaleDenominator > 0 && currentLayer->hasScaleBasedVisibility() );

Original file line number	Diff line number	Diff line change
`@@ -1497,6 +1497,11 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )`
`1497`	`1497`	`{`
`1498`	`1498`	`continue;`
`1499`	`1499`	`}`
	`1500`	`+ QgsMapLayer * registeredMapLayer = QgsMapLayerRegistry::instance()->mapLayer( currentLayer->id() );`
	`1501`	`+ if ( registeredMapLayer )`
	`1502`	`+ {`
	`1503`	`+ currentLayer = registeredMapLayer;`
	`1504`	`+ }`
`1500`	`1505`
`1501`	`1506`	`//skip layer if not visible at current map scale`
`1502`	`1507`	`bool useScaleConstraint = ( scaleDenominator > 0 && currentLayer->hasScaleBasedVisibility() );`