[mapserver-commits] r9714 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-01-20 14:23:14 -0500 (Wed, 20 Jan 2010)
New Revision: 9714

Modified:
   trunk/mapserver/mapquery.c
Log:
Do not adjust the extents in the query code since It could be used from WMS GetFeatureInfo (#3241)

Modified: trunk/mapserver/mapquery.c
===================================================================
--- trunk/mapserver/mapquery.c	2010-01-20 19:16:55 UTC (rev 9713)
+++ trunk/mapserver/mapquery.c	2010-01-20 19:23:14 UTC (rev 9714)
@@ -1130,8 +1130,9 @@
       layer_tolerance = lp->tolerance;
 
     if(map->query.buffer <= 0) { /* use layer tolerance */
-      if(lp->toleranceunits == MS_PIXELS)
-	t = layer_tolerance * msAdjustExtent(&(map->extent), map->width, map->height);
+      if(lp->toleranceunits == MS_PIXELS)       
+	t = layer_tolerance * MS_MAX(MS_CELLSIZE(map->extent.minx, map->extent.maxx, map->width), 
+                                     MS_CELLSIZE(map->extent.miny, map->extent.maxy, map->height));
       else
 	t = layer_tolerance * (msInchesPerUnit(lp->toleranceunits,0)/msInchesPerUnit(map->units,0));
     } else /* use buffer distance */