[mapserver-commits] r13037 - in sandbox/inspire_soc2011: mapserver
msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Sat Feb 4 18:31:44 EST 2012
Author: schpidi
Date: 2012-02-04 15:31:44 -0800 (Sat, 04 Feb 2012)
New Revision: 13037
Modified:
sandbox/inspire_soc2011/mapserver/mapwms.c
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap_eng.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap_ger.xml
Log:
Correcting LegendURL image format in inspire sandbox (#4149).
Modified: sandbox/inspire_soc2011/mapserver/mapwms.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapwms.c 2012-02-04 22:35:58 UTC (rev 13036)
+++ sandbox/inspire_soc2011/mapserver/mapwms.c 2012-02-04 23:31:44 UTC (rev 13037)
@@ -3554,7 +3554,7 @@
}
}
else
- pszMimetype = msEncodeHTMLEntities("image/png; mode=24bit");
+ pszMimetype = msEncodeHTMLEntities("image/png");
if (nVersion >= OWS_1_3_0)
snprintf(pszLegendURL, bufferSize, "%sversion=%s&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=%s&format=%s&STYLE=%s", script_url_encoded,msOWSGetVersionString(nVersion, szVersionBuf),pszEncodedName,
@@ -3735,7 +3735,7 @@
}
}
else
- pszMimetype = msEncodeHTMLEntities("image/png; mode=24bit");
+ pszMimetype = msEncodeHTMLEntities("image/png");
if (nVersion >= OWS_1_3_0)
snprintf(pszLegendURL, bufferSize, "%sversion=%s&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=%s&format=%s&STYLE=%s", script_url_encoded,msOWSGetVersionString(nVersion, szVersionBuf),pszEncodedName,
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap.xml 2012-02-04 22:35:58 UTC (rev 13036)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap.xml 2012-02-04 23:31:44 UTC (rev 13037)
@@ -160,8 +160,8 @@
<Name>inspire_common:DEFAULT</Name>
<Title>INSPIRE Default Style</Title>
<LegendURL width="35" height="5">
- <Format>image/png; mode=24bit</Format>
- <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://www.geodaten-mv.de/dienste/inspirevs_test?language=ger&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN&format=image/png; mode=24bit&STYLE=inspire_common:DEFAULT"/>
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://www.geodaten-mv.de/dienste/inspirevs_test?language=ger&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN&format=image/png&STYLE=inspire_common:DEFAULT"/>
</LegendURL>
</Style>
<Layer queryable="0" opaque="0" cascaded="0">
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap_eng.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap_eng.xml 2012-02-04 22:35:58 UTC (rev 13036)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap_eng.xml 2012-02-04 23:31:44 UTC (rev 13037)
@@ -160,8 +160,8 @@
<Name>inspire_common:DEFAULT</Name>
<Title>INSPIRE Default Style</Title>
<LegendURL width="35" height="5">
- <Format>image/png; mode=24bit</Format>
- <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://www.geodaten-mv.de/dienste/inspirevs_test?language=eng&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN&format=image/png; mode=24bit&STYLE=inspire_common:DEFAULT"/>
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://www.geodaten-mv.de/dienste/inspirevs_test?language=eng&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN&format=image/png&STYLE=inspire_common:DEFAULT"/>
</LegendURL>
</Style>
<Layer queryable="0" opaque="0" cascaded="0">
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap_ger.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap_ger.xml 2012-02-04 22:35:58 UTC (rev 13036)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap_ger.xml 2012-02-04 23:31:44 UTC (rev 13037)
@@ -160,8 +160,8 @@
<Name>inspire_common:DEFAULT</Name>
<Title>INSPIRE Default Style</Title>
<LegendURL width="35" height="5">
- <Format>image/png; mode=24bit</Format>
- <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://www.geodaten-mv.de/dienste/inspirevs_test?language=ger&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN&format=image/png; mode=24bit&STYLE=inspire_common:DEFAULT"/>
+ <Format>image/png</Format>
+ <OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://www.geodaten-mv.de/dienste/inspirevs_test?language=ger&version=1.3.0&service=WMS&request=GetLegendGraphic&sld_version=1.1.0&layer=TN&format=image/png&STYLE=inspire_common:DEFAULT"/>
</LegendURL>
</Style>
<Layer queryable="0" opaque="0" cascaded="0">
More information about the mapserver-commits
mailing list