[mapserver-commits] r9446 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Tue Oct 13 09:53:28 EDT 2009
Author: tomkralidis
Date: 2009-10-13 09:53:26 -0400 (Tue, 13 Oct 2009)
New Revision: 9446
Added:
trunk/msautotest/wxs/expected/wms_cap_latestversion.xml
Modified:
trunk/msautotest/wxs/wms_simple.map
Log:
Add test for returning latest vesion by default (#3169)
Added: trunk/msautotest/wxs/expected/wms_cap_latestversion.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_cap_latestversion.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wms_cap_latestversion.xml 2009-10-13 13:53:26 UTC (rev 9446)
@@ -0,0 +1,154 @@
+Content-type: text/xml
+
+<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
+<WMS_Capabilities version="1.3.0" updateSequence="123" xmlns="http://www.opengis.net/wms" xmlns:sld="http://www.opengis.net/sld" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ms="http://mapserver.gis.umn.edu/mapserver" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wms_simple?service=WMS&version=1.3.0&request=GetSchemaExtension">
+
+<Service>
+ <Name>WMS</Name>
+ <Title>Test simple wms</Title>
+ <KeywordList>
+ <Keyword>ogc</Keyword>
+ <Keyword>wms</Keyword>
+ <Keyword>mapserver</Keyword>
+ </KeywordList>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.mapserver.org/"/>
+ <ContactInformation>
+ <ContactPersonPrimary>
+ <ContactPerson>Tom Kralidis</ContactPerson>
+ <ContactOrganization>MapServer</ContactOrganization>
+ </ContactPersonPrimary>
+ <ContactPosition>self</ContactPosition>
+ <ContactAddress>
+ <AddressType>postal</AddressType>
+ <Address>123 SomeRoad Road</Address>
+ <City>Toronto</City>
+ <StateOrProvince>Ontario</StateOrProvince>
+ <PostCode>xxx-xxx</PostCode>
+ <Country>Canada</Country>
+ </ContactAddress>
+ <ContactVoiceTelephone>+xx-xxx-xxx-xxxx</ContactVoiceTelephone>
+ <ContactFacsimileTelephone>+xx-xxx-xxx-xxxx</ContactFacsimileTelephone>
+ <ContactElectronicMailAddress>tomkralidis at xxxxxxx.xxx</ContactElectronicMailAddress>
+ </ContactInformation>
+ <Fees>None</Fees>
+ <AccessConstraints>None</AccessConstraints>
+ <MaxWidth>2048</MaxWidth>
+ <MaxHeight>2048</MaxHeight>
+</Service>
+
+<Capability>
+ <Request>
+ <GetCapabilities>
+ <Format>text/xml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetCapabilities>
+ <GetMap>
+ <Format>image/png</Format>
+ <Format>image/gif</Format>
+ <Format>image/png; mode=24bit</Format>
+ <Format>image/jpeg</Format>
+ <Format>image/vnd.wap.wbmp</Format>
+ <Format>image/tiff</Format>
+ <Format>image/svg+xml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetMap>
+ <GetFeatureInfo>
+ <Format>text/plain</Format>
+ <Format>application/vnd.ogc.gml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetFeatureInfo>
+ <sld:DescribeLayer>
+ <Format>text/xml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Post>
+ </HTTP>
+ </DCPType>
+ </sld:DescribeLayer>
+ <sld:GetLegendGraphic>
+ <Format>image/png</Format>
+ <Format>image/gif</Format>
+ <Format>image/png; mode=24bit</Format>
+ <Format>image/jpeg</Format>
+ <Format>image/vnd.wap.wbmp</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Post>
+ </HTTP>
+ </DCPType>
+ </sld:GetLegendGraphic>
+ <ms:GetStyles>
+ <Format>text/xml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_simple?"/></Post>
+ </HTTP>
+ </DCPType>
+ </ms:GetStyles>
+ </Request>
+ <Exception>
+ <Format>XML</Format>
+ <Format>INIMAGE</Format>
+ <Format>BLANK</Format>
+ </Exception>
+ <sld:UserDefinedSymbolization SupportSLD="1" UserLayer="0" UserStyle="1" RemoteWFS="0" InlineFeature="0" RemoteWCS="0"/>
+ <Layer>
+ <Name>WMS_TEST</Name>
+ <Title>My Layers</Title>
+ <Abstract>These are my layers</Abstract>
+ <KeywordList>
+ <Keyword>layers</Keyword>
+ <Keyword>list</Keyword>
+ </KeywordList>
+ <CRS>EPSG:42304</CRS>
+ <CRS>EPSG:42101</CRS>
+ <CRS>EPSG:4269</CRS>
+ <CRS>EPSG:4326</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>-67.5725</westBoundLongitude>
+ <eastBoundLongitude>-58.9275</eastBoundLongitude>
+ <southBoundLatitude>42</southBoundLatitude>
+ <northBoundLatitude>48.5</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="42" miny="-67.5725" maxx="48.5" maxy="-58.9275" />
+ <Layer queryable="1" opaque="0" cascaded="0">
+ <Name>road</Name>
+ <Title>road</Title>
+ <CRS>EPSG:43204</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>-66.6333</westBoundLongitude>
+ <eastBoundLongitude>-59.2921</eastBoundLongitude>
+ <southBoundLatitude>42.3821</southBoundLatitude>
+ <northBoundLatitude>48.2955</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="70" height="23">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_simple?version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=road&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ </Layer>
+</Capability>
+</WMS_Capabilities>
Modified: trunk/msautotest/wxs/wms_simple.map
===================================================================
--- trunk/msautotest/wxs/wms_simple.map 2009-10-13 13:37:33 UTC (rev 9445)
+++ trunk/msautotest/wxs/wms_simple.map 2009-10-13 13:53:26 UTC (rev 9446)
@@ -4,7 +4,10 @@
# REQUIRES: INPUT=GDAL OUTPUT=PNG SUPPORTS=WMS
#
#
-# Capabilities
+# Capabilities (return latest supported version by default
+#
+# RUN_PARMS: wms_cap_latestversion.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&REQUEST=GetCapabilities" > [RESULT_DEVERSION]
+#
# RUN_PARMS: wms_cap.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities" > [RESULT_DEVERSION]
#
# version exception
More information about the mapserver-commits
mailing list