[mapserver-commits] r11948 - in sandbox/inspire_soc2011/msautotest/wxs: . expected

svn at osgeo.org svn at osgeo.org
Mon Jul 18 05:51:55 EDT 2011


Author: schpidi
Date: 2011-07-18 02:51:55 -0700 (Mon, 18 Jul 2011)
New Revision: 11948

Modified:
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
   sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
Log:
SoC INSPIRE View Service: Adjusting expected results of scenario 2 to validate.


Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml	2011-07-18 09:27:29 UTC (rev 11947)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml	2011-07-18 09:51:55 UTC (rev 11948)
@@ -86,16 +86,32 @@
       <inspire_common:DateOfLastRevision>2011-09-19</inspire_common:DateOfLastRevision>
     </inspire_common:TemporalReference>
     <inspire_common:Conformity>
-      <inspire_common:Degree>not evaluated</inspire_common:Degree>
+      <inspire_common:Specification xsi:type="inspire_common:citationInspireInteroperabilityRegulation_eng">
+        <inspire_common:Title>COMMISSION REGULATION (EU) No 1089/2010 of 23 November 2010 implementing Directive 2007/2/EC of the European Parliament and of the Council as regards interoperability of spatial data sets and services</inspire_common:Title>
+        <inspire_common:DateOfPublication>2010-12-08</inspire_common:DateOfPublication>
+        <inspire_common:URI>OJ:L:2010:323:0011:0102:EN:PDF</inspire_common:URI>
+        <inspire_common:ResourceLocator>
+          <inspire_common:URL>http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2010:323:0011:0102:EN:PDF</inspire_common:URL>
+          <inspire_common:MediaType>application/pdf</inspire_common:MediaType>
+        </inspire_common:ResourceLocator>
+      </inspire_common:Specification>
+      <inspire_common:Degree>conformant</inspire_common:Degree>
     </inspire_common:Conformity>
     <inspire_common:MetadataPointOfContact>
       <inspire_common:OrganisationName>mympocname</inspire_common:OrganisationName>
-      <inspire_common:EmailAddress>mympocemail</inspire_common:EmailAddress>
+      <inspire_common:EmailAddress>mympoc at e.mail</inspire_common:EmailAddress>
     </inspire_common:MetadataPointOfContact>
       <inspire_common:MetadataDate>2011-09-19</inspire_common:MetadataDate>
     <inspire_common:SpatialDataServiceType>view</inspire_common:SpatialDataServiceType>
-    <inspire_common:Keyword xsi:type='inspire_common:classificationOfSpatialDataService'>
+    <inspire_common:MandatoryKeyword xsi:type='inspire_common:classificationOfSpatialDataService'>
       <inspire_common:KeywordValue>infoMapAccessService</inspire_common:KeywordValue>
+    </inspire_common:MandatoryKeyword>
+    <inspire_common:Keyword xsi:type="inspire_common:inspireTheme_eng">
+      <inspire_common:OriginatingControlledVocabulary>
+        <inspire_common:Title>GEMET - INSPIRE themes</inspire_common:Title>
+        <inspire_common:DateOfPublication>2008-06-01</inspire_common:DateOfPublication>
+      </inspire_common:OriginatingControlledVocabulary>
+      <inspire_common:KeywordValue>Transport networks</inspire_common:KeywordValue>
     </inspire_common:Keyword>
     <inspire_common:SupportedLanguages>
       <inspire_common:DefaultLanguage><inspire_common:Language>eng</inspire_common:Language></inspire_common:DefaultLanguage>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml	2011-07-18 09:27:29 UTC (rev 11947)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml	2011-07-18 09:51:55 UTC (rev 11948)
@@ -86,16 +86,32 @@
       <inspire_common:DateOfLastRevision>2011-09-19</inspire_common:DateOfLastRevision>
     </inspire_common:TemporalReference>
     <inspire_common:Conformity>
-      <inspire_common:Degree>not evaluated</inspire_common:Degree>
+      <inspire_common:Specification xsi:type="inspire_common:citationInspireInteroperabilityRegulation_eng">
+        <inspire_common:Title>COMMISSION REGULATION (EU) No 1089/2010 of 23 November 2010 implementing Directive 2007/2/EC of the European Parliament and of the Council as regards interoperability of spatial data sets and services</inspire_common:Title>
+        <inspire_common:DateOfPublication>2010-12-08</inspire_common:DateOfPublication>
+        <inspire_common:URI>OJ:L:2010:323:0011:0102:EN:PDF</inspire_common:URI>
+        <inspire_common:ResourceLocator>
+          <inspire_common:URL>http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2010:323:0011:0102:EN:PDF</inspire_common:URL>
+          <inspire_common:MediaType>application/pdf</inspire_common:MediaType>
+        </inspire_common:ResourceLocator>
+      </inspire_common:Specification>
+      <inspire_common:Degree>conformant</inspire_common:Degree>
     </inspire_common:Conformity>
     <inspire_common:MetadataPointOfContact>
       <inspire_common:OrganisationName>mympocname</inspire_common:OrganisationName>
-      <inspire_common:EmailAddress>mympocemail</inspire_common:EmailAddress>
+      <inspire_common:EmailAddress>mympoc at e.mail</inspire_common:EmailAddress>
     </inspire_common:MetadataPointOfContact>
       <inspire_common:MetadataDate>2011-09-19</inspire_common:MetadataDate>
     <inspire_common:SpatialDataServiceType>view</inspire_common:SpatialDataServiceType>
-    <inspire_common:Keyword xsi:type='inspire_common:classificationOfSpatialDataService'>
+    <inspire_common:MandatoryKeyword xsi:type='inspire_common:classificationOfSpatialDataService'>
       <inspire_common:KeywordValue>infoMapAccessService</inspire_common:KeywordValue>
+    </inspire_common:MandatoryKeyword>
+    <inspire_common:Keyword xsi:type="inspire_common:inspireTheme_eng">
+      <inspire_common:OriginatingControlledVocabulary>
+        <inspire_common:Title>GEMET - INSPIRE themes</inspire_common:Title>
+        <inspire_common:DateOfPublication>2008-06-01</inspire_common:DateOfPublication>
+      </inspire_common:OriginatingControlledVocabulary>
+      <inspire_common:KeywordValue>Transport networks</inspire_common:KeywordValue>
     </inspire_common:Keyword>
     <inspire_common:SupportedLanguages>
       <inspire_common:DefaultLanguage><inspire_common:Language>eng</inspire_common:Language></inspire_common:DefaultLanguage>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml	2011-07-18 09:27:29 UTC (rev 11947)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml	2011-07-18 09:51:55 UTC (rev 11948)
@@ -86,16 +86,32 @@
       <inspire_common:DateOfLastRevision>2011-09-19</inspire_common:DateOfLastRevision>
     </inspire_common:TemporalReference>
     <inspire_common:Conformity>
-      <inspire_common:Degree>not evaluated</inspire_common:Degree>
+      <inspire_common:Specification xsi:type="inspire_common:citationInspireInteroperabilityRegulation_eng">
+        <inspire_common:Title>COMMISSION REGULATION (EU) No 1089/2010 of 23 November 2010 implementing Directive 2007/2/EC of the European Parliament and of the Council as regards interoperability of spatial data sets and services</inspire_common:Title>
+        <inspire_common:DateOfPublication>2010-12-08</inspire_common:DateOfPublication>
+        <inspire_common:URI>OJ:L:2010:323:0011:0102:EN:PDF</inspire_common:URI>
+        <inspire_common:ResourceLocator>
+          <inspire_common:URL>http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=OJ:L:2010:323:0011:0102:EN:PDF</inspire_common:URL>
+          <inspire_common:MediaType>application/pdf</inspire_common:MediaType>
+        </inspire_common:ResourceLocator>
+      </inspire_common:Specification>
+      <inspire_common:Degree>conformant</inspire_common:Degree>
     </inspire_common:Conformity>
     <inspire_common:MetadataPointOfContact>
       <inspire_common:OrganisationName>mympocname</inspire_common:OrganisationName>
-      <inspire_common:EmailAddress>mympocemail</inspire_common:EmailAddress>
+      <inspire_common:EmailAddress>mympoc at e.mail</inspire_common:EmailAddress>
     </inspire_common:MetadataPointOfContact>
       <inspire_common:MetadataDate>2011-09-19</inspire_common:MetadataDate>
     <inspire_common:SpatialDataServiceType>view</inspire_common:SpatialDataServiceType>
-    <inspire_common:Keyword xsi:type='inspire_common:classificationOfSpatialDataService'>
+    <inspire_common:MandatoryKeyword xsi:type='inspire_common:classificationOfSpatialDataService'>
       <inspire_common:KeywordValue>infoMapAccessService</inspire_common:KeywordValue>
+    </inspire_common:MandatoryKeyword>
+    <inspire_common:Keyword xsi:type="inspire_common:inspireTheme_ger">
+      <inspire_common:OriginatingControlledVocabulary>
+        <inspire_common:Title>GEMET - INSPIRE themes</inspire_common:Title>
+        <inspire_common:DateOfPublication>2008-06-01</inspire_common:DateOfPublication>
+      </inspire_common:OriginatingControlledVocabulary>
+      <inspire_common:KeywordValue>Verkehrsnetze</inspire_common:KeywordValue>
     </inspire_common:Keyword>
     <inspire_common:SupportedLanguages>
       <inspire_common:DefaultLanguage><inspire_common:Language>eng</inspire_common:Language></inspire_common:DefaultLanguage>

Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2011-07-18 09:27:29 UTC (rev 11947)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2011-07-18 09:51:55 UTC (rev 11948)
@@ -39,7 +39,7 @@
   "wms_inspire_temporal_reference" "2011-09-19"                                 #date of last revision, value according YYYY-MM-DD
   "wms_inspire_conformity" "not evaluated"                                      #value either "conformant"|"not conformant"|default "not evaluated"
   "wms_inspire_mpoc_name" "mympocname"                                          #point of contact
-  "wms_inspire_mpoc_email" "mympocemail"                                        #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"



More information about the mapserver-commits mailing list