[mapserver-commits] r11237 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Fri Mar 18 12:09:42 EDT 2011
Author: schpidi
Date: 2011-03-18 09:09:42 -0700 (Fri, 18 Mar 2011)
New Revision: 11237
Modified:
trunk/msautotest/wxs/expected/wms_cap.xml
trunk/msautotest/wxs/expected/wms_cap130.xml
trunk/msautotest/wxs/expected/wms_cap_latestversion.xml
trunk/msautotest/wxs/expected/wms_caps_updatesequence.xml
trunk/msautotest/wxs/wms_simple.map
Log:
Addjusting exptected WMS results in msautotest (see #3602).
Modified: trunk/msautotest/wxs/expected/wms_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_cap.xml 2011-03-18 16:07:20 UTC (rev 11236)
+++ trunk/msautotest/wxs/expected/wms_cap.xml 2011-03-18 16:09:42 UTC (rev 11237)
@@ -52,14 +52,11 @@
</GetCapabilities>
<GetMap>
<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>
<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>
<DCPType>
<HTTP>
<Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
@@ -88,9 +85,10 @@
</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>
@@ -135,6 +133,8 @@
<Title>road</Title>
<SRS>EPSG:43204</SRS>
<LatLonBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
+ <BoundingBox SRS="EPSG:43204"
+ minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
<Style>
<Name>default</Name>
<Title>default</Title>
Modified: trunk/msautotest/wxs/expected/wms_cap130.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_cap130.xml 2011-03-18 16:07:20 UTC (rev 11236)
+++ trunk/msautotest/wxs/expected/wms_cap130.xml 2011-03-18 16:09:42 UTC (rev 11237)
@@ -50,14 +50,11 @@
</GetCapabilities>
<GetMap>
<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>
<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>
<DCPType>
<HTTP>
<Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
@@ -86,9 +83,10 @@
</sld:DescribeLayer>
<sld: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>
@@ -142,6 +140,8 @@
<southBoundLatitude>42.3821</southBoundLatitude>
<northBoundLatitude>48.2955</northBoundLatitude>
</EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:43204"
+ minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
<Style>
<Name>default</Name>
<Title>default</Title>
Modified: trunk/msautotest/wxs/expected/wms_cap_latestversion.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_cap_latestversion.xml 2011-03-18 16:07:20 UTC (rev 11236)
+++ trunk/msautotest/wxs/expected/wms_cap_latestversion.xml 2011-03-18 16:09:42 UTC (rev 11237)
@@ -50,14 +50,11 @@
</GetCapabilities>
<GetMap>
<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>
<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>
<DCPType>
<HTTP>
<Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
@@ -86,9 +83,10 @@
</sld:DescribeLayer>
<sld: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>
@@ -142,6 +140,8 @@
<southBoundLatitude>42.3821</southBoundLatitude>
<northBoundLatitude>48.2955</northBoundLatitude>
</EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:43204"
+ minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
<Style>
<Name>default</Name>
<Title>default</Title>
Modified: trunk/msautotest/wxs/expected/wms_caps_updatesequence.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_caps_updatesequence.xml 2011-03-18 16:07:20 UTC (rev 11236)
+++ trunk/msautotest/wxs/expected/wms_caps_updatesequence.xml 2011-03-18 16:09:42 UTC (rev 11237)
@@ -52,14 +52,11 @@
</GetCapabilities>
<GetMap>
<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>
<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>
<DCPType>
<HTTP>
<Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
@@ -88,9 +85,10 @@
</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>
@@ -135,6 +133,8 @@
<Title>road</Title>
<SRS>EPSG:43204</SRS>
<LatLonBoundingBox minx="-66.6333" miny="42.3821" maxx="-59.2921" maxy="48.2955" />
+ <BoundingBox SRS="EPSG:43204"
+ minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
<Style>
<Name>default</Name>
<Title>default</Title>
Modified: trunk/msautotest/wxs/wms_simple.map
===================================================================
--- trunk/msautotest/wxs/wms_simple.map 2011-03-18 16:07:20 UTC (rev 11236)
+++ trunk/msautotest/wxs/wms_simple.map 2011-03-18 16:09:42 UTC (rev 11237)
@@ -1,7 +1,7 @@
#
# Test WMS
#
-# REQUIRES: INPUT=GDAL OUTPUT=PNG SUPPORTS=WMS OUTPUT=KML
+# REQUIRES: INPUT=GDAL OUTPUT=PNG SUPPORTS=WMS
#
#
# Capabilities (return latest supported version by default
@@ -120,6 +120,7 @@
"ows_rootlayer_keywordlist" "layers,list"
"ows_layerlimit" "1"
"ows_enable_request" "*"
+ "wms_getmap_formatlist" "image/png,image/png; mode=24bit,image/jpeg,image/gif,image/png; mode=8bit,image/tiff"
END
END
More information about the mapserver-commits
mailing list