[mapserver-commits] r7265 - trunk/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2008-01-16 00:11:18 -0500 (Wed, 16 Jan 2008)
New Revision: 7265

Modified:
   trunk/mapserver/mapwcs.c
   trunk/mapserver/mapwcs11.c
Log:
various wcs 1.1 improvements, including axis orientation

Modified: trunk/mapserver/mapwcs.c
===================================================================
--- trunk/mapserver/mapwcs.c	2008-01-16 05:10:02 UTC (rev 7264)
+++ trunk/mapserver/mapwcs.c	2008-01-16 05:11:18 UTC (rev 7265)
@@ -1104,6 +1104,30 @@
                 "msWCSGetCoverage()");
     return msWCSException(map, params->version, "MissingParameterValue", "coverage");
   }
+
+  /* For WCS 1.1, we need to normalize the axis order of the BBOX and
+     resolution values some coordinate systems (eg. EPSG geographic) */
+  if( strncasecmp(params->version,"1.0",3) != 0 
+      && params->crs != NULL 
+      && strncasecmp(params->crs,"urn:",4) == 0 )
+  {
+      projectionObj proj;
+
+      msInitProjection( &proj );
+      if( msLoadProjectionString( &proj, (char *) params->crs ) == 0 )
+      {
+          msAxisNormalizePoints( &proj, 1, 
+                                 &(params->bbox.minx), 
+                                 &(params->bbox.miny) );
+          msAxisNormalizePoints( &proj, 1, 
+                                 &(params->bbox.maxx), 
+                                 &(params->bbox.maxy) );
+          msAxisNormalizePoints( &proj, 1, 
+                                 &(params->resx), 
+                                 &(params->resy) );
+      }
+      msFreeProjection( &proj );
+  }
   
   /* find the layer we are working with.  */
   lp = NULL;

Modified: trunk/mapserver/mapwcs11.c
===================================================================
--- trunk/mapserver/mapwcs11.c	2008-01-16 05:10:02 UTC (rev 7264)
+++ trunk/mapserver/mapwcs11.c	2008-01-16 05:11:18 UTC (rev 7265)
@@ -204,6 +204,12 @@
     xmlNewChild( psCSummary, psOwsNs, BAD_CAST "Title", BAD_CAST value );
 
 /* -------------------------------------------------------------------- */
+/*      Abstract                                                        */
+/* -------------------------------------------------------------------- */
+    value = msOWSLookupMetadata( &(layer->metadata), "COM", "abstract");
+    xmlNewChild( psCSummary, psOwsNs, BAD_CAST "Abstract", BAD_CAST value );
+
+/* -------------------------------------------------------------------- */
 /*      Identifier (layer name)                                         */
 /* -------------------------------------------------------------------- */
     xmlNewChild( psCSummary, NULL, BAD_CAST "Identifier", BAD_CAST layer->name );
@@ -523,6 +529,12 @@
     xmlNewChild( psCD, psOwsNs, BAD_CAST "Title", BAD_CAST value );
 
 /* -------------------------------------------------------------------- */
+/*      Abstract                                                        */
+/* -------------------------------------------------------------------- */
+    value = msOWSLookupMetadata( &(layer->metadata), "COM", "abstract");
+    xmlNewChild( psCD, psOwsNs, BAD_CAST "Abstract", BAD_CAST value );
+
+/* -------------------------------------------------------------------- */
 /*      Identifier (layer name)                                         */
 /* -------------------------------------------------------------------- */
     xmlNewChild( psCD, NULL, BAD_CAST "Identifier", BAD_CAST layer->name );