[mapserver-commits] r8754 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: dmorissette
Date: 2009-03-10 09:24:04 -0400 (Tue, 10 Mar 2009)
New Revision: 8754

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/mapwfslayer.c
Log:
Fixed problem with mode=nquery on connectiontype WFS layers (#2885)

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-03-10 13:17:27 UTC (rev 8753)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-03-10 13:24:04 UTC (rev 8754)
@@ -14,9 +14,12 @@
 
 - SLD: Correct non validating SLD (#2915)
 
-Version 5.4.0-beta3 (2009-3-5):
---------------------------------
+- Fixed problem with mode=nquery on connectiontype WFS layers (#2885)
 
+
+Version 5.4.0-beta3 (2009-03-05):
+---------------------------------
+
 - SLD: Correct crash with large class names (#2915)
 
 - Added Java MapScript WIN64 support (#2250)
@@ -33,8 +36,8 @@
 
 - Fix build on windows (maputil.c)
 
-Version 5.4.0-beta2 (2009-2-25):
---------------------------------
+Version 5.4.0-beta2 (2009-02-25):
+---------------------------------
 
 - Fixed a problem where default shade symbols (solid fill, no size) were being
   scaled and not rendered as expected (related to #2896 I believe)
@@ -54,8 +57,8 @@
 
 - Fixed the compiler options for MSVC 2008 (#2898)
 
-Version 5.4.0-beta1 (2009-2-18):
---------------------------------
+Version 5.4.0-beta1 (2009-02-18):
+---------------------------------
 
 - restored much of the pre-5.0 capabilities to update a mapfile via URL but in
   a more secure manner (RFC44)

Modified: branches/branch-5-4/mapserver/mapwfslayer.c
===================================================================
--- branches/branch-5-4/mapserver/mapwfslayer.c	2009-03-10 13:17:27 UTC (rev 8753)
+++ branches/branch-5-4/mapserver/mapwfslayer.c	2009-03-10 13:24:04 UTC (rev 8754)
@@ -832,6 +832,11 @@
     /* way we work with layers right now the bbox is unlikely to change */
     /* between now and the time whichshapes() would have been called by */
     /* the MapServer core. */
+#ifdef USE_PROJ
+    if((lp->map->projection.numargs > 0) && (lp->projection.numargs > 0))
+        msProjectRect(&lp->map->projection, &lp->projection, &psInfo->rect); /* project the searchrect to source coords */
+#endif
+
     if (msWFSLayerWhichShapes(lp, psInfo->rect) == MS_FAILURE)
         status = MS_FAILURE;