[mapserver-commits] r9513 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2009-10-26 13:18:18 -0400 (Mon, 26 Oct 2009)
New Revision: 9513

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapows.c
Log:
Generate WMS LatLongBoundingBox in WGS84 datum (#2578)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-26 15:49:03 UTC (rev 9512)
+++ trunk/mapserver/HISTORY.TXT	2009-10-26 17:18:18 UTC (rev 9513)
@@ -41,7 +41,9 @@
 
 - maprasterquery.c: a few fixes since beta4 (#3181, #3168).
 
+- mapows.c: Generate WMS LatLongBoundingBox in WGS84 datum (#2578)
 
+
 Version 5.6.0-beta4 (2009-10-18):
 ---------------------------------
 

Modified: trunk/mapserver/mapows.c
===================================================================
--- trunk/mapserver/mapows.c	2009-10-26 15:49:03 UTC (rev 9512)
+++ trunk/mapserver/mapows.c	2009-10-26 17:18:18 UTC (rev 9513)
@@ -1213,7 +1213,11 @@
 
   if (nService == OWS_WMS) { /* always project to lat long */
     if (srcproj->numargs > 0 && !pj_is_latlong(srcproj->proj)) {
-      msProjectRect(srcproj, NULL, &ext);
+        projectionObj wgs84;
+        msInitProjection(&wgs84);
+        msLoadProjectionString(&wgs84, "+proj=longlat +datum=WGS84");
+        msProjectRect(srcproj, &wgs84, &ext);
+        msFreeProjection(&wgs84);
     }
   }