[mapserver-commits] r10026 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-03-29 10:15:01 -0400 (Mon, 29 Mar 2010)
New Revision: 10026

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapdraw.c
Log:
support raster layers in query map draws (#1842)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-03-29 13:50:17 UTC (rev 10025)
+++ trunk/mapserver/HISTORY.TXT	2010-03-29 14:15:01 UTC (rev 10026)
@@ -14,6 +14,9 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Support inclusion of raster layers in query map drawing even if the results
+  may not be that useful (#1842).
+
 - Fixed auto angle: incorrectly rotated Labels. Added AUTO2 angle mode. (#1688)
 
 - Preliminary implementation of validity mask (imageObj->img_mask) for raw

Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c	2010-03-29 13:50:17 UTC (rev 10025)
+++ trunk/mapserver/mapdraw.c	2010-03-29 14:15:01 UTC (rev 10026)
@@ -1129,11 +1129,6 @@
      layer->project true to recheck projection needs (Bug #673) */
   layer->project = MS_TRUE;
 
-  if( layer->type == MS_LAYER_RASTER ) {
-    msSetError( MS_QUERYERR, "Unable to draw raster layers (such as %s) as part of a query result.", "msDrawQueryLayer()", layer->name );
-    return MS_FAILURE;
-  }
-
   /* set annotation status */
   annotate = msEvalContext(map, layer, layer->labelrequires);
   if(map->scaledenom > 0) {
@@ -1880,6 +1875,7 @@
     break;  /* end MS_LAYER_ANNOTATION */
 
   case MS_LAYER_POINT:
+  case MS_LAYER_RASTER:
 
 #ifdef USE_PROJ
     if(layer->transform == MS_TRUE && layer->project && msProjectionsDiffer(&(layer->projection), &(map->projection)))