[mapserver-commits] r12067 - in sandbox/inspire_soc2011/msautotest/wxs: . data

[svn at osgeo.org]

Author: stefanl
Date: 2011-08-18 11:52:22 -0700 (Thu, 18 Aug 2011)
New Revision: 12067

Added:
   sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.dbf
   sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.sbn
   sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.sbx
   sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.shp
   sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.shx
   sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.dbf
   sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.sbn
   sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.sbx
   sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.shp
   sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.shx
Modified:
   sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
   sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
Log:
no need for option wms_inspire_languagesubstitution as languageparameter will always be appended to onlineresource, similar approach to runtimesubstitution is followed with %language% for DATA resp. CONNECTION metadata, language substituion parameter is automatically validated against inspire_languages, if missing/invalid then substitution with default value is applied

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.dbf
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.dbf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.sbn
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.sbn
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.sbx
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.sbx
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.shp
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.shp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.shx
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_eng.shx
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.dbf
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.dbf
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.sbn
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.sbn
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.sbx
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.sbx
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.shp
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.shp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.shx
===================================================================
(Binary files differ)


Property changes on: sandbox/inspire_soc2011/msautotest/wxs/data/road_ger.shx
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map	2011-08-17 17:46:11 UTC (rev 12066)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map	2011-08-18 18:52:22 UTC (rev 12067)
@@ -74,7 +74,6 @@
   "wms_inspire_languages" "eng,ger"                                             #first default, values according ISO 639-2/B
   "wms_metadataurl_href" "http://inspire.service/metadata"
   "wms_metadataurl_format" "application/vnd.ogc.csw.capabilities.response_xml"
-  "wms_inspire_languagesubstitution" "true"                                     #add language parameter to onlineresource
   "wms_inspire_keyword" "infoMapAccessService"                                  #value according "classification of spatial data services"
   "wms_title_eng" "myservicetitle"
   "wms_title_ger" "myservicetitleger"
@@ -127,7 +126,7 @@
 
 LAYER
  NAME TN.RoadTransportNetwork.RoadLink
- DATA road
+ DATA "road_%language%"
  METADATA
   "wms_title_eng" "Transport networks: Road Link"
   "wms_title_ger" "Verkehrsnetze: Straßensegment"
@@ -168,7 +167,7 @@
 LAYER
  NAME TN.RailTransportNetwork.RailwayLink
  GROUP TN.CommonTransportElements.TransportLink
- DATA road
+ DATA "road"
  METADATA
   "wms_group_title_eng" "Transport networks: Generic Transport Link"
   "wms_group_title_ger" "Verkehrsnetze: Generisches Verkehrssegment"
@@ -212,7 +211,7 @@
 LAYER
  NAME TN.AirTransportNetwork.AirLink
  GROUP TN.CommonTransportElements.TransportLink
- DATA road
+ DATA "road"
  METADATA
   "wms_title_eng" "Transport networks: Air Link"
   "wms_title_ger" "Verkehrsnetze: Luftverbindung"

Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2011-08-17 17:46:11 UTC (rev 12066)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2011-08-18 18:52:22 UTC (rev 12067)
@@ -76,7 +76,6 @@
   "wms_inspire_mpoc_name" "mympocname"                                          #point of contact
   "wms_inspire_mpoc_email" "mympoc at e.mail"                                      #point of contact
   "wms_inspire_metadatadate" "2011-09-19" 
-  "wms_inspire_languagesubstitution" "true"                                     #add language parameter to onlineresource
   "wms_inspire_keyword" "infoMapAccessService"                                  #value according "classification of spatial data services"
   "wms_title_eng" "myservicetitle"
   "wms_title_ger" "myservicetitleger"
@@ -129,7 +128,7 @@
 
 LAYER
  NAME TN.RoadTransportNetwork.RoadLink
- DATA road
+ DATA "road_%language%"
  METADATA
   "wms_title_eng" "Transport networks: Road Link"
   "wms_title_ger" "Verkehrsnetze: Straßensegment"
@@ -170,7 +169,7 @@
 LAYER
  NAME TN.RailTransportNetwork.RailwayLink
  GROUP TN.CommonTransportElements.TransportLink
- DATA road
+ DATA "road"
  METADATA
   "wms_group_title_eng" "Transport networks: Generic Transport Link"
   "wms_group_title_ger" "Verkehrsnetze: Generisches Verkehrssegment"
@@ -214,7 +213,7 @@
 LAYER
  NAME TN.AirTransportNetwork.AirLink
  GROUP TN.CommonTransportElements.TransportLink
- DATA road
+ DATA "road"
  METADATA
   "wms_title_eng" "Transport networks: Air Link"
   "wms_title_ger" "Verkehrsnetze: Luftverbindung"