[mapserver-commits] r7727 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2008-06-23 15:19:09 -0400 (Mon, 23 Jun 2008)
New Revision: 7727

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapogcsos.c
Log:
more srsName support (#2558)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-06-23 14:57:26 UTC (rev 7726)
+++ trunk/mapserver/HISTORY.TXT	2008-06-23 19:19:09 UTC (rev 7727)
@@ -12,6 +12,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- SOS: more srsName support (#2558)
+
 - mapserv.c, maptemplate.c: fixed problem with arguments to msGenerateImages(). (#2655)
 
 - WMS: produce warning if layer extent is null (#1396)

Modified: trunk/mapserver/mapogcsos.c
===================================================================
--- trunk/mapserver/mapogcsos.c	2008-06-23 14:57:26 UTC (rev 7726)
+++ trunk/mapserver/mapogcsos.c	2008-06-23 19:19:09 UTC (rev 7727)
@@ -1403,7 +1403,7 @@
                  if (value)
                      msLibXml2GenerateList(psOfferingNode, psNsGml, "srsName", value, ' ');
                  else                  
-                     xmlAddSibling(psNode, xmlNewComment(BAD_CAST "WARNING: Optional metadata \"sos_srs\" missing for gml:srsName"));
+                     xmlAddSibling(psNode, xmlNewComment(BAD_CAST "WARNING: Required metadata \"sos_srs\" missing for gml:srsName"));
 
                  /*bounding box */
                  /*TODO : if sos_offering_extent does not exist compute extents 
@@ -2177,6 +2177,10 @@
         return msSOSException(map, "srsName", "InvalidParameterValue");
       }
     }
+    else {
+      msSetError(MS_SOSERR, "MAP.WEB.METADATA.sos_srs not set", "msSOSGetObservation()");
+      return msSOSException(map, "mapserv", "NoApplicableCode");
+    }
   }
 
   /* apply filter */