[mapserver-commits] r11333 - trunk/msautotest/wxs/expected

[svn at osgeo.org]

Author: tomkralidis
Date: 2011-03-24 09:32:33 -0700 (Thu, 24 Mar 2011)
New Revision: 11333

Modified:
   trunk/msautotest/wxs/expected/wms_get_caps.xml
Log:
update expected results

Modified: trunk/msautotest/wxs/expected/wms_get_caps.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_get_caps.xml	2011-03-24 15:55:47 UTC (rev 11332)
+++ trunk/msautotest/wxs/expected/wms_get_caps.xml	2011-03-24 16:32:33 UTC (rev 11333)
@@ -53,12 +53,11 @@
     </GetCapabilities>
     <GetMap>
       <Format>image/png</Format>
+      <Format>image/png</Format>
+      <Format>image/jpeg</Format>
+      <Format>image/gif</Format>
+      <Format>image/png; mode=8bit</Format>
       <Format>image/tiff</Format>
-      <Format>image/gif</Format>
-      <Format>image/png; mode=24bit</Format>
-      <Format>image/jpeg</Format>
-      <Format>image/vnd.wap.wbmp</Format>
-      <Format>image/svg+xml</Format>
       <DCPType>
         <HTTP>
           <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/cgi-bin/mapserv.exe?map=/ms4w/apps/ms_ogc_workshop/service/config.map&amp;"/></Get>
@@ -88,10 +87,9 @@
     </DescribeLayer>
     <GetLegendGraphic>
       <Format>image/png</Format>
+      <Format>image/jpeg</Format>
       <Format>image/gif</Format>
-      <Format>image/png; mode=24bit</Format>
-      <Format>image/jpeg</Format>
-      <Format>image/vnd.wap.wbmp</Format>
+      <Format>image/png; mode=8bit</Format>
       <DCPType>
         <HTTP>
           <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/cgi-bin/mapserv.exe?map=/ms4w/apps/ms_ogc_workshop/service/config.map&amp;"/></Get>
@@ -141,6 +139,14 @@
       <Name>Imagery</Name>
       <Title>Imagery</Title>
       <Abstract>Imagery layers</Abstract>
+        <Style>
+          <Name>default</Name>
+          <Title>default</Title>
+          <LegendURL width="35" height="5">
+             <Format>image/png; mode=24bit</Format>
+             <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/cgi-bin/mapserv.exe?map=/ms4w/apps/ms_ogc_workshop/service/config.map&amp;version=1.1.1&amp;service=WMS&amp;request=GetLegendGraphic&amp;layer=Imagery&amp;format=image/png; mode=24bit&amp;STYLE=default"/>
+          </LegendURL>
+        </Style>
       <Layer queryable="1" opaque="1" cascaded="0">
         <Name>land_shallow_topo_2048</Name>
         <Title>Land Surface, Shallow Water, and Shaded Topography</Title>
@@ -174,6 +180,14 @@
       <Name>Vectors</Name>
       <Title>Vectors</Title>
       <Abstract>Vector layers</Abstract>
+        <Style>
+          <Name>default</Name>
+          <Title>default</Title>
+          <LegendURL width="71" height="21">
+             <Format>image/png; mode=24bit</Format>
+             <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/cgi-bin/mapserv.exe?map=/ms4w/apps/ms_ogc_workshop/service/config.map&amp;version=1.1.1&amp;service=WMS&amp;request=GetLegendGraphic&amp;layer=Vectors&amp;format=image/png; mode=24bit&amp;STYLE=default"/>
+          </LegendURL>
+        </Style>
       <Layer queryable="1" opaque="0" cascaded="0">
         <Name>rivers</Name>
         <Title>Rivers</Title>
@@ -197,7 +211,7 @@
         <Style>
           <Name>default</Name>
           <Title>default</Title>
-          <LegendURL width="77" height="23">
+          <LegendURL width="71" height="21">
              <Format>image/png</Format>
              <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/cgi-bin/mapserv.exe?map=/ms4w/apps/ms_ogc_workshop/service/config.map&amp;version=1.1.1&amp;service=WMS&amp;request=GetLegendGraphic&amp;layer=rivers&amp;format=image/png&amp;STYLE=default"/>
           </LegendURL>