[mapserver-commits] r11960 - in sandbox/inspire_soc2011: mapserver
msautotest/wxs msautotest/wxs/expected
svn at osgeo.org
svn at osgeo.org
Tue Jul 19 12:00:35 EDT 2011
Author: stefanl
Date: 2011-07-19 09:00:35 -0700 (Tue, 19 Jul 2011)
New Revision: 11960
Modified:
sandbox/inspire_soc2011/mapserver/mapows.c
sandbox/inspire_soc2011/mapserver/rfc73.rst
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/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:
conformity is always set to notEvaluated
Modified: sandbox/inspire_soc2011/mapserver/mapows.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapows.c 2011-07-19 12:53:49 UTC (rev 11959)
+++ sandbox/inspire_soc2011/mapserver/mapows.c 2011-07-19 16:00:35 UTC (rev 11960)
@@ -960,7 +960,13 @@
msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "onlineresource", OWS_NOERR, " <inspire_common:ResourceLocator>\n <inspire_common:URL>%s</inspire_common:URL>\n </inspire_common:ResourceLocator>\n", NULL);
msIO_fprintf(stream," <inspire_common:ResourceType>service</inspire_common:ResourceType>\n");
msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_temporal_reference", OWS_WARN, " <inspire_common:TemporalReference>\n <inspire_common:DateOfLastRevision>%s</inspire_common:DateOfLastRevision>\n </inspire_common:TemporalReference>\n", "");
- msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_conformity", OWS_WARN, " <inspire_common:Conformity>\n <inspire_common:Degree>%s</inspire_common:Degree>\n </inspire_common:Conformity>\n", "");
+ msIO_fprintf(stream, " <inspire_common:Conformity>\n");
+ msIO_fprintf(stream, " <inspire_common:Specification>\n");
+ msIO_fprintf(stream, " <inspire_common:Title>-</inspire_common:Title>\n");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_temporal_reference", OWS_NOERR, " <inspire_common:DateOfLastRevision>%s</inspire_common:DateOfLastRevision>\n", "");
+ msIO_fprintf(stream, " </inspire_common:Specification>\n");
+ msIO_fprintf(stream, " <inspire_common:Degree>notEvaluated</inspire_common:Degree>\n");
+ msIO_fprintf(stream, " </inspire_common:Conformity>\n");
msIO_fprintf(stream, " <inspire_common:MetadataPointOfContact>\n");
msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_mpoc_name", OWS_WARN, " <inspire_common:OrganisationName>%s</inspire_common:OrganisationName>\n", "");
msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_mpoc_email", OWS_WARN, " <inspire_common:EmailAddress>%s</inspire_common:EmailAddress>\n", "");
Modified: sandbox/inspire_soc2011/mapserver/rfc73.rst
===================================================================
--- sandbox/inspire_soc2011/mapserver/rfc73.rst 2011-07-19 12:53:49 UTC (rev 11959)
+++ sandbox/inspire_soc2011/mapserver/rfc73.rst 2011-07-19 16:00:35 UTC (rev 11960)
@@ -137,7 +137,6 @@
"wms_inspire_capabilities" "embed"
"wms_inspire_languages" "eng,ger" #first default, values according ISO 639-2/B
"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" "mympoc at e.mail" #point of contact
"wms_inspire_metadatadate" "2011-09-19" #value according YYYY-MM-DD
@@ -157,6 +156,7 @@
- several fields require certain values, these values are not validated by MapServer itself, instead a manual validation against the `INSPIRE schemas`_ or the `WMS INSPIRE tester`_ is recommended
- only one keyword through "wms_inspire_keyword" is supported, a possibly provided "wms_keywordlist" will be ignored
- as suggested in this document_ regarding scenario 2, <inspire_common:ResourceType> is always set to service and <inspire_common:SpatialDataServiceType> is always set to view, both values can't be altered through the mapfile
+- conformity is always set to not evaluated, based on the latest `INSPIRE Metadata Implementing Rules`_ (page 7), a specification document, the specification date and a specification URI or URL need to be provided for degree conformant/not conformant, which is currently not implemented
5. Style section for root layer and possibly existing group layers
------------------------------------------------------------------
@@ -327,6 +327,7 @@
.. _runtime-substitution: http://mapserver.org/cgi/runsub.html
.. _inspire_soc2011: https://svn.osgeo.org/mapserver/sandbox/inspire_soc2011
.. _document: http://www.neogeo-online.net/blog/wp-content/uploads/2011/04/MAPSERVER_INSPIRE.pdf
+.. _`INSPIRE Metadata Implementing Rules`: http://inspire.jrc.ec.europa.eu/documents/Metadata/Changes_to_MD_Guidelines_from_v1-1_to_v1-2_20100616-1.pdf
.. _`concept of GROUP and CLASSGROUP`: http://lists.osgeo.org/pipermail/mapserver-inspire/2011-April/000027.html
.. _3608: http://trac.osgeo.org/mapserver/ticket/3608
.. _3850: http://trac.osgeo.org/mapserver/ticket/3850
Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml 2011-07-19 12:53:49 UTC (rev 11959)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130.xml 2011-07-19 16:00:35 UTC (rev 11960)
@@ -49,8 +49,6 @@
<Format>image/jpeg</Format>
<Format>image/gif</Format>
<Format>image/png; mode=8bit</Format>
- <Format>application/x-pdf</Format>
- <Format>image/svg+xml</Format>
<Format>image/tiff</Format>
<Format>application/vnd.google-earth.kml+xml</Format>
<Format>application/vnd.google-earth.kmz</Format>
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 2011-07-19 12:53:49 UTC (rev 11959)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_eng.xml 2011-07-19 16:00:35 UTC (rev 11960)
@@ -49,8 +49,6 @@
<Format>image/jpeg</Format>
<Format>image/gif</Format>
<Format>image/png; mode=8bit</Format>
- <Format>application/x-pdf</Format>
- <Format>image/svg+xml</Format>
<Format>image/tiff</Format>
<Format>application/vnd.google-earth.kml+xml</Format>
<Format>application/vnd.google-earth.kmz</Format>
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 2011-07-19 12:53:49 UTC (rev 11959)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario1_cap130_ger.xml 2011-07-19 16:00:35 UTC (rev 11960)
@@ -49,8 +49,6 @@
<Format>image/jpeg</Format>
<Format>image/gif</Format>
<Format>image/png; mode=8bit</Format>
- <Format>application/x-pdf</Format>
- <Format>image/svg+xml</Format>
<Format>image/tiff</Format>
<Format>application/vnd.google-earth.kml+xml</Format>
<Format>application/vnd.google-earth.kmz</Format>
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-19 12:53:49 UTC (rev 11959)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml 2011-07-19 16:00:35 UTC (rev 11960)
@@ -49,8 +49,6 @@
<Format>image/jpeg</Format>
<Format>image/gif</Format>
<Format>image/png; mode=8bit</Format>
- <Format>application/x-pdf</Format>
- <Format>image/svg+xml</Format>
<Format>image/tiff</Format>
<Format>application/vnd.google-earth.kml+xml</Format>
<Format>application/vnd.google-earth.kmz</Format>
@@ -86,16 +84,11 @@
<inspire_common:DateOfLastRevision>2011-09-19</inspire_common:DateOfLastRevision>
</inspire_common:TemporalReference>
<inspire_common:Conformity>
- <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:Title>-</inspire_common:Title>
+ <inspire_common:DateOfLastRevision>2011-09-19</inspire_common:DateOfLastRevision>
</inspire_common:Specification>
- <inspire_common:Degree>conformant</inspire_common:Degree>
+ <inspire_common:Degree>notEvaluated</inspire_common:Degree>
</inspire_common:Conformity>
<inspire_common:MetadataPointOfContact>
<inspire_common:OrganisationName>mympocname</inspire_common:OrganisationName>
@@ -106,13 +99,6 @@
<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>
<inspire_common:SupportedLanguage><inspire_common:Language>ger</inspire_common:Language></inspire_common:SupportedLanguage>
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-19 12:53:49 UTC (rev 11959)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml 2011-07-19 16:00:35 UTC (rev 11960)
@@ -49,8 +49,6 @@
<Format>image/jpeg</Format>
<Format>image/gif</Format>
<Format>image/png; mode=8bit</Format>
- <Format>application/x-pdf</Format>
- <Format>image/svg+xml</Format>
<Format>image/tiff</Format>
<Format>application/vnd.google-earth.kml+xml</Format>
<Format>application/vnd.google-earth.kmz</Format>
@@ -86,16 +84,11 @@
<inspire_common:DateOfLastRevision>2011-09-19</inspire_common:DateOfLastRevision>
</inspire_common:TemporalReference>
<inspire_common:Conformity>
- <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:Title>-</inspire_common:Title>
+ <inspire_common:DateOfLastRevision>2011-09-19</inspire_common:DateOfLastRevision>
</inspire_common:Specification>
- <inspire_common:Degree>conformant</inspire_common:Degree>
+ <inspire_common:Degree>notEvaluated</inspire_common:Degree>
</inspire_common:Conformity>
<inspire_common:MetadataPointOfContact>
<inspire_common:OrganisationName>mympocname</inspire_common:OrganisationName>
@@ -106,13 +99,6 @@
<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>
<inspire_common:SupportedLanguage><inspire_common:Language>ger</inspire_common:Language></inspire_common:SupportedLanguage>
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-19 12:53:49 UTC (rev 11959)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml 2011-07-19 16:00:35 UTC (rev 11960)
@@ -49,8 +49,6 @@
<Format>image/jpeg</Format>
<Format>image/gif</Format>
<Format>image/png; mode=8bit</Format>
- <Format>application/x-pdf</Format>
- <Format>image/svg+xml</Format>
<Format>image/tiff</Format>
<Format>application/vnd.google-earth.kml+xml</Format>
<Format>application/vnd.google-earth.kmz</Format>
@@ -86,16 +84,11 @@
<inspire_common:DateOfLastRevision>2011-09-19</inspire_common:DateOfLastRevision>
</inspire_common:TemporalReference>
<inspire_common:Conformity>
- <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:Title>-</inspire_common:Title>
+ <inspire_common:DateOfLastRevision>2011-09-19</inspire_common:DateOfLastRevision>
</inspire_common:Specification>
- <inspire_common:Degree>conformant</inspire_common:Degree>
+ <inspire_common:Degree>notEvaluated</inspire_common:Degree>
</inspire_common:Conformity>
<inspire_common:MetadataPointOfContact>
<inspire_common:OrganisationName>mympocname</inspire_common:OrganisationName>
@@ -106,13 +99,6 @@
<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>
<inspire_common:SupportedLanguage><inspire_common:Language>ger</inspire_common:Language></inspire_common:SupportedLanguage>
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-07-19 12:53:49 UTC (rev 11959)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map 2011-07-19 16:00:35 UTC (rev 11960)
@@ -37,7 +37,6 @@
"wms_inspire_capabilities" "embed" #enables inspire using scenario 2
"wms_inspire_languages" "eng,ger" #first default, values according ISO 639-2/B
"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" "mympoc at e.mail" #point of contact
"wms_inspire_metadatadate" "2011-09-19"
More information about the mapserver-commits
mailing list