[mapserver-commits] r8652 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-03-07 14:24:51 -0500 (Sat, 07 Mar 2009)
New Revision: 8652

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapows.h
   trunk/mapserver/mapwfs.c
Log:
add support for SRSNAME parameter (#2899)



Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-03-07 19:00:22 UTC (rev 8651)
+++ trunk/mapserver/HISTORY.TXT	2009-03-07 19:24:51 UTC (rev 8652)
@@ -14,11 +14,13 @@
 - Refactor legend icon drawing (remove renderer specific versions)
   Add label styling or markers for annotation layer legend icons (#2917)
 
+- Update EXTENT warning message (#2914)
+
+- add support for SRSNAME parameter (#2899)
+
 Version 5.4.0-beta3 (2009-3-5):
 --------------------------------
 
-- Update EXTENT warning message (#2914)
-
 - SLD: Correct crash with large class names (#2915)
 
 - Added Java MapScript WIN64 support (#2250)

Modified: trunk/mapserver/mapows.h
===================================================================
--- trunk/mapserver/mapows.h	2009-03-07 19:00:22 UTC (rev 8651)
+++ trunk/mapserver/mapows.h	2009-03-07 19:24:51 UTC (rev 8652)
@@ -106,7 +106,7 @@
   char *pszBbox; /* only used with a Get Request */
   char *pszOutputFormat; /* only used with DescibeFeatureType */
   char *pszFeatureId;
-
+  char *pszSrs;
 } wfsParamsObj;
 
 /*

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2009-03-07 19:00:22 UTC (rev 8651)
+++ trunk/mapserver/mapwfs.c	2009-03-07 19:24:51 UTC (rev 8652)
@@ -1860,6 +1860,8 @@
           free(wfsparams->pszFeatureId);
         if (wfsparams->pszOutputFormat)
           free(wfsparams->pszOutputFormat);
+        if (wfsparams->pszSrs)
+          free(wfsparams->pszSrs);
     }
 }
 
@@ -1900,6 +1902,9 @@
                 else if (strcasecmp(request->ParamNames[i], "BBOX") == 0)
                   wfsparams->pszBbox = strdup(request->ParamValues[i]);
                 
+                else if (strcasecmp(request->ParamNames[i], "SRSNAME") == 0)
+                  wfsparams->pszSrs = strdup(request->ParamValues[i]);
+
                 else if (strcasecmp(request->ParamNames[i], "TYPENAME") == 0)
                   wfsparams->pszTypeName = strdup(request->ParamValues[i]);
                 
@@ -2013,6 +2018,11 @@
                 if (pszValue)
                   wfsparams->nMaxFeatures = atoi(pszValue);
 
+                pszValue = (char*)CPLGetXMLValue(psGetFeature,  "srsName",
+                                                 NULL);
+                if (pszValue)
+                  wfsparams->pszSrs = strdup(pszValue);
+
                 psQuery = CPLGetXMLNode(psGetFeature, "Query");
                 if (psQuery)
                 {