[mapserver-commits] r10518 - trunk/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2010-09-24 20:47:12 +0000 (Fri, 24 Sep 2010)
New Revision: 10518

Modified:
   trunk/mapserver/maprasterquery.c
   trunk/mapserver/mapwms.c
Log:
Use MS_QUERY_SINGLE/MS_QUERY_MULTIPLE instead of MS_SINGLE/MS_MULTIPLE (#3550)

Modified: trunk/mapserver/maprasterquery.c
===================================================================
--- trunk/mapserver/maprasterquery.c	2010-09-23 20:16:15 UTC (rev 10517)
+++ trunk/mapserver/maprasterquery.c	2010-09-24 20:47:12 UTC (rev 10518)
@@ -72,7 +72,7 @@
     shapeObj *searchshape;
 
     /* Only nearest result to this point. */
-    int      range_mode; /* MS_SINGLE, MS_MULTI or -1 (skip test) */
+    int      range_mode; /* MS_QUERY_SINGLE, MS_QUERY_MULTIPLE or -1 (skip test) */
     double   range_dist;
     pointObj target_point;
 
@@ -650,7 +650,7 @@
 
                 /* If we can only have one feature, trim range and clear */
                 /* previous result.  */
-                if( rlinfo->range_mode == MS_SINGLE )
+                if( rlinfo->range_mode == MS_QUERY_SINGLE )
                 {
                     rlinfo->range_dist = dist;
                     rlinfo->query_results = 0;
@@ -1127,13 +1127,13 @@
     rlinfo->target_point = p;
 
 /* -------------------------------------------------------------------- */
-/*      if we are in the MS_SINGLE mode, first try a query with zero    */
-/*      tolerance.  If this gets a raster pixel then we can be          */
+/*      if we are in the MS_QUERY_SINGLE mode, first try a query with   */
+/*      zero tolerance.  If this gets a raster pixel then we can be     */
 /*      reasonably assured that it is the closest to the query          */
 /*      point.  This will potentially be must more efficient than       */
 /*      processing all pixels within the tolerance.                     */
 /* -------------------------------------------------------------------- */
-    if( mode == MS_SINGLE )
+    if( mode == MS_QUERY_SINGLE )
     {
         rectObj pointRect;
 
@@ -1142,7 +1142,7 @@
         pointRect.miny = p.y;
         pointRect.maxy = p.y;
 
-        rlinfo->range_mode = MS_SINGLE;
+        rlinfo->range_mode = MS_QUERY_SINGLE;
         result = msRasterQueryByRect( map, layer, pointRect );
         if( rlinfo->query_results > 0 )
             return result;

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2010-09-23 20:16:15 UTC (rev 10517)
+++ trunk/mapserver/mapwms.c	2010-09-24 20:47:12 UTC (rev 10518)
@@ -3061,7 +3061,7 @@
       feature_count = 1;
 
   map->query.type = MS_QUERY_BY_POINT;
-  map->query.mode = (feature_count==1?MS_SINGLE:MS_MULTIPLE);
+  map->query.mode = (feature_count==1?MS_QUERY_SINGLE:MS_QUERY_MULTIPLE);
   map->query.layer = -1;
   map->query.point = point;
   map->query.buffer = 0;