Permalink
Browse files

Cascaded WMS: do not issue a useless GetLegendGraphic to the cascaded…

… server when doing a GetFeatureInfo request
  • Loading branch information...
rouault committed Apr 24, 2018
1 parent 563b175 commit 2b9d02203e38ecaad1214ef463ea501749824432
Showing with 6 additions and 5 deletions.
  1. +6 −5 mapwmslayer.c
View
@@ -1452,15 +1452,16 @@ int msWMSLayerExecuteRequest(mapObj *map, int nOWSLayers, int nClickX, int nClic
/* Generate the http request */
for (i=0; i<map->numlayers; i++) {
if (GET_LAYER(map,map->layerorder[i])->status == MS_ON) {
if (type == WMS_GETFEATUREINFO &&
msPrepareWMSLayerRequest(map->layerorder[i], map, GET_LAYER(map,map->layerorder[i]),
if (type == WMS_GETFEATUREINFO ) {
if( msPrepareWMSLayerRequest(map->layerorder[i], map, GET_LAYER(map,map->layerorder[i]),
WMS_GETFEATUREINFO,
MS_WMS, &sLastWMSParams,
nClickX, nClickY, nFeatureCount, pszInfoFormat,
pasReqInfo, &numReq) == MS_FAILURE) {
msFreeWmsParamsObj(&sLastWMSParams);
msFree(pasReqInfo);
return MS_FAILURE;
msFreeWmsParamsObj(&sLastWMSParams);
msFree(pasReqInfo);
return MS_FAILURE;
}
} else if (msPrepareWMSLayerRequest(map->layerorder[i], map, GET_LAYER(map,map->layerorder[i]),
WMS_GETLEGENDGRAPHIC,
MS_WMS, &sLastWMSParams,

0 comments on commit 2b9d022

Please sign in to comment.