[mapserver-commits] r9648 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-01-02 12:19:45 -0500 (Sat, 02 Jan 2010)
New Revision: 9648

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapserv.c
Log:
Fixed problems with point queries not working via the CGI (mode=query or mode=nquery) (#3246)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-01-01 15:12:59 UTC (rev 9647)
+++ trunk/mapserver/HISTORY.TXT	2010-01-02 17:19:45 UTC (rev 9648)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed problems with point queries not working via the CGI (mode=query or mode=nquery) (#3246)
+
 - Support QueryByShape() with point and line geometries (#3248)
 
 - Honour MAXSIZE for WCS responses (#3204)

Modified: trunk/mapserver/mapserv.c
===================================================================
--- trunk/mapserver/mapserv.c	2010-01-01 15:12:59 UTC (rev 9647)
+++ trunk/mapserver/mapserv.c	2010-01-02 17:19:45 UTC (rev 9648)
@@ -1671,14 +1671,14 @@
               mapserv->map->cellsize = msAdjustExtent(&(mapserv->map->extent), mapserv->map->width, mapserv->map->height);
               if((status = msCalculateScale(mapserv->map->extent, mapserv->map->units, mapserv->map->width, mapserv->map->height, mapserv->map->resolution, &mapserv->map->scaledenom)) != MS_SUCCESS) writeError();
               mapserv->map->query.rect = mapserv->map->extent;
-	      mapserv->map->query.mode = MS_QUERY_BY_RECT; 
+	      mapserv->map->query.type = MS_QUERY_BY_RECT; 
             } else {
               mapserv->map->extent = mapserv->ImgExt; /* use the existing image parameters */
               mapserv->map->width = mapserv->ImgCols;
               mapserv->map->height = mapserv->ImgRows;
               if((status = msCalculateScale(mapserv->map->extent, mapserv->map->units, mapserv->map->width, mapserv->map->height, mapserv->map->resolution, &mapserv->map->scaledenom)) != MS_SUCCESS) writeError();     
               mapserv->map->query.point = mapserv->mappnt;
-              mapserv->map->query.mode = MS_QUERY_BY_POINT;
+              mapserv->map->query.type = MS_QUERY_BY_POINT;
             }
 
             break;      
@@ -1725,8 +1725,8 @@
             mapserv->map->query.type = MS_QUERY_BY_SHAPE;
             break;      
           case FROMUSERPNT:
-            if(mapserv->Buffer == 0) { /* why == 0, makes no sense */
-	      mapserv->map->query.rect = mapserv->map->extent;
+            if(mapserv->Buffer == 0) { /* do a *pure* point query */
+	      mapserv->map->query.point = mapserv->mappnt;
               mapserv->map->query.type = MS_QUERY_BY_POINT;
               setExtent(mapserv);
             } else {