[mapserver-commits] r12795 - in trunk/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Tue Nov 22 18:06:27 EST 2011
Author: assefa
Date: 2011-11-22 15:06:27 -0800 (Tue, 22 Nov 2011)
New Revision: 12795
Added:
trunk/msautotest/wxs/expected/wms_dimension_cap.xml
trunk/msautotest/wxs/expected/wms_dimension_cap130.xml
trunk/msautotest/wxs/expected/wms_dimension_misc_1.png
Modified:
trunk/msautotest/wxs/wms_dimensions.map
Log:
add tests for wms dimension capabilities (#3466)
Added: trunk/msautotest/wxs/expected/wms_dimension_cap.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_dimension_cap.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wms_dimension_cap.xml 2011-11-22 23:06:27 UTC (rev 12795)
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
+<!DOCTYPE WMT_MS_Capabilities SYSTEM "http://schemas.opengis.net/wms/1.1.0/capabilities_1_1_0.dtd"
+ [
+ <!ELEMENT VendorSpecificCapabilities EMPTY>
+ ]> <!-- end of DOCTYPE declaration -->
+
+<WMT_MS_Capabilities version="1.1.0">
+
+<!-- MapServer version 6.1-dev OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=CAIRO SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=GEOS INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
+
+<Service>
+ <Name>OGC:WMS</Name>
+<!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
+ <Title>wms_dimesion</Title>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/>
+ <ContactInformation>
+ </ContactInformation>
+</Service>
+
+<Capability>
+ <Request>
+ <GetCapabilities>
+ <Format>application/vnd.ogc.wms_xml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetCapabilities>
+ <GetMap>
+ <Format>image/png</Format>
+ <Format>image/jpeg</Format>
+ <Format>image/gif</Format>
+ <Format>image/png; mode=8bit</Format>
+ <Format>application/x-pdf</Format>
+ <Format>image/svg+xml</Format>
+ <Format>image/tiff</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/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></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/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetFeatureInfo>
+ <DescribeLayer>
+ <Format>text/xml</Format>
+ <DCPType>
+ <HTTP>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></Post>
+ </HTTP>
+ </DCPType>
+ </DescribeLayer>
+ </Request>
+ <Exception>
+ <Format>application/vnd.ogc.se_xml</Format>
+ <Format>application/vnd.ogc.se_inimage</Format>
+ <Format>application/vnd.ogc.se_blank</Format>
+ </Exception>
+ <VendorSpecificCapabilities />
+ <UserDefinedSymbolization SupportSLD="1" UserLayer="0" UserStyle="1" RemoteWFS="0"/>
+ <Layer>
+ <Name>wms_dimesion</Name>
+<!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
+ <Title>wms_dimesion</Title>
+ <Abstract>wms_dimesion</Abstract>
+ <SRS>EPSG:4326</SRS>
+ <LatLonBoundingBox minx="0.000178" miny="-0.002134" maxx="0.00342" maxy="0.000314" />
+ <BoundingBox SRS="EPSG:4326"
+ minx="0.000178" miny="-0.002134" maxx="0.00342" maxy="0.000314" />
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>lakes_elev</Name>
+ <Title>Lakes</Title>
+ <SRS>EPSG:4326</SRS>
+ <LatLonBoundingBox minx="0.000178263" miny="-0.002134" maxx="0.0034202" maxy="0.000313775" />
+ <BoundingBox SRS="EPSG:4326"
+ minx="0.000178263" miny="-0.002134" maxx="0.0034202" maxy="0.000313775" />
+ <Dimension name="elevation" units="meters"/>
+ <Extent name="elevation" default="500" nearestValue="0">500, 490, 480</Extent>
+ <Dimension name="text_dimension" units="my_units"/>
+ <Extent name="text_dimension" nearestValue="0">first, second, third</Extent>
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="155" height="21">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?version=1.1.0&service=WMS&request=GetLegendGraphic&layer=lakes_elev&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>lakes_elev_range</Name>
+ <Title>Lakes</Title>
+ <SRS>EPSG:4326</SRS>
+ <LatLonBoundingBox minx="0.000178263" miny="-0.002134" maxx="0.0034202" maxy="0.000313775" />
+ <BoundingBox SRS="EPSG:4326"
+ minx="0.000178263" miny="-0.002134" maxx="0.0034202" maxy="0.000313775" />
+ <Dimension name="elevation" units="meters"/>
+ <Extent name="elevation" nearestValue="0">490/800</Extent>
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="155" height="21">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?version=1.1.0&service=WMS&request=GetLegendGraphic&layer=lakes_elev_range&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>lakes_elev_multi_range</Name>
+ <Title>Lakes</Title>
+ <SRS>EPSG:4326</SRS>
+ <LatLonBoundingBox minx="0.000178263" miny="-0.002134" maxx="0.0034202" maxy="0.000313775" />
+ <BoundingBox SRS="EPSG:4326"
+ minx="0.000178263" miny="-0.002134" maxx="0.0034202" maxy="0.000313775" />
+ <Dimension name="elevation" units="meters"/>
+ <Extent name="elevation" nearestValue="0">480/500,800/900</Extent>
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="155" height="21">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?version=1.1.0&service=WMS&request=GetLegendGraphic&layer=lakes_elev_multi_range&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ </Layer>
+</Capability>
+</WMT_MS_Capabilities>
Added: trunk/msautotest/wxs/expected/wms_dimension_cap130.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_dimension_cap130.xml (rev 0)
+++ trunk/msautotest/wxs/expected/wms_dimension_cap130.xml 2011-11-22 23:06:27 UTC (rev 12795)
@@ -0,0 +1,175 @@
+<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
+<WMS_Capabilities version="1.3.0" 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/mswms?service=WMS&version=1.3.0&request=GetSchemaExtension">
+
+<!-- MapServer version 6.1-dev OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=CAIRO SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=GEOS INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
+
+<Service>
+ <Name>WMS</Name>
+<!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
+ <Title>wms_dimesion</Title>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/>
+ <ContactInformation>
+ </ContactInformation>
+ <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/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetCapabilities>
+ <GetMap>
+ <Format>image/png</Format>
+ <Format>image/jpeg</Format>
+ <Format>image/gif</Format>
+ <Format>image/png; mode=8bit</Format>
+ <Format>application/x-pdf</Format>
+ <Format>image/svg+xml</Format>
+ <Format>image/tiff</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/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></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/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></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/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></Post>
+ </HTTP>
+ </DCPType>
+ </sld:DescribeLayer>
+ <sld:GetLegendGraphic>
+ <Format>image/png</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/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></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/mswms?"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/mswms?"/></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_dimesion</Name>
+<!-- WARNING: Mandatory metadata '..._title' was missing in this context. -->
+ <Title>wms_dimesion</Title>
+ <Abstract>wms_dimesion</Abstract>
+ <CRS>EPSG:4326</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>0.000178</westBoundLongitude>
+ <eastBoundLongitude>0.00342</eastBoundLongitude>
+ <southBoundLatitude>-0.002134</southBoundLatitude>
+ <northBoundLatitude>0.000314</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="-0.002134" miny="0.000178" maxx="0.000314" maxy="0.00342" />
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>lakes_elev</Name>
+ <Title>Lakes</Title>
+ <CRS>EPSG:4326</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>0.000178263</westBoundLongitude>
+ <eastBoundLongitude>0.0034202</eastBoundLongitude>
+ <southBoundLatitude>-0.002134</southBoundLatitude>
+ <northBoundLatitude>0.000313775</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="-0.002134" miny="0.000178263" maxx="0.000313775" maxy="0.0034202" />
+ <Dimension name="elevation" units="meters" default="500" multipleValues="1" nearestValue="0">500, 490, 480</Dimension>
+ <Dimension name="text_dimension" units="my_units" multipleValues="1" nearestValue="0">first, second, third</Dimension>
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="155" height="21">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=lakes_elev&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>lakes_elev_range</Name>
+ <Title>Lakes</Title>
+ <CRS>EPSG:4326</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>0.000178263</westBoundLongitude>
+ <eastBoundLongitude>0.0034202</eastBoundLongitude>
+ <southBoundLatitude>-0.002134</southBoundLatitude>
+ <northBoundLatitude>0.000313775</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="-0.002134" miny="0.000178263" maxx="0.000313775" maxy="0.0034202" />
+ <Dimension name="elevation" units="meters" multipleValues="1" nearestValue="0">490/800</Dimension>
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="155" height="21">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=lakes_elev_range&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>lakes_elev_multi_range</Name>
+ <Title>Lakes</Title>
+ <CRS>EPSG:4326</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>0.000178263</westBoundLongitude>
+ <eastBoundLongitude>0.0034202</eastBoundLongitude>
+ <southBoundLatitude>-0.002134</southBoundLatitude>
+ <northBoundLatitude>0.000313775</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="-0.002134" miny="0.000178263" maxx="0.000313775" maxy="0.0034202" />
+ <Dimension name="elevation" units="meters" multipleValues="1" nearestValue="0">480/500,800/900</Dimension>
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="155" height="21">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/mswms?version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=lakes_elev_multi_range&format=image/png&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ </Layer>
+</Capability>
+</WMS_Capabilities>
Added: trunk/msautotest/wxs/expected/wms_dimension_misc_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/msautotest/wxs/expected/wms_dimension_misc_1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/msautotest/wxs/wms_dimensions.map
===================================================================
--- trunk/msautotest/wxs/wms_dimensions.map 2011-11-22 19:56:11 UTC (rev 12794)
+++ trunk/msautotest/wxs/wms_dimensions.map 2011-11-22 23:06:27 UTC (rev 12795)
@@ -104,6 +104,18 @@
# h- one valid range and one invalid range
# RUN_PARMS: wms_dimension_extent_multi_range_8.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&BBOX=0.000178,-0.002134,0.003420,0.000314&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=lakes_elev_multi_range&STYLES=&elevation=490/500,300/600" > [RESULT_DEVERSION]
#
+# 6- capabilities
+#
+# RUN_PARMS: wms_dimension_cap.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.0&REQUEST=GetCapabilities" > [RESULT_DEMIME]
+#
+# Capabilities 1.3.0
+# RUN_PARMS: wms_dimension_cap130.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities" > [RESULT_DEMIME]
+#
+# 7 Misc
+# a- empty value: use default
+# RUN_PARMS: wms_dimension_misc_1.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&BBOX=0.000178,-0.002134,0.003420,0.000314&FORMAT=image/png; mode=24bit&WIDTH=300&HEIGHT=300&STYLES=&LAYERS=lakes_elev&elevation=" > [RESULT_DEMIME]
+#
+#
MAP
NAME wms_dimesion
@@ -124,6 +136,7 @@
METADATA
+ "WMS_ONLINERESOURCE" "http://localhost/path/to/mswms?"
"ows_enable_request" "*"
"wms_srs" "EPSG:4326"
END
@@ -148,9 +161,12 @@
"wms_dimensionlist" "elevation, text_dimension"
"wms_elevation_item" "ELEV"
"wms_elevation_extent" "500, 490, 480"
+ "wms_elevation_units" "meters"
+ "wms_elevation_default" "500"
"wms_text_dimension_item" "text_dimen"
"wms_text_dimension_extent" "first, second, third"
+ "wms_text_dimension_units" "my_units"
END
TYPE POLYGON
@@ -180,6 +196,7 @@
"wms_dimensionlist" "elevation"
"wms_elevation_item" "ELEV"
"wms_elevation_extent" "490/800"
+ "wms_elevation_units" "meters"
END
TYPE POLYGON
STATUS ON
@@ -206,6 +223,7 @@
"wms_dimensionlist" "elevation"
"wms_elevation_item" "ELEV"
"wms_elevation_extent" "480/500,800/900"
+ "wms_elevation_units" "meters"
END
TYPE POLYGON
STATUS ON
More information about the mapserver-commits
mailing list