[mapserver-commits] r11270 - in trunk/msautotest/wxs: . expected

[svn at osgeo.org]

Author: warmerdam
Date: 2011-03-18 12:29:04 -0700 (Fri, 18 Mar 2011)
New Revision: 11270

Modified:
   trunk/msautotest/wxs/expected/wms_rast_cap.xml
   trunk/msautotest/wxs/wms_raster.map
Log:
updated for 6.0

Modified: trunk/msautotest/wxs/expected/wms_rast_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_rast_cap.xml	2011-03-18 19:25:16 UTC (rev 11269)
+++ trunk/msautotest/wxs/expected/wms_rast_cap.xml	2011-03-18 19:29:04 UTC (rev 11270)
@@ -52,14 +52,10 @@
     </GetCapabilities>
     <GetMap>
       <Format>image/png</Format>
-      <Format>image/gif</Format>
-      <Format>image/png; mode=24bit</Format>
+      <Format>image/png</Format>
       <Format>image/jpeg</Format>
-      <Format>image/tiff</Format>
-      <Format>application/x-pdf</Format>
-      <Format>image/svg+xml</Format>
-      <Format>application/vnd.google-earth.kml+xml</Format>
-      <Format>application/vnd.google-earth.kmz</Format>
+      <Format>image/gif</Format>
+      <Format>image/png; mode=8bit</Format>
       <DCPType>
         <HTTP>
           <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
@@ -88,9 +84,9 @@
     </DescribeLayer>
     <GetLegendGraphic>
       <Format>image/png</Format>
-      <Format>image/gif</Format>
-      <Format>image/png; mode=24bit</Format>
       <Format>image/jpeg</Format>
+      <Format>image/gif</Format>
+      <Format>image/png; mode=8bit</Format>
       <DCPType>
         <HTTP>
           <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
@@ -124,7 +120,7 @@
      <Keyword>wms</Keyword>
      <Keyword>mapserver</Keyword>
     </KeywordList>
-    <SRS>EPSG:42304</SRS>
+    <SRS>EPSG:32611</SRS>
     <SRS>EPSG:42101</SRS>
     <SRS>EPSG:4269</SRS>
     <SRS>EPSG:4326</SRS>
@@ -134,7 +130,7 @@
     <Layer queryable="0" opaque="0" cascaded="0">
         <Name>road</Name>
         <Title>road</Title>
-        <SRS>EPSG:43204</SRS>
+        <SRS>EPSG:32611</SRS>
         <LatLonBoundingBox minx="-117.546" miny="44.6656" maxx="-117.387" maxy="44.7671" />
         <BoundingBox SRS="EPSG:32611"
                     minx="456800" miny="4.94595e+06" maxx="469300" maxy="4.95715e+06" />

Modified: trunk/msautotest/wxs/wms_raster.map
===================================================================
--- trunk/msautotest/wxs/wms_raster.map	2011-03-18 19:25:16 UTC (rev 11269)
+++ trunk/msautotest/wxs/wms_raster.map	2011-03-18 19:29:04 UTC (rev 11270)
@@ -45,7 +45,7 @@
     "ows_updatesequence"   "123"
     "wms_title"		   "Test simple wms"
     "wms_onlineresource"   "http://localhost/path/to/wms_simple?"
-    "wms_srs"		   "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
+    "wms_srs"		   "EPSG:32611 EPSG:42101 EPSG:4269 EPSG:4326"
     "ows_schemas_location" "http://schemas.opengis.net"
     "ows_keywordlist" "ogc,wms,mapserver"
     "ows_service_onlineresource" "http://www.mapserver.org/"
@@ -63,12 +63,13 @@
     "ows_contactperson" "Tom Kralidis"
     "ows_contactorganization" "MapServer"
     "ows_contactposition" "self"
+    "ows_enable_request" "*"
+    "wms_getmap_formatlist" "image/png,image/png; mode=24bit,image/jpeg,image/gif,image/png; mode=8bit"
   END
 END
 
 PROJECTION
   "init=epsg:4326"
-  #"init=./data/epsg2:42304"
 END
 
 
@@ -82,7 +83,7 @@
   METADATA
     "wms_title"       "road"
     "wms_description" "Roads of I.P.E."
-    "wms_srs" "EPSG:43204"
+    "wms_srs" "EPSG:32611"
     "gml_include_items" "all"
   END
   TYPE RASTER