[mapserver-commits] r7735 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2008-06-23 23:51:49 -0400 (Mon, 23 Jun 2008)
New Revision: 7735

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapgml.c
Log:
set srsName correctly for GetFeatureInfo (#2502)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-06-23 22:31:01 UTC (rev 7734)
+++ trunk/mapserver/HISTORY.TXT	2008-06-24 03:51:49 UTC (rev 7735)
@@ -12,6 +12,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- WMS: set srsName correctly for GetFeatureInfo (#2502)
+
 - SOS: detect invalid time strings (#2560)
 
 - SOS: more srsName support (#2558)

Modified: trunk/mapserver/mapgml.c
===================================================================
--- trunk/mapserver/mapgml.c	2008-06-23 22:31:01 UTC (rev 7734)
+++ trunk/mapserver/mapgml.c	2008-06-24 03:51:49 UTC (rev 7735)
@@ -1297,10 +1297,10 @@
 
 #ifdef USE_PROJ
           if(msOWSGetEPSGProj(&(map->projection), &(map->web.metadata), namespaces, MS_TRUE)) { /* use the map projection first */
-            gmlWriteBounds(stream, OWS_GML2, &(shape.bounds), msOWSGetEPSGProj(&(map->projection), &(map->web.metadata), namespaces, MS_TRUE), "\t\t\t");
+            gmlWriteBounds(stream, OWS_GML2, &(shape.bounds), msOWSGetEPSGProj(&(map->projection), NULL, namespaces, MS_TRUE), "\t\t\t");
             gmlWriteGeometry(stream, NULL, OWS_GML2, &(shape), msOWSGetEPSGProj(&(map->projection), &(map->web.metadata), namespaces, MS_TRUE), NULL, "\t\t\t");
           } else { /* then use the layer projection and/or metadata */
-            gmlWriteBounds(stream, OWS_GML2, &(shape.bounds), msOWSGetEPSGProj(&(lp->projection), &(lp->metadata), namespaces, MS_TRUE), "\t\t\t");
+            gmlWriteBounds(stream, OWS_GML2, &(shape.bounds), msOWSGetEPSGProj(&(map->projection), &(map->web.metadata), namespaces, MS_TRUE), "\t\t\t<B>");
             gmlWriteGeometry(stream, NULL, OWS_GML2, &(shape), msOWSGetEPSGProj(&(lp->projection), &(lp->metadata), namespaces, MS_TRUE), NULL, "\t\t\t");
           }
 #else