[mapserver-commits] r11933 - in
sandbox/inspire_soc2011/msautotest/wxs: . expected
svn at osgeo.org
svn at osgeo.org
Thu Jul 14 09:13:16 EDT 2011
Author: schpidi
Date: 2011-07-14 06:13:16 -0700 (Thu, 14 Jul 2011)
New Revision: 11933
Added:
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
Modified:
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
Log:
SoC INSPIRE View Service: Adjusting Scenario 1 Tests
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml 2011-07-14 12:21:34 UTC (rev 11932)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml 2011-07-14 13:13:16 UTC (rev 11933)
@@ -1,37 +1,34 @@
<?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" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:inspire_vs="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0" 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://inspire.ec.europa.eu/schemas/inspire_vs/1.0 http://inspire.ec.europa.eu/schemas/inspire_vs/1.0/inspire_vs.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wms_inspire_screnario1?service=WMS&version=1.3.0&request=GetSchemaExtension">
+<WMS_Capabilities version="1.3.0" updateSequence="myupdatesequence" 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" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:inspire_vs="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0" 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://inspire.ec.europa.eu/schemas/inspire_vs/1.0 http://inspire.ec.europa.eu/schemas/inspire_vs/1.0/inspire_vs.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wms_inspire_scenario1?language=eng&service=WMS&version=1.3.0&request=GetSchemaExtension">
<Service>
<Name>WMS</Name>
- <Title>mytitleger</Title>
- <Abstract>myabstractger</Abstract>
- <KeywordList>
- <Keyword>ogc</Keyword>
- <Keyword>wms</Keyword>
- <Keyword>mapserver</Keyword>
- </KeywordList>
+ <Title>Transport networks: Road Area</Title>
+ <Abstract>myabstract</Abstract>
+ <KeywordList>
+ <Keyword vocabulary="ISO">infoMapAccessService</Keyword>
+ </KeywordList>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.mapserver.org/"/>
<ContactInformation>
<ContactPersonPrimary>
- <ContactPerson>Tom Kralidis</ContactPerson>
+ <ContactPerson>mycontactperson</ContactPerson>
<ContactOrganization>MapServer</ContactOrganization>
</ContactPersonPrimary>
- <ContactPosition>resourceProvider</ContactPosition>
+ <ContactPosition>owner</ContactPosition>
<ContactAddress>
- <AddressType>postal</AddressType>
- <Address>123 SomeRoad Road</Address>
- <City>Toronto</City>
- <StateOrProvince>Ontario</StateOrProvince>
+ <AddressType>myaddresstype</AddressType>
+ <Address>myaddress</Address>
+ <City>mycity</City>
+ <StateOrProvince>mystateorprovince</StateOrProvince>
<PostCode>xxx-xxx</PostCode>
- <Country>Canada</Country>
+ <Country>mycountry</Country>
</ContactAddress>
<ContactVoiceTelephone>+xx-xxx-xxx-xxxx</ContactVoiceTelephone>
<ContactFacsimileTelephone>+xx-xxx-xxx-xxxx</ContactFacsimileTelephone>
- <ContactElectronicMailAddress>tomkralidis at xxxxxxx.xxx</ContactElectronicMailAddress>
+ <ContactElectronicMailAddress>mycontactelectronicmailaddress at xxxxxxx.xxx</ContactElectronicMailAddress>
</ContactInformation>
<Fees>conditions unknown</Fees>
- <AccessConstraints>none</AccessConstraints>
- <LayerLimit>1</LayerLimit>
+ <AccessConstraints>None</AccessConstraints>
<MaxWidth>2048</MaxWidth>
<MaxHeight>2048</MaxHeight>
</Service>
@@ -42,22 +39,25 @@
<Format>text/xml</Format>
<DCPType>
<HTTP>
- <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_screnario1?"/></Get>
- <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_screnario1?"/></Post>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&"/></Post>
</HTTP>
</DCPType>
</GetCapabilities>
<GetMap>
<Format>image/png</Format>
- <Format>image/png; mode=24bit</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/wms_inspire_screnario1?"/></Get>
- <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_screnario1?"/></Post>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&"/></Post>
</HTTP>
</DCPType>
</GetMap>
@@ -66,100 +66,89 @@
<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_inspire_screnario1?"/></Get>
- <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_screnario1?"/></Post>
+ <Get><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&"/></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_inspire_screnario1?"/></Get>
- <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_screnario1?"/></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/wms_inspire_screnario1?"/></Get>
- <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_screnario1?"/></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_inspire_screnario1?"/></Get>
- <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_screnario1?"/></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"/>
<inspire_vs:ExtendedCapabilities>
<inspire_common:MetadataUrl xsi:type="inspire_common:resourceLocatorType">
- <inspire_common:URL>mymetadataurlhref</inspire_common:URL>
- <inspire_common:MediaType>mymetadataurlformat</inspire_common:MediaType>
+ <inspire_common:URL>http://inspire.service/metadata</inspire_common:URL>
+ <inspire_common:MediaType>application/vnd.ogc.csw.capabilities.response_xml</inspire_common:MediaType>
</inspire_common:MetadataUrl>
<inspire_common:SupportedLanguages>
<inspire_common:DefaultLanguage><inspire_common:Language>eng</inspire_common:Language></inspire_common:DefaultLanguage>
- <inspire_common:SupportedLanguage><inspire_common:Language>eng</inspire_common:Language></inspire_common:SupportedLanguage>
<inspire_common:SupportedLanguage><inspire_common:Language>ger</inspire_common:Language></inspire_common:SupportedLanguage>
</inspire_common:SupportedLanguages>
- <inspire_common:ResponseLanguage><inspire_common:Language>ger</inspire_common:Language></inspire_common:ResponseLanguage>
+ <inspire_common:ResponseLanguage><inspire_common:Language>eng</inspire_common:Language></inspire_common:ResponseLanguage>
</inspire_vs:ExtendedCapabilities>
<Layer>
- <Name>WMS_INSPIRE_SCENARIO1_TEST</Name>
- <Title>mytitleger</Title>
- <Abstract>myabstractger</Abstract>
+ <Name>INSPIRE_Test_Scenario1</Name>
+ <Title>Transport networks: Road Area</Title>
+ <Abstract>myrootlayerabstract</Abstract>
<KeywordList>
- <Keyword>layers</Keyword>
- <Keyword>list</Keyword>
+ <Keyword>myrootlayerkeyword1</Keyword>
+ <Keyword>myrootlayerkeyword2</Keyword>
</KeywordList>
- <CRS>EPSG:42304</CRS>
- <CRS>EPSG:42101</CRS>
- <CRS>EPSG:4269</CRS>
<CRS>EPSG:4326</CRS>
+ <CRS>EPSG:4269</CRS>
<EX_GeographicBoundingBox>
- <westBoundLongitude>-67.5725</westBoundLongitude>
- <eastBoundLongitude>-58.9275</eastBoundLongitude>
- <southBoundLatitude>42</southBoundLatitude>
- <northBoundLatitude>48.5</northBoundLatitude>
+ <westBoundLongitude>-66.6333</westBoundLongitude>
+ <eastBoundLongitude>-59.2921</eastBoundLongitude>
+ <southBoundLatitude>42.3821</southBoundLatitude>
+ <northBoundLatitude>48.2955</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>2.25898e+006</westBoundLongitude>
- <eastBoundLongitude>2.61535e+006</eastBoundLongitude>
- <southBoundLatitude>-70747.9</southBoundLatitude>
- <northBoundLatitude>495481</northBoundLatitude>
- </EX_GeographicBoundingBox>
- <BoundingBox CRS="EPSG:43204"
- minx="2.25898e+06" miny="-70747.9" maxx="2.61535e+06" maxy="495481" />
+ minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
+ <Style>
+ <Name>inspire_common:DEFAULT</Name>
+ <Title>mystyletitle</Title>
+ </Style>
+ <Layer>
+ <Name>TN.RoadTransportNetwork.RoadArea</Name>
+ <Title>Transport networks: Road Area</Title>
+ <Abstract>TN.RoadTransportNetwork.RoadArea</Abstract>
<Style>
<Name>default</Name>
<Title>default</Title>
- <LegendURL width="70" height="23">
+ <LegendURL width="83" height="37">
+ <Format>image/png; mode=24bit</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN.RoadTransportNetwork.RoadArea&format=image/png; mode=24bit&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>TN.RoadTransportNetwork.RoadLink</Name>
+ <Title>Transport networks: Road Link</Title>
+ <Abstract>mylayerabstract</Abstract>
+ <KeywordList>
+ <Keyword>mylayerkeyword1</Keyword>
+ <Keyword>mylayerkeyword2</Keyword>
+ </KeywordList>
+ <CRS>EPSG:4326</CRS>
+ <CRS>EPSG:4269</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>-66.6333</westBoundLongitude>
+ <eastBoundLongitude>-59.2921</eastBoundLongitude>
+ <southBoundLatitude>42.3821</southBoundLatitude>
+ <northBoundLatitude>48.2955</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
+ <Style>
+ <Name>inspire_common:DEFAULT</Name>
+ <Title>mylayerstyletitle</Title>
+ <LegendURL width="83" height="37">
<Format>image/png</Format>
- <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_inspire_screnario1?version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=road&format=image/png&STYLE=default"/>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN.RoadTransportNetwork.RoadLink&format=image/png&STYLE=inspire_common:DEFAULT"/>
</LegendURL>
</Style>
+ </Layer>
</Layer>
</Layer>
</Capability>
Added: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml (rev 0)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml 2011-07-14 13:13:16 UTC (rev 11933)
@@ -0,0 +1,155 @@
+<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
+<WMS_Capabilities version="1.3.0" updateSequence="myupdatesequence" 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" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:inspire_vs="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0" 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://inspire.ec.europa.eu/schemas/inspire_vs/1.0 http://inspire.ec.europa.eu/schemas/inspire_vs/1.0/inspire_vs.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wms_inspire_scenario1?language=eng&service=WMS&version=1.3.0&request=GetSchemaExtension">
+
+<Service>
+ <Name>WMS</Name>
+ <Title>Transport networks: Road Area</Title>
+ <Abstract>myabstract</Abstract>
+ <KeywordList>
+ <Keyword vocabulary="ISO">infoMapAccessService</Keyword>
+ </KeywordList>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.mapserver.org/"/>
+ <ContactInformation>
+ <ContactPersonPrimary>
+ <ContactPerson>mycontactperson</ContactPerson>
+ <ContactOrganization>MapServer</ContactOrganization>
+ </ContactPersonPrimary>
+ <ContactPosition>owner</ContactPosition>
+ <ContactAddress>
+ <AddressType>myaddresstype</AddressType>
+ <Address>myaddress</Address>
+ <City>mycity</City>
+ <StateOrProvince>mystateorprovince</StateOrProvince>
+ <PostCode>xxx-xxx</PostCode>
+ <Country>mycountry</Country>
+ </ContactAddress>
+ <ContactVoiceTelephone>+xx-xxx-xxx-xxxx</ContactVoiceTelephone>
+ <ContactFacsimileTelephone>+xx-xxx-xxx-xxxx</ContactFacsimileTelephone>
+ <ContactElectronicMailAddress>mycontactelectronicmailaddress at xxxxxxx.xxx</ContactElectronicMailAddress>
+ </ContactInformation>
+ <Fees>conditions unknown</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_inspire_scenario1?language=eng&"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&"/></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/wms_inspire_scenario1?language=eng&"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&"/></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_inspire_scenario1?language=eng&"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetFeatureInfo>
+ </Request>
+ <Exception>
+ <Format>XML</Format>
+ <Format>INIMAGE</Format>
+ <Format>BLANK</Format>
+ </Exception>
+ <inspire_vs:ExtendedCapabilities>
+ <inspire_common:MetadataUrl xsi:type="inspire_common:resourceLocatorType">
+ <inspire_common:URL>http://inspire.service/metadata</inspire_common:URL>
+ <inspire_common:MediaType>application/vnd.ogc.csw.capabilities.response_xml</inspire_common:MediaType>
+ </inspire_common:MetadataUrl>
+ <inspire_common:SupportedLanguages>
+ <inspire_common:DefaultLanguage><inspire_common:Language>eng</inspire_common:Language></inspire_common:DefaultLanguage>
+ <inspire_common:SupportedLanguage><inspire_common:Language>ger</inspire_common:Language></inspire_common:SupportedLanguage>
+ </inspire_common:SupportedLanguages>
+ <inspire_common:ResponseLanguage><inspire_common:Language>eng</inspire_common:Language></inspire_common:ResponseLanguage>
+ </inspire_vs:ExtendedCapabilities>
+ <Layer>
+ <Name>INSPIRE_Test_Scenario1</Name>
+ <Title>Transport networks: Road Area</Title>
+ <Abstract>myrootlayerabstract</Abstract>
+ <KeywordList>
+ <Keyword>myrootlayerkeyword1</Keyword>
+ <Keyword>myrootlayerkeyword2</Keyword>
+ </KeywordList>
+ <CRS>EPSG:4326</CRS>
+ <CRS>EPSG:4269</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>-66.6333</westBoundLongitude>
+ <eastBoundLongitude>-59.2921</eastBoundLongitude>
+ <southBoundLatitude>42.3821</southBoundLatitude>
+ <northBoundLatitude>48.2955</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
+ <Style>
+ <Name>inspire_common:DEFAULT</Name>
+ <Title>mystyletitle</Title>
+ </Style>
+ <Layer>
+ <Name>TN.RoadTransportNetwork.RoadArea</Name>
+ <Title>Transport networks: Road Area</Title>
+ <Abstract>TN.RoadTransportNetwork.RoadArea</Abstract>
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="83" height="37">
+ <Format>image/png; mode=24bit</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN.RoadTransportNetwork.RoadArea&format=image/png; mode=24bit&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>TN.RoadTransportNetwork.RoadLink</Name>
+ <Title>Transport networks: Road Link</Title>
+ <Abstract>mylayerabstract</Abstract>
+ <KeywordList>
+ <Keyword>mylayerkeyword1</Keyword>
+ <Keyword>mylayerkeyword2</Keyword>
+ </KeywordList>
+ <CRS>EPSG:4326</CRS>
+ <CRS>EPSG:4269</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>-66.6333</westBoundLongitude>
+ <eastBoundLongitude>-59.2921</eastBoundLongitude>
+ <southBoundLatitude>42.3821</southBoundLatitude>
+ <northBoundLatitude>48.2955</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
+ <Style>
+ <Name>inspire_common:DEFAULT</Name>
+ <Title>mylayerstyletitle</Title>
+ <LegendURL width="83" height="37">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=eng&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN.RoadTransportNetwork.RoadLink&format=image/png&STYLE=inspire_common:DEFAULT"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ </Layer>
+ </Layer>
+</Capability>
+</WMS_Capabilities>
Added: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml (rev 0)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml 2011-07-14 13:13:16 UTC (rev 11933)
@@ -0,0 +1,155 @@
+<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
+<WMS_Capabilities version="1.3.0" updateSequence="myupdatesequence" 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" xmlns:inspire_common="http://inspire.ec.europa.eu/schemas/common/1.0" xmlns:inspire_vs="http://inspire.ec.europa.eu/schemas/inspire_vs/1.0" 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://inspire.ec.europa.eu/schemas/inspire_vs/1.0 http://inspire.ec.europa.eu/schemas/inspire_vs/1.0/inspire_vs.xsd http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wms_inspire_scenario1?language=ger&service=WMS&version=1.3.0&request=GetSchemaExtension">
+
+<Service>
+ <Name>WMS</Name>
+ <Title>Verkehrsnetze: Straßenfläche</Title>
+ <Abstract>myabstractger</Abstract>
+ <KeywordList>
+ <Keyword vocabulary="ISO">infoMapAccessService</Keyword>
+ </KeywordList>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.mapserver.org/"/>
+ <ContactInformation>
+ <ContactPersonPrimary>
+ <ContactPerson>mycontactperson</ContactPerson>
+ <ContactOrganization>MapServer</ContactOrganization>
+ </ContactPersonPrimary>
+ <ContactPosition>owner</ContactPosition>
+ <ContactAddress>
+ <AddressType>myaddresstype</AddressType>
+ <Address>myaddress</Address>
+ <City>mycity</City>
+ <StateOrProvince>mystateorprovince</StateOrProvince>
+ <PostCode>xxx-xxx</PostCode>
+ <Country>mycountry</Country>
+ </ContactAddress>
+ <ContactVoiceTelephone>+xx-xxx-xxx-xxxx</ContactVoiceTelephone>
+ <ContactFacsimileTelephone>+xx-xxx-xxx-xxxx</ContactFacsimileTelephone>
+ <ContactElectronicMailAddress>mycontactelectronicmailaddress at xxxxxxx.xxx</ContactElectronicMailAddress>
+ </ContactInformation>
+ <Fees>conditions unknown</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_inspire_scenario1?language=ger&"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=ger&"/></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/wms_inspire_scenario1?language=ger&"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=ger&"/></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_inspire_scenario1?language=ger&"/></Get>
+ <Post><OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=ger&"/></Post>
+ </HTTP>
+ </DCPType>
+ </GetFeatureInfo>
+ </Request>
+ <Exception>
+ <Format>XML</Format>
+ <Format>INIMAGE</Format>
+ <Format>BLANK</Format>
+ </Exception>
+ <inspire_vs:ExtendedCapabilities>
+ <inspire_common:MetadataUrl xsi:type="inspire_common:resourceLocatorType">
+ <inspire_common:URL>http://inspire.service/metadata</inspire_common:URL>
+ <inspire_common:MediaType>application/vnd.ogc.csw.capabilities.response_xml</inspire_common:MediaType>
+ </inspire_common:MetadataUrl>
+ <inspire_common:SupportedLanguages>
+ <inspire_common:DefaultLanguage><inspire_common:Language>eng</inspire_common:Language></inspire_common:DefaultLanguage>
+ <inspire_common:SupportedLanguage><inspire_common:Language>ger</inspire_common:Language></inspire_common:SupportedLanguage>
+ </inspire_common:SupportedLanguages>
+ <inspire_common:ResponseLanguage><inspire_common:Language>ger</inspire_common:Language></inspire_common:ResponseLanguage>
+ </inspire_vs:ExtendedCapabilities>
+ <Layer>
+ <Name>INSPIRE_Test_Scenario1</Name>
+ <Title>Verkehrsnetze: Straßenfläche</Title>
+ <Abstract>myrootlayerabstractger</Abstract>
+ <KeywordList>
+ <Keyword>myrootlayerkeyword1</Keyword>
+ <Keyword>myrootlayerkeyword2</Keyword>
+ </KeywordList>
+ <CRS>EPSG:4326</CRS>
+ <CRS>EPSG:4269</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>-66.6333</westBoundLongitude>
+ <eastBoundLongitude>-59.2921</eastBoundLongitude>
+ <southBoundLatitude>42.3821</southBoundLatitude>
+ <northBoundLatitude>48.2955</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
+ <Style>
+ <Name>inspire_common:DEFAULT</Name>
+ <Title>mystyletitle</Title>
+ </Style>
+ <Layer>
+ <Name>TN.RoadTransportNetwork.RoadArea</Name>
+ <Title>Verkehrsnetze: Straßenfläche</Title>
+ <Abstract>TN.RoadTransportNetwork.RoadArea</Abstract>
+ <Style>
+ <Name>default</Name>
+ <Title>default</Title>
+ <LegendURL width="83" height="37">
+ <Format>image/png; mode=24bit</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=ger&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN.RoadTransportNetwork.RoadArea&format=image/png; mode=24bit&STYLE=default"/>
+ </LegendURL>
+ </Style>
+ <Layer queryable="0" opaque="0" cascaded="0">
+ <Name>TN.RoadTransportNetwork.RoadLink</Name>
+ <Title>Verkehrsnetze: Straßensegment</Title>
+ <Abstract>mylayerabstractger</Abstract>
+ <KeywordList>
+ <Keyword>mylayerkeyword1</Keyword>
+ <Keyword>mylayerkeyword2</Keyword>
+ </KeywordList>
+ <CRS>EPSG:4326</CRS>
+ <CRS>EPSG:4269</CRS>
+ <EX_GeographicBoundingBox>
+ <westBoundLongitude>-66.6333</westBoundLongitude>
+ <eastBoundLongitude>-59.2921</eastBoundLongitude>
+ <southBoundLatitude>42.3821</southBoundLatitude>
+ <northBoundLatitude>48.2955</northBoundLatitude>
+ </EX_GeographicBoundingBox>
+ <BoundingBox CRS="EPSG:4326"
+ minx="42.3821" miny="-66.6333" maxx="48.2955" maxy="-59.2921" />
+ <Style>
+ <Name>inspire_common:DEFAULT</Name>
+ <Title>mylayerstyletitle</Title>
+ <LegendURL width="83" height="37">
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://localhost/path/to/wms_inspire_scenario1?language=ger&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN.RoadTransportNetwork.RoadLink&format=image/png&STYLE=inspire_common:DEFAULT"/>
+ </LegendURL>
+ </Style>
+ </Layer>
+ </Layer>
+ </Layer>
+</Capability>
+</WMS_Capabilities>
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-07-14 12:21:34 UTC (rev 11932)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-07-14 13:13:16 UTC (rev 11933)
@@ -6,29 +6,25 @@
# Tests for INSPIRE View Service using WMS 1.3.0 (based on wms_simple.map)
# scenario 1 - reference to external inspire service metadata
#
-# Capabilities
-# RUN_PARMS: wms_inspire_scenario1_cap130.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities&LANGUAGE=ger" > [RESULT_DEVERSION] [RESULT_DEMIME]
+# Capabilities Default
+# RUN_PARMS: wms_inspire_scenario1_cap130.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities" > [RESULT_DEVERSION] [RESULT_DEMIME]
+# Capabilities German
+# RUN_PARMS: wms_inspire_scenario1_cap130_ger.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities&LANGUAGE=ger" > [RESULT_DEVERSION] [RESULT_DEMIME]
+# Capabilities English
+# RUN_PARMS: wms_inspire_scenario1_cap130_eng.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities&LANGUAGE=eng" > [RESULT_DEVERSION] [RESULT_DEMIME]
MAP
-NAME TN.RoadTransportNetwork.RoadArea
+NAME INSPIRE_Test_Scenario1
STATUS ON
-SIZE 200 200
-EXTENT 40 -70 50 -60
-UNITS DD
-IMAGECOLOR 200 200 200
+SIZE 745 600
+EXTENT -66.6333 42.3821 -59.2921 48.2955
+UNITS meters
+IMAGECOLOR 255 255 255
SHAPEPATH ./data
SYMBOLSET etc/symbols.sym
FONTSET etc/fonts.txt
-OUTPUTFORMAT
- NAME GDPNG
- DRIVER "GD/PNG"
- MIMETYPE "image/png"
- #IMAGEMODE RGB
- EXTENSION "png"
-END
-
#
# Start of web interface definition
#
@@ -48,10 +44,10 @@
"wms_title_ger" "Verkehrsnetze: Straßenfläche"
"wms_abstract" "myabstract" #to test fallback
"wms_abstract_ger" "myabstractger"
- #"wms_keywordlist" "ignoredkeyword1, ignoredkeyword2" #will be ignored
- #"wms_onlineresource" "http://localhost/path/to/wms_inspire_scenario1"
+# "wms_keywordlist" "ignoredkeyword1, ignoredkeyword2" #will be ignored
+ "wms_onlineresource" "http://localhost/path/to/wms_inspire_scenario1"
"wms_updatesequence" "myupdatesequence"
- "wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"
+ "wms_srs" "EPSG:4326 EPSG:4269"
"wms_schemas_location" "http://schemas.opengis.net"
"wms_service_onlineresource" "http://www.mapserver.org/"
"wms_fees" "conditions unknown" #value either "no conditions apply"|default "conditions unknown"|<specific conditions>
@@ -75,12 +71,11 @@
"wms_inspire_style_title" "mystyletitle" #style title
"wms_enable_request" "*"
"wms_sld_enabled" "false"
- "wms_getmap_formatlist" "image/png,image/png; mode=24bit,image/jpeg,image/gif,image/png; mode=8bit,image/tiff"
END
END
PROJECTION
- "init=/home/leopolds/MapServer_SoC_2011/msautotest/wxs/data/epsg2:42304"
+ "init=epsg:4326"
END
#
@@ -89,28 +84,31 @@
LAYER
NAME TN.RoadTransportNetwork.RoadLink
+ GROUP TN.RoadTransportNetwork.RoadArea
DATA road
- TEMPLATE "ttt"
METADATA
"wms_title_eng" "Transport networks: Road Link"
"wms_title_ger" "Verkehrsnetze: Straßensegment"
+ "wms_group_title_eng" "Transport networks: Road Area"
+ "wms_group_title_ger" "Verkehrsnetze: Straßenfläche"
+ "wms_group_title" "mygrouptitle" #to test fallback
"wms_abstract" "mylayerabstract" #to test fallback
"wms_abstract_ger" "mylayerabstractger"
"wms_keywordlist" "mylayerkeyword1,mylayerkeyword2"
+ "wms_srs" "EPSG:4326 EPSG:4269"
"wms_style_inspire_common:DEFAULT_title" "mylayerstyletitle" #override style title
- "wms_style_inspire_common:DEFAULT_legendurl_width" "mylayerstylelegendurlwidth" #override style legendurl (mandatory: width, height, format, href)
- "wms_style_inspire_common:DEFAULT_legendurl_height" "mylayerstylelegendurlheight"
- "wms_style_inspire_common:DEFAULT_legendurl_format" "mylayerstylelegendurlformat"
- "wms_style_inspire_common:DEFAULT_legendurl_href" "mylayerstylelegendurlhref"
+# "wms_style_inspire_common:DEFAULT_legendurl_width" "mylayerstylelegendurlwidth" #override style legendurl (mandatory: width, height, format, href)
+# "wms_style_inspire_common:DEFAULT_legendurl_height" "mylayerstylelegendurlheight"
+# "wms_style_inspire_common:DEFAULT_legendurl_format" "mylayerstylelegendurlformat"
+# "wms_style_inspire_common:DEFAULT_legendurl_href" "mylayerstylelegendurlhref"
END
TYPE LINE
STATUS ON
PROJECTION
- "init=/home/leopolds/MapServer_SoC_2011/msautotest/wxs/data/epsg2:42304"
+# "init=./data/epsg2:42304"
+ "+proj=lcc +lat_1=49 +lat_2=77 +lat_0=49 +lon_0=-95 +x_0=0 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=m +no_defs"
END
- DUMP TRUE
-
CLASSGROUP "inspire_common:DEFAULT"
CLASSITEM "NAME_E"
More information about the mapserver-commits
mailing list