Merge pull request #1860 from marcel-dancak/getfeatureinfo-bbox-fix

mhugent · mhugent · commit e09437b269b6 · 2015-02-20T10:27:32.000+01:00
Mapserver: using bbox filter on features in GetFeatureInfo only when BBOX parameter is given
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -1992,7 +1992,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
     searchRect.set( infoPoint->x() - searchRadius, infoPoint->y() - searchRadius,
                     infoPoint->x() + searchRadius, infoPoint->y() + searchRadius );
   }
-  else
+  else if ( mParameters.contains( "BBOX" ) )
   {
     searchRect = layerRect;
   }

Original file line number	Diff line number	Diff line change
`@@ -1992,7 +1992,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,`
`1992`	`1992`	`searchRect.set( infoPoint->x() - searchRadius, infoPoint->y() - searchRadius,`
`1993`	`1993`	`infoPoint->x() + searchRadius, infoPoint->y() + searchRadius );`
`1994`	`1994`	`}`
`1995`		`- else`
	`1995`	`+ else if ( mParameters.contains( "BBOX" ) )`
`1996`	`1996`	`{`
`1997`	`1997`	`searchRect = layerRect;`
`1998`	`1998`	`}`