Skip to content
Permalink
Browse files

Merge pull request #5740 from rouault/rfc118_adjustment

WMS: apply FILTER (RFC 118) vendor parameter after the CRS parameter is taken into account to avoid extent inconsistencies (found during refs #5658 investigation)
  • Loading branch information...
sdlime committed Mar 22, 2019
2 parents 7774a79 + 3ab3322 commit 8ad230107e8d54be6d9449616a631783c9ed5957
Showing with 16 additions and 16 deletions.
  1. +16 −16 mapwms.c
@@ -1366,22 +1366,6 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
adjust_extent = MS_TRUE;
}

/*
** Apply vendor-specific filter if specified
*/
if (filter) {
if (sld_url || sld_body) {
msSetError(MS_WMSERR,
"Vendor-specific FILTER parameter cannot be used with SLD or SLD_BODY.",
"msWMSLoadGetMapParams()");
return msWMSException(map, nVersion, NULL, wms_exception_format);
}

if (msWMSApplyFilter(map, nVersion, filter, need_axis_swap, wms_exception_format) == MS_FAILURE) {
return MS_FAILURE;/* msWMSException(map, nVersion, "InvalidFilterRequest"); */
}
}

/*
** If any select layers have a default time, we will apply the default
** time value even if no TIME request was in the url.
@@ -1658,6 +1642,22 @@ this request. Check wms/ows_enable_request settings.",
}
}

/*
** Apply vendor-specific filter if specified
*/
if (filter) {
if (sld_url || sld_body) {
msSetError(MS_WMSERR,
"Vendor-specific FILTER parameter cannot be used with SLD or SLD_BODY.",
"msWMSLoadGetMapParams()");
return msWMSException(map, nVersion, NULL, wms_exception_format);
}

if (msWMSApplyFilter(map, nVersion, filter, need_axis_swap, wms_exception_format) == MS_FAILURE) {
return MS_FAILURE;/* msWMSException(map, nVersion, "InvalidFilterRequest"); */
}
}

if (sld_url || sld_body) {
int nLayersBefore, nLayerAfter;
char request_tmp[32];

0 comments on commit 8ad2301

Please sign in to comment.
You can’t perform that action at this time.