[mapserver-commits] r12075 - sandbox/inspire_soc2011/mapserver

[svn at osgeo.org]

Author: stefanl
Date: 2011-08-19 05:52:36 -0700 (Fri, 19 Aug 2011)
New Revision: 12075

Modified:
   sandbox/inspire_soc2011/mapserver/rfc73.rst
Log:
update of rfc based on latest feedbeek (in particular list of modified functions/additional language parameter)

Modified: sandbox/inspire_soc2011/mapserver/rfc73.rst
===================================================================
--- sandbox/inspire_soc2011/mapserver/rfc73.rst	2011-08-19 06:59:40 UTC (rev 12074)
+++ sandbox/inspire_soc2011/mapserver/rfc73.rst	2011-08-19 12:52:36 UTC (rev 12075)
@@ -7,7 +7,7 @@
 :Date:  2011/07/01
 :Author: gsoc2011
 :Contact: 
-:Last Edited:  2011/07/19
+:Last Edited:  2011/08/19
 :Status: 
 :Version: MapServer 6.2
 :Id: 
@@ -63,7 +63,8 @@
   - "wms_group_title"
   - "wms_group_abstract"
 as well as language dependent reference data like
-  - DATA "shapes/rivers.shp"
+  - DATA "road_eng"
+  - CONNECTION "db_ger"
 need to be provided in the requested language. If the language is not supported (or no language parameter is present), the default language has to be used.
 
 As suggested in Ticket 3608_, all supported languages are specified as comma separated list (first language is default) through "wms_inspire_languages" in the WEB.METADATA section of the mapfile. This language parameter is also added to the onlineresource in the GetCapabilites output.
@@ -93,17 +94,18 @@
    END
   END
   
-For language dependent reference data, a similar approach like the runtime-substitution_ feature of MapServer is followed (DATA and CONNECTION only).
+For language dependent reference data, a similar approach like the runtime-substitution_ feature of MapServer has been followed (only DATA and CONNECTION values with %language% are substituted).
 ::
 
   ...
          LAYER
           NAME TN.RoadTransportNetwork.RoadLink
           DATA "road_%language%"
-           METADATA
+          ...
+         END
   ...
 
-If the language parameter is not provided or invalid, the default language is substituted.
+If the language is not supported (or no language parameter is present), the default language is substituted.
 
 4. Provision of INSPIRE specific metadata
 -----------------------------------------
@@ -170,7 +172,7 @@
   ...
          LAYER
           NAME TN.RoadTransportNetwork.RoadLink
-          DATA road
+          DATA "road"
           METADATA
            "wms_title_eng" "Transport networks: Road Link"
            "wms_title_ger" "Verkehrsnetze: Strassensegment"
@@ -231,7 +233,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"
@@ -251,6 +253,7 @@
            END
           ...
          END
+  ...
 
 Provided that ability, 3 levels of hierarchy can be achieved as done in the example mapfiles.
 
@@ -268,7 +271,7 @@
 
 In order to implement this enhancement, the following changes need to be implemented in the MapServer codebase:
  
-1) get language from request and validate it, pass it through all functions as additional parameter
+1) get language from request and validate it
 2) detect if INSPIRE support is activated, if so add corresponding namespace
 3) output extended capabilitities with language list and INSPIRE specific metadata (depending on scenario 1 or 2)
 4) add language parameter to onlineresource in output
@@ -279,14 +282,42 @@
 6.1 Files affected
 ------------------
 
-The following files will be modified by this RFC:
+The following files will be affected by this RFC:
 
 ::
 
-  mapows.h
-  mapows.c
+  mapows.c/mapows.h
+  
+  [N] MS_DLL_EXPORT const char *msOWSLookupMetadataWithLanguage(..)
+  [N] MS_DLL_EXPORT char *msOWSGetOnlineResource2(..)
+  [N] MS_DLL_EXPORT char **msOWSGetInspireLanguageList(..)
+  [N] MS_DLL_EXPORT char *msOWSGetInspireLanguage(..)
+  [N] MS_DLL_EXPORT int msOWSPrintInspireCommonExtendedCapabilities(..)
+  [N] int msOWSPrintInspireCommonMetadata(..)
+  [N] int msOWSPrintInspireCommonLanguages(..)
+  [C] int msOWSPrintEncodeMetadata(..)  
+  [N] int msOWSPrintEncodeMetadata2(..)
+  [C] int msOWSPrintGroupMetadata(..)
+  [N] int msOWSPrintGroupMetadata2(..)
+  [C] int msOWSPrintMetadataList(..)
+  [C] int msOWSPrintEncodeMetadataList(..)  
+
   mapwms.c
+  
+  [S] int msDumpLayer(.., const char *validated_language parameter)
+  [S] void msWMSPrintNestedGroups(.., const char *validated_language parameter)
+  [S] int msWMSGetCapabilities(.., const char *requested_language parameter)
+  [C] int msWMSLoadGetMapParams(..)
+  [C] int msWMSLoadGetMapParams(..)
+  [C] int msWMSDescribeLayer(..)
+  [C] int msWMSGetLegendGraphic(..)
+  [C] int msWMSGetStyles(..)
+  [C] int msWMSDispatch(..)
 
+- [C] function changed
+- [N] new function
+- [S] signature of function also changed
+
 6.2 MapScript issues
 --------------------