[mapserver-commits] r13038 - in sandbox/inspire_soc2011: mapserver
msautotest/wxs msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Sat Feb 4 19:04:54 EST 2012
Author: schpidi
Date: 2012-02-04 16:04:54 -0800 (Sat, 04 Feb 2012)
New Revision: 13038
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_ger.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
Log:
Making style title multilingual in inspire sandbox.
Modified: sandbox/inspire_soc2011/mapserver/mapwms.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapwms.c 2012-02-04 23:31:44 UTC (rev 13037)
+++ sandbox/inspire_soc2011/mapserver/mapwms.c 2012-02-05 00:04:54 UTC (rev 13038)
@@ -2537,11 +2537,11 @@
msIO_fprintf(stdout, " <Name>%s</Name>\n", pszStyle);
/* Print the real Title or Style name otherwise */
snprintf(pszMetadataName, bufferSize, "style_%s_title", pszStyle);
- msOWSPrintEncodeMetadata(stdout, &(lp->metadata), "MO",
+ msOWSPrintEncodeMetadata2(stdout, &(lp->metadata), "MO",
pszMetadataName,
OWS_NOERR,
" <Title>%s</Title>\n",
- pszStyle);
+ pszStyle, validated_language);
/* Inside, print the legend url block */
snprintf(pszMetadataName, bufferSize, "style_%s_legendurl_href", pszStyle);
@@ -2564,11 +2564,11 @@
msIO_fprintf(stdout, " <Name>%s</Name>\n", pszStyle);
/* Print the real Title or Style name otherwise */
snprintf(pszMetadataName, bufferSize, "style_%s_title", pszStyle);
- msOWSPrintEncodeMetadata(stdout, &(lp->metadata), "MO",
+ msOWSPrintEncodeMetadata2(stdout, &(lp->metadata), "MO",
pszMetadataName,
OWS_NOERR,
" <Title>%s</Title>\n",
- pszStyle);
+ pszStyle, validated_language);
/* Inside, print the legend url block */
@@ -2690,11 +2690,11 @@
msIO_fprintf(stdout, " <Style>\n");
msIO_fprintf(stdout, " <Name>%s</Name>\n", classgroups[i]);
snprintf(pszMetadataName, bufferSize, "style_%s_title", classgroups[i]);
- msOWSPrintEncodeMetadata(stdout, &(lp->metadata), "MO",
+ msOWSPrintEncodeMetadata2(stdout, &(lp->metadata), "MO",
pszMetadataName,
OWS_NOERR,
" <Title>%s</Title>\n",
- classgroups[i]);
+ classgroups[i], validated_language);
/* A legendurl from wms_style_<style>_legendurl_href will override a self generated legend graphic */
snprintf(pszMetadataName, bufferSize, "style_%s_legendurl_href", classgroups[i]);
@@ -3504,11 +3504,11 @@
msIO_fprintf(stdout, " <Style>\n");
msIO_fprintf(stdout, " <Name>%s</Name>\n", pszEncodedStyleName);
- msOWSPrintEncodeMetadata(stdout, &(map->web.metadata), "MO",
+ msOWSPrintEncodeMetadata2(stdout, &(map->web.metadata), "MO",
"style_title",
OWS_NOERR,
" <Title>%s</Title>\n",
- styleName);
+ styleName, validated_language);
legendURL = msOWSLookupMetadata(&(map->web.metadata), "MO", "style_legendurl_href");
if (legendURL)
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap.xml 2012-02-04 23:31:44 UTC (rev 13037)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap.xml 2012-02-05 00:04:54 UTC (rev 13038)
@@ -158,7 +158,7 @@
</MetadataURL>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="35" height="5">
<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"/>
@@ -274,7 +274,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="275" height="21">
<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.CommonTransportElements.TransportArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -345,7 +345,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="275" height="21">
<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.CommonTransportElements.TransportLink&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -416,7 +416,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="275" height="21">
<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.CommonTransportElements.TransportNode&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -496,7 +496,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="227" height="21">
<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.RoadTransportNetwork.RoadLink&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -567,7 +567,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="287" height="21">
<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.RoadTransportNetwork.VehicleTrafficArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -638,7 +638,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="269" height="21">
<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.RoadTransportNetwork.RoadServiceArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -709,7 +709,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="227" height="21">
<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.RoadTransportNetwork.RoadArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -789,7 +789,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="245" height="21">
<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.RailTransportNetwork.RailwayLink&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -860,7 +860,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="287" height="21">
<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.RailTransportNetwork.RailwayStationArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -931,7 +931,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="269" height="21">
<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.RailTransportNetwork.RailwayYardArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -1002,7 +1002,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="245" height="21">
<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.RailTransportNetwork.RailwayArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
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 23:31:44 UTC (rev 13037)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_cap_ger.xml 2012-02-05 00:04:54 UTC (rev 13038)
@@ -158,7 +158,7 @@
</MetadataURL>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="35" height="5">
<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"/>
@@ -274,7 +274,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="275" height="21">
<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.CommonTransportElements.TransportArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -345,7 +345,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="275" height="21">
<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.CommonTransportElements.TransportLink&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -416,7 +416,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="275" height="21">
<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.CommonTransportElements.TransportNode&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -496,7 +496,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="227" height="21">
<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.RoadTransportNetwork.RoadLink&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -567,7 +567,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="287" height="21">
<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.RoadTransportNetwork.VehicleTrafficArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -638,7 +638,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="269" height="21">
<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.RoadTransportNetwork.RoadServiceArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -709,7 +709,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="227" height="21">
<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.RoadTransportNetwork.RoadArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -789,7 +789,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="245" height="21">
<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.RailTransportNetwork.RailwayLink&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -860,7 +860,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="287" height="21">
<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.RailTransportNetwork.RailwayStationArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -931,7 +931,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="269" height="21">
<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.RailTransportNetwork.RailwayYardArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
@@ -1002,7 +1002,7 @@
</Style>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>INSPIRE Default Style</Title>
+ <Title>INSPIRE Standard Stil</Title>
<LegendURL width="245" height="21">
<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.RailTransportNetwork.RailwayArea&format=image/png&STYLE=inspire_common:DEFAULT"/>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml 2012-02-04 23:31:44 UTC (rev 13037)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml 2012-02-05 00:04:54 UTC (rev 13038)
@@ -117,7 +117,7 @@
</MetadataURL>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>myroadarealayerstyletitle</Title>
+ <Title>myroadarealayerstyletitleeng</Title>
<LegendURL width="85" height="40">
<Format>image/png</Format>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...roadarea"/>
@@ -145,7 +145,7 @@
minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>myroadlinklayerstyletitle</Title>
+ <Title>myroadlinklayerstyletitleeng</Title>
<LegendURL width="85" height="40">
<Format>image/png</Format>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...roadlink"/>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml 2012-02-04 23:31:44 UTC (rev 13037)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml 2012-02-05 00:04:54 UTC (rev 13038)
@@ -117,7 +117,7 @@
</MetadataURL>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>myroadarealayerstyletitle</Title>
+ <Title>myroadarealayerstyletitleeng</Title>
<LegendURL width="85" height="40">
<Format>image/png</Format>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...roadarea"/>
@@ -145,7 +145,7 @@
minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>myroadlinklayerstyletitle</Title>
+ <Title>myroadlinklayerstyletitleeng</Title>
<LegendURL width="85" height="40">
<Format>image/png</Format>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...roadlink"/>
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml 2012-02-04 23:31:44 UTC (rev 13037)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml 2012-02-05 00:04:54 UTC (rev 13038)
@@ -117,7 +117,7 @@
</MetadataURL>
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>myroadarealayerstyletitle</Title>
+ <Title>myroadarealayerstyletitleger</Title>
<LegendURL width="85" height="40">
<Format>image/png</Format>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...roadarea"/>
@@ -145,7 +145,7 @@
minx="4.90936e+06" miny="-622089" maxx="5.34642e+06" maxy="-91098.1" />
<Style>
<Name>inspire_common:DEFAULT</Name>
- <Title>myroadlinklayerstyletitle</Title>
+ <Title>myroadlinklayerstyletitleger</Title>
<LegendURL width="85" height="40">
<Format>image/png</Format>
<OnlineResource xmlns:xlink="http://www.w3.org/1999/xlink" xlink:type="simple" xlink:href="http://path/to/onlineresource...roadlink"/>
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map 2012-02-04 23:31:44 UTC (rev 13037)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map 2012-02-05 00:04:54 UTC (rev 13038)
@@ -184,7 +184,8 @@
"wms_rootlayer_keywordlist" "Verkehrsnetz"
"wms_style_name" "inspire_common:DEFAULT" #style name
- "wms_style_title" "INSPIRE Default Style"
+ "wms_style_title.eng" "INSPIRE Default Style"
+ "wms_style_title.ger" "INSPIRE Standard Stil"
#"wms_style_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
#"wms_style_legendurl_height" "40"
#"wms_style_legendurl_format" "image/png"
@@ -260,7 +261,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.CommonTransportElements.TransportArea.Default_title" "Generic Area Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -311,7 +313,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.CommonTransportElements.TransportLink.Default_title" "Generic Link Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -360,7 +363,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.CommonTransportElements.TransportNode.Default_title" "Generic Node Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -425,7 +429,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.RoadTransportNetwork.RoadLink.Default_title" "RoadLink Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -474,7 +479,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.RoadTransportNetwork.VehicleTrafficArea.Default_title" "Vehicle Traffic Area Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -525,7 +531,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.RoadTransportNetwork.RoadServiceArea.Default_title" "Road Service Area Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -576,7 +583,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.RoadTransportNetwork.RoadArea.Default_title" "Road Area Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -639,7 +647,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.RailTransportNetwork.RailwayLink.Default_title" "Railway Link Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -688,7 +697,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.RailTransportNetwork.RailwayStationArea.Default_title" "Railway Station Area Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -739,7 +749,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.RailTransportNetwork.RailwayYardArea.Default_title" "Railway Yard Area Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
@@ -790,7 +801,8 @@
"wms_metadataurl_format" "text/xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_TN.RailTransportNetwork.RailwayArea.Default_title" "Railway Area Default Style"
- "wms_style_inspire_common:DEFAULT_title" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.eng" "INSPIRE Default Style"
+ "wms_style_inspire_common:DEFAULT_title.ger" "INSPIRE Standard Stil"
"wms_authorityurl_name" "GeoPortal.MV"
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2012-02-04 23:31:44 UTC (rev 13037)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2012-02-05 00:04:54 UTC (rev 13038)
@@ -109,7 +109,8 @@
"wms_metadataurl_format" "application/vnd.ogc.csw.capabilities.response_xml"
"wms_metadataurl_type" "ISO19115:2003"
"wms_style_name" "inspire_common:DEFAULT" #style name
- "wms_style_title" "myroadarealayerstyletitle" #style title
+ "wms_style_title.eng" "myroadarealayerstyletitleeng" #style title
+ "wms_style_title.ger" "myroadarealayerstyletitleger"
"wms_style_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
"wms_style_legendurl_height" "40"
"wms_style_legendurl_format" "image/png"
@@ -136,7 +137,8 @@
"wms_abstract" "myroadlinklayerabstract" #to test fallback
"wms_abstract.ger" "myroadlinklayerabstractger"
"wms_keywordlist" "myroadlinklayerkeyword1,myroadlinklayerkeyword2"
- "wms_style_inspire_common:DEFAULT_title" "myroadlinklayerstyletitle" #style title
+ "wms_style_inspire_common:DEFAULT_title.eng" "myroadlinklayerstyletitleeng" #style title
+ "wms_style_inspire_common:DEFAULT_title.ger" "myroadlinklayerstyletitleger" #style title
"wms_style_inspire_common:DEFAULT_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
"wms_style_inspire_common:DEFAULT_legendurl_height" "40"
"wms_style_inspire_common:DEFAULT_legendurl_format" "image/png"
More information about the mapserver-commits
mailing list