[mapserver-commits] r12027 - in sandbox/inspire_soc2011: mapserver
msautotest/wxs msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Mon Aug 8 13:55:47 EDT 2011
Author: stefanl
Date: 2011-08-08 10:55:47 -0700 (Mon, 08 Aug 2011)
New Revision: 12027
Modified:
sandbox/inspire_soc2011/mapserver/mapwms.c
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_airlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_roadarea.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_roadlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_transportlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_airlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadarea.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_transportlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_airlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_roadarea.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_roadlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_transportlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_airlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadarea.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadlink.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_transportlink.xml
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
Log:
msWMSDescribeLayer didn't work for root layer/layer groups
Modified: sandbox/inspire_soc2011/mapserver/mapwms.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapwms.c 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/mapserver/mapwms.c 2011-08-08 17:55:47 UTC (rev 12027)
@@ -3684,7 +3684,10 @@
for(k=0; k<map->numlayers; k++)
{
lp = GET_LAYER(map, k);
- if (lp->name && strcasecmp(lp->name, layers[j]) == 0)
+
+ if ((map->name && strcasecmp(map->name, layers[j]) == 0) ||
+ (lp->name && strcasecmp(lp->name, layers[j]) == 0) ||
+ (lp->group && strcasecmp(lp->group, layers[j]) == 0))
{
/* Look for a WFS onlineresouce at the layer level and then at
* the map level.
@@ -3785,7 +3788,7 @@
msFree(pszLayerName);
}
- break;
+ //break;
}
}
}
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_airlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_airlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_airlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<?xml version='1.0' encoding="ISO-8859-1"?>
<DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
<Version>1.1.0</Version>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_roadarea.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_roadarea.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_roadarea.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,6 +1,25 @@
-Content-type: text/xml
-
<?xml version='1.0' encoding="ISO-8859-1"?>
<DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
<Version>1.1.0</Version>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.RoadTransportNetwork.RoadLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.RailTransportNetwork.RailwayLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.AirTransportNetwork.AirLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
</DescribeLayerResponse>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_roadlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_roadlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_roadlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,8 +1,11 @@
-Content-type: text/xml
-
-<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
-<ServiceExceptionReport version="1.3.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wms/1.3.0/exceptions_1_3_0.xsd">
-<ServiceException>
-msWMSDispatch(): WMS server error. Incomplete or unsupported WMS request
-</ServiceException>
-</ServiceExceptionReport>
+<?xml version='1.0' encoding="ISO-8859-1"?>
+<DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
+<Version>1.1.0</Version>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.RoadTransportNetwork.RoadLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+</DescribeLayerResponse>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_transportlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_transportlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_describe130_transportlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,8 +1,18 @@
-Content-type: text/xml
-
-<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
-<ServiceExceptionReport version="1.3.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wms/1.3.0/exceptions_1_3_0.xsd">
-<ServiceException>
-msWMSDispatch(): WMS server error. Incomplete or unsupported WMS request
-</ServiceException>
-</ServiceExceptionReport>
+<?xml version='1.0' encoding="ISO-8859-1"?>
+<DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
+<Version>1.1.0</Version>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.RailTransportNetwork.RailwayLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.AirTransportNetwork.AirLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+</DescribeLayerResponse>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_airlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_airlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_airlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<se:Name>TN.AirTransportNetwork.AirLink</se:Name>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadarea.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadarea.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadarea.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<se:Name>TN.RoadTransportNetwork.RoadLink</se:Name>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_roadlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<se:Name>TN.RoadTransportNetwork.RoadLink</se:Name>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_transportlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_transportlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_styles130_transportlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<se:Name>TN.RailTransportNetwork.RailwayLink</se:Name>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_airlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_airlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_airlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<?xml version='1.0' encoding="ISO-8859-1"?>
<DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
<Version>1.1.0</Version>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_roadarea.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_roadarea.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_roadarea.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,6 +1,25 @@
-Content-type: text/xml
-
<?xml version='1.0' encoding="ISO-8859-1"?>
<DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
<Version>1.1.0</Version>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.RoadTransportNetwork.RoadLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.RailTransportNetwork.RailwayLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.AirTransportNetwork.AirLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
</DescribeLayerResponse>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_roadlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_roadlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_roadlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,8 +1,11 @@
-Content-type: text/xml
-
-<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
-<ServiceExceptionReport version="1.3.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wms/1.3.0/exceptions_1_3_0.xsd">
-<ServiceException>
-msWMSDispatch(): WMS server error. Incomplete or unsupported WMS request
-</ServiceException>
-</ServiceExceptionReport>
+<?xml version='1.0' encoding="ISO-8859-1"?>
+<DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
+<Version>1.1.0</Version>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.RoadTransportNetwork.RoadLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+</DescribeLayerResponse>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_transportlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_transportlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_describe130_transportlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,8 +1,18 @@
-Content-type: text/xml
-
-<?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
-<ServiceExceptionReport version="1.3.0" xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/wms/1.3.0/exceptions_1_3_0.xsd">
-<ServiceException>
-msWMSDispatch(): WMS server error. Incomplete or unsupported WMS request
-</ServiceException>
-</ServiceExceptionReport>
+<?xml version='1.0' encoding="ISO-8859-1"?>
+<DescribeLayerResponse xmlns="http://www.opengis.net/sld" xmlns:ows="http://www.opengis.net/ows" xmlns:se="http://www.opengis.net/se" xmlns:wfs="http://www.opengis.net/wfs" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/DescribeLayer.xsd">
+<Version>1.1.0</Version>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.RailTransportNetwork.RailwayLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+ <LayerDescription>
+ <owsType>wfs</owsType>
+ <se:OnlineResource xlink:type="simple"/>
+ <TypeName>
+ <se:FeatureTypeName>TN.AirTransportNetwork.AirLink</se:FeatureTypeName>
+ </TypeName>
+ </LayerDescription>
+</DescribeLayerResponse>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_airlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_airlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_airlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<se:Name>TN.AirTransportNetwork.AirLink</se:Name>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadarea.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadarea.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadarea.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<se:Name>TN.RoadTransportNetwork.RoadLink</se:Name>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_roadlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<se:Name>TN.RoadTransportNetwork.RoadLink</se:Name>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_transportlink.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_transportlink.xml 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_styles130_transportlink.xml 2011-08-08 17:55:47 UTC (rev 12027)
@@ -1,5 +1,3 @@
-Content-type: text/xml
-
<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<NamedLayer>
<se:Name>TN.RailTransportNetwork.RailwayLink</se:Name>
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2011-08-08 17:55:47 UTC (rev 12027)
@@ -14,22 +14,22 @@
# 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]
#
# DescribeLayer RoadArea (no leaf)
-# RUN_PARMS: wms_inspire_scenario1_describe130_roadarea.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.RoadTransportNetwork.RoadArea&SLD_VERSION=1.1.0" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario1_describe130_roadarea.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.RoadTransportNetwork.RoadArea&SLD_VERSION=1.1.0" > [RESULT_DEMIME]
# DescribeLayer RoadArea/RoadLink (leaf)
-# RUN_PARMS: wms_inspire_scenario1_describe130_roadlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer=TN.RoadTransportNetwork.RoadLink&SLD_VERSION=1.1.0" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario1_describe130_roadlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.RoadTransportNetwork.RoadLink&SLD_VERSION=1.1.0" > [RESULT_DEMIME]
# DescribeLayer RoadArea/TransportLink (no leaf)
-# RUN_PARMS: wms_inspire_scenario1_describe130_transportlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer=TN.CommonTransportElements.TransportLink&SLD_VERSION=1.1.0" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario1_describe130_transportlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.CommonTransportElements.TransportLink&SLD_VERSION=1.1.0" > [RESULT_DEMIME]
# DescribeLayer RoadArea/TransportLink/AirLink (leaf)
-# RUN_PARMS: wms_inspire_scenario1_describe130_airlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.AirTransportNetwork.AirLink&SLD_VERSION=1.1.0" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario1_describe130_airlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.AirTransportNetwork.AirLink&SLD_VERSION=1.1.0" > [RESULT_DEMIME]
#
# GetStyles RoadArea (no leaf)
-# RUN_PARMS: wms_inspire_scenario1_styles130_roadarea.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.RoadTransportNetwork.RoadArea" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario1_styles130_roadarea.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.RoadTransportNetwork.RoadArea" > [RESULT_DEMIME]
# GetStyles RoadArea/RoadLink (leaf)
-# RUN_PARMS: wms_inspire_scenario1_styles130_roadlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.RoadTransportNetwork.RoadLink" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario1_styles130_roadlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.RoadTransportNetwork.RoadLink" > [RESULT_DEMIME]
# GetStyles RoadArea/TransportLink (no leaf)
-# RUN_PARMS: wms_inspire_scenario1_styles130_transportlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.CommonTransportElements.TransportLink" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario1_styles130_transportlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.CommonTransportElements.TransportLink" > [RESULT_DEMIME]
# GetStyles RoadArea/TransportLink/AirLink (leaf)
-# RUN_PARMS: wms_inspire_scenario1_styles130_airlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.AirTransportNetwork.AirLink" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario1_styles130_airlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.AirTransportNetwork.AirLink" > [RESULT_DEMIME]
#
# GetMap RoadArea (no leaf)
# RUN_PARMS: wms_inspire_scenario1_map130_roadarea.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG%3A4326&BBOX=40,-70,50,-60&WIDTH=200&HEIGHT=200&LAYERS=TN.RoadTransportNetwork.RoadArea&STYLES=&FORMAT=image%2Fpng" > [RESULT_DEMIME]
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-08-08 16:53:57 UTC (rev 12026)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-08-08 17:55:47 UTC (rev 12027)
@@ -14,22 +14,22 @@
# RUN_PARMS: wms_inspire_scenario2_cap130_eng.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities&LANGUAGE=eng" > [RESULT_DEVERSION] [RESULT_DEMIME]
#
# DescribeLayer RoadArea (no leaf)
-# RUN_PARMS: wms_inspire_scenario2_describe130_roadarea.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.RoadTransportNetwork.RoadArea&SLD_VERSION=1.1.0" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario2_describe130_roadarea.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.RoadTransportNetwork.RoadArea&SLD_VERSION=1.1.0" > [RESULT_DEMIME]
# DescribeLayer RoadArea/RoadLink (leaf)
-# RUN_PARMS: wms_inspire_scenario2_describe130_roadlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer=TN.RoadTransportNetwork.RoadLink&SLD_VERSION=1.1.0" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario2_describe130_roadlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.RoadTransportNetwork.RoadLink&SLD_VERSION=1.1.0" > [RESULT_DEMIME]
# DescribeLayer RoadArea/TransportLink (no leaf)
-# RUN_PARMS: wms_inspire_scenario2_describe130_transportlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer=TN.CommonTransportElements.TransportLink&SLD_VERSION=1.1.0" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario2_describe130_transportlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.CommonTransportElements.TransportLink&SLD_VERSION=1.1.0" > [RESULT_DEMIME]
# DescribeLayer RoadArea/TransportLink/AirLink (leaf)
-# RUN_PARMS: wms_inspire_scenario2_describe130_airlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.AirTransportNetwork.AirLink&SLD_VERSION=1.1.0" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario2_describe130_airlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=DescribeLayer&LAYERS=TN.AirTransportNetwork.AirLink&SLD_VERSION=1.1.0" > [RESULT_DEMIME]
#
# GetStyles RoadArea (no leaf)
-# RUN_PARMS: wms_inspire_scenario2_styles130_roadarea.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.RoadTransportNetwork.RoadArea" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario2_styles130_roadarea.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.RoadTransportNetwork.RoadArea" > [RESULT_DEMIME]
# GetStyles RoadArea/RoadLink (leaf)
-# RUN_PARMS: wms_inspire_scenario2_styles130_roadlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.RoadTransportNetwork.RoadLink" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario2_styles130_roadlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.RoadTransportNetwork.RoadLink" > [RESULT_DEMIME]
# GetStyles RoadArea/TransportLink (no leaf)
-# RUN_PARMS: wms_inspire_scenario2_styles130_transportlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.CommonTransportElements.TransportLink" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario2_styles130_transportlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.CommonTransportElements.TransportLink" > [RESULT_DEMIME]
# GetStyles RoadArea/TransportLink/AirLink (leaf)
-# RUN_PARMS: wms_inspire_scenario2_styles130_airlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.AirTransportNetwork.AirLink" > [RESULT]
+# RUN_PARMS: wms_inspire_scenario2_styles130_airlink.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetStyles&LAYERS=TN.AirTransportNetwork.AirLink" > [RESULT_DEMIME]
#
# GetMap RoadArea (no leaf)
# RUN_PARMS: wms_inspire_scenario2_map130_roadarea.png [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&CRS=EPSG%3A4326&BBOX=40,-70,50,-60&WIDTH=200&HEIGHT=200&LAYERS=TN.RoadTransportNetwork.RoadArea&STYLES=&FORMAT=image%2Fpng" > [RESULT_DEMIME]
More information about the mapserver-commits
mailing list