diff --git a/.github/workflows/build-adocs.yml b/.github/workflows/build-adocs.yml index 3e7a296..e0632f7 100644 --- a/.github/workflows/build-adocs.yml +++ b/.github/workflows/build-adocs.yml @@ -17,12 +17,7 @@ jobs: id: adocbuild-datasets uses: avattathil/asciidoctor-action@master with: - program: "asciidoctor -a variant-dataset -a docinfo1 -T templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'" - - name: Build services variant - id: adocbuild-services - uses: avattathil/asciidoctor-action@master - with: - program: "asciidoctor -a variant-service -a docinfo1 -T templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'" + program: "asciidoctor -a docinfo1 -T templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'" - name: Deploy docs to ghpages uses: peaceiris/actions-gh-pages@v3 with: diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index c218947..5c14e74 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -18,12 +18,7 @@ jobs: id: adocbuild-datasets uses: avattathil/asciidoctor-action@master with: - program: "asciidoctor -a variant-dataset -a docinfo1 -T docs/templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'" - - name: Build services variant - id: adocbuild-services - uses: avattathil/asciidoctor-action@master - with: - program: "asciidoctor -a variant-service -a docinfo1 -T docs/templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'" + program: "asciidoctor -a docinfo1 -T docs/templates -E slim 'docs/*.asciidoc' 'docs/*.adoc'" - name: Deploy docs to ghpages uses: peaceiris/actions-gh-pages@v3 with: diff --git a/README.md b/README.md index 00f1c16..cc904a7 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ Resources relating to the UK Gemini metadata profile Pull requests accepted to this branch get published to the GitPages repository at https://agiorguk.github.io/gemini/ -The published version of GEMINI 2.3 lives at https://www.agi.org.uk/gemini/1037-uk-gemini-standard-and-inspire-implementing-rules/ +The published version of GEMINI 2.3 lives at https://agiorguk.github.io/gemini/1037-uk-gemini-introduction.html -This is the place to raise and manage issues +Old home page: https://agiorguk.github.io/gemini/1037-uk-gemini-standard-and-inspire-implementing-rules.html (redirect from https://www.agi.org.uk/gemini/1037-uk-gemini-standard-and-inspire-implementing-rules/) + +This GitHub repository is the place to raise and manage issues diff --git a/docs/1037-uk-gemini-introduction.asciidoc b/docs/1037-uk-gemini-introduction.asciidoc index 7982eb8..94e673e 100644 --- a/docs/1037-uk-gemini-introduction.asciidoc +++ b/docs/1037-uk-gemini-introduction.asciidoc @@ -5,45 +5,27 @@ This page describes the requirements and guidance for metadata conforming to the UK standard known as UK GEMINI. There are several entry points to the guidance: -* link:1062-gemini-datasets-and-data-series.html[GEMINI -for datasets and series] -* link:1063-gemini-services.html[GEMINI for -services] +* link:1062-gemini-datasets-and-data-series.html[GEMINI for datasets and series] +* link:1063-gemini-services.html[GEMINI for services] + * Other material -** link:1052-metadata-guidelines-for-geospatial-data-resources-part-1.html[General -introduction to metadata for geographic information] -** link:1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.html[General -introduction to GEMINI] -** link:1049-metadata-guidelines-for-geospatial-data-resources-part-2.html[General -guidance for GEMINI] -** link:048-uk-gemini-encoding-guidance.html[General -guidance on the XML encoding of GEMINI] -** https://github.com/AGIGemini/Schematron[Schematron rules for -validating GEMINI records (GitHub link)] -** link:40-gemini/1056-glossary.html[Glossary of terms] -** link:1047-metadata-guidelines-for-geospatial-data-resources-part-3.html[List -of references] -** link:053-common-metadata-errors-uk-location-discovery-metadata-service.html[Common -errors] - -Conformance to GEMINI should ensure conformance to the INSPIRE -Implementing Rules. UK specific guidance is provided. If you're -thinking, why GEMINI? Why not just use the INSPIRE Metadata guidance or -the ISO standards?{nbsp}https://www.agi.org.uk/why-uk-gemini/[Click here for -some -reasons.]{nbsp}The{nbsp}https://www.gov.uk/government/publications/recommended-open-standards-for-government/using-metadata-to-describe-data-shared-within-government[UK -Government Digital Service recommends using GEMINI when describing -geographic data]{nbsp}and it is the preferred way to catalogue geographic -data and services at Data.gov.uk. - -Both UK GEMINI and the INSPIRE Technical Guidance have been developed -from the International -Standard{nbsp}http://www.iso.org/iso/catalogue_detail?csnumber=26020[ISO -19115:2003]{nbsp}Geographic information - Metadata, with supplementary -material from ISO 19119:2005 Geographic information - Services. The XML -encoding follows ISO 19139:2007 Geographic information - Metadata - XML -encoding. This means that a GEMINI record is widely understood by -geospatial software and users internationally. +** link:1052-metadata-guidelines-for-geospatial-data-resources-part-1.html[General introduction to metadata for geographic information] +** link:1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.html[General introduction to GEMINI] +** link:1049-metadata-guidelines-for-geospatial-data-resources-part-2.html[General guidance for GEMINI] +** link:1048-uk-gemini-encoding-guidance.html[General guidance on the XML encoding of GEMINI] +** https://github.com/AGIGemini/Schematron[Schematron rules for validating GEMINI records (GitHub link)] +** link:1040-gemini/1056-glossary.html[Glossary of terms] +** link:1047-metadata-guidelines-for-geospatial-data-resources-part-3.html[List of references] +** link:1053-common-metadata-errors-uk-location-discovery-metadata-service.html[Common errors] + +Conformance to GEMINI should ensure conformance to the INSPIRE Implementing Rules. UK specific guidance is provided. + +If you're thinking, why GEMINI? Why not just use the INSPIRE Metadata guidance or the ISO standards?{nbsp}https://www.agi.org.uk/why-uk-gemini/[Click here for some reasons.] + +The https://www.gov.uk/government/publications/recommended-open-standards-for-government/using-metadata-to-describe-data-shared-within-government[UK Government Digital Service recommends using GEMINI when describing geographic data] +and it is the preferred way to catalogue geographic data and services at Data.gov.uk. + +Both UK GEMINI and the INSPIRE Technical Guidance have been developed from the International Standard +http://www.iso.org/iso/catalogue_detail?csnumber=26020[ISO 19115:2003] Geographic information - Metadata, with supplementary material from ISO 19119:2005 Geographic information - Services. +The XML encoding follows ISO 19139:2007 Geographic information - Metadata - XML encoding. This means that a GEMINI record is widely understood by geospatial software and users internationally. Note that GEMINI (and the INSPIRE Guidance) are about metadata for datasets, series, and services (collectively, 'resources'); not @@ -55,26 +37,19 @@ here may not be appropriate and the resulting record could not be validated as a GEMINI (or INSPIRE) record. Here is -a{nbsp}link:055-uk-gemini-major-changes-since-1-0.html[summary -of changes]{nbsp}from earlier versions. +a link:1055-uk-gemini-major-changes-since-1-0.html[summary of changes] from earlier versions. -Here is -a{nbsp}link:1250-element-summary.html/[summary]{nbsp}of -the GEMINI elements (similar to Table 1 and Table 2 in GEMINI 2.2). +Here is a link:1250-element-summary.html/[summary] of the GEMINI elements (similar to Table 1 and Table 2 in GEMINI 2.2). Note: in GEMINI 2.3, the GEMINI Element number is called "GEMINI id"; -the actual numbers have not changed, where the same element was in -GEMINI 2.2. +the actual numbers have not changed, where the same element was in GEMINI 2.2. == Software that implements GEMINI 2.3 Several software implementations exist and are in use across the UK: -* https://geonetwork-opensource.org/[GeoNetwork Open -Source]{nbsp}-{nbsp}https://github.com/AstunTechnology/iso19139.gemini23[GEMINI -plugin]: server software in use in several government departments -* https://www.medin.org.uk/data/submit-metadata[MEDIN metadata editors]: -online and downloadable client editors for the MEDIN community profile +* https://geonetwork-opensource.org/[GeoNetwork Open Source] {nbsp}-{nbsp}https://github.com/AstunTechnology/iso19139.gemini23[GEMINI plugin]: server software in use in several government departments +* https://www.medin.org.uk/data/submit-metadata[MEDIN metadata editors]: online and downloadable client editors for the MEDIN community profile == Feedback @@ -83,13 +58,9 @@ that there may be some errors and inconsistencies in the content, therefore we would like to hear from you if you spot any of these or you would like to see improvements in terms of presentation and usability. -Please send any comments -to{nbsp}mailto:gemini@agi.org.uk?subject=GEMINI2.3%20feedback[gemini@agi.org.uk] +Please send any comments to{nbsp}mailto:gemini@agi.org.uk?subject=GEMINI2.3%20feedback[gemini@agi.org.uk] _Last updated: June 2021_ -http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/l/by/4.0/88x31.png[Creative -Commons Licence]] + -This work is licensed under -a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons -Attribution 4.0 International License] +http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/l/by/4.0/88x31.png[Creative Commons Licence]] + +This work is licensed under a{nbsp}http://creativecommons.org/licenses/by/4.0/[Creative Commons Attribution 4.0 International License] diff --git a/docs/1048-uk-gemini-encoding-guidance.asciidoc b/docs/1048-uk-gemini-encoding-guidance.asciidoc index 4125417..d37436a 100644 --- a/docs/1048-uk-gemini-encoding-guidance.asciidoc +++ b/docs/1048-uk-gemini-encoding-guidance.asciidoc @@ -491,7 +491,7 @@ only one date with type 'revision'. 2010-01-13 - revision + revision @@ -553,7 +553,7 @@ only one date with type 'revision'. - author + author ... @@ -591,7 +591,8 @@ Figure 13 shows the encoding where a code list is specified in ISO 19115. The value of the codeList attribute should be the URL for the ISO 19115 code list catalogue that is published on the ISO website: -https://standards.iso.org/iso/19139/resources/gmxCodelists.xml[https://schemas.isotc211.org/schemas/19139/resources/gmxCodelists.xml] +https://standards.iso.org/iso/19139/resources/gmxCodelists.xml[https://standards.iso.org/iso/19139/resources/gmxCodelists.xml] +or on the ISO/TC 211 resources site https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml[https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml] Plus a hash character acting as a delimiter, and then the identifier of the code list, in this case ‘MD_ScopeCode’, that contains the code list @@ -612,7 +613,7 @@ attribute gmd:codeListValue. *Figure 13 - Code list* [source, xml] ---- -dataset ---- @@ -905,7 +906,7 @@ for IPR reasons, and with a web page describing licences otherRestrictions @@ -919,7 +920,7 @@ for IPR reasons, and with a web page describing licences otherRestrictions @@ -943,7 +944,7 @@ text. otherRestrictions @@ -957,7 +958,7 @@ text. otherRestrictions @@ -980,7 +981,7 @@ access, but plain text conditions of use. otherRestrictions @@ -994,7 +995,7 @@ access, but plain text conditions of use. otherRestrictions @@ -1029,7 +1030,7 @@ series, ISO 19115 hierarchyLevelName element must also be set, to ... - dataset + dataset ... @@ -1067,7 +1068,7 @@ set, to "service". ... service diff --git a/docs/1049-metadata-guidelines-for-geospatial-data-resources-part-2.asciidoc b/docs/1049-metadata-guidelines-for-geospatial-data-resources-part-2.asciidoc index 5db4607..d032a7a 100644 --- a/docs/1049-metadata-guidelines-for-geospatial-data-resources-part-2.asciidoc +++ b/docs/1049-metadata-guidelines-for-geospatial-data-resources-part-2.asciidoc @@ -78,9 +78,9 @@ service. The type of resource is identified in the element Resource Type Detailed guidance on how to create each of these elements can be found here: -link:datasets.html[GEMINI - Datasets and data series] +link:1062-gemini-datasets-and-data-series.html[GEMINI - Datasets and data series] -link:services.html[GEMINI - Services] +link:1063-gemini-services.html[GEMINI - Services] === Additional metadata elements diff --git a/docs/1053-common-metadata-errors-uk-location-discovery-metadata-service.asciidoc b/docs/1053-common-metadata-errors-uk-location-discovery-metadata-service.asciidoc index ac0d55f..bd86215 100644 --- a/docs/1053-common-metadata-errors-uk-location-discovery-metadata-service.asciidoc +++ b/docs/1053-common-metadata-errors-uk-location-discovery-metadata-service.asciidoc @@ -203,7 +203,7 @@ gmd:DQ_Scope/gmd:levelDescription element, such as: ---- - service + service @@ -374,14 +374,14 @@ in most records. [source,xml] ---- -information +information ---- Should be [source,xml] ---- -information +information ---- (a lower case ‘c’ in the first occurrence of ‘codelist’ within the URL) diff --git a/docs/1062-gemini-datasets-and-data-series.adoc b/docs/1062-gemini-datasets-and-data-series.adoc index b2c202f..f5cd235 100644 --- a/docs/1062-gemini-datasets-and-data-series.adoc +++ b/docs/1062-gemini-datasets-and-data-series.adoc @@ -52,82 +52,82 @@ Return to link:1037-uk-gemini-introduction.html[GEMINI == Metadata about the metadata record -include::./partials/metadatadate.asciidoc[] +include::./partials/metadatadate.asciidoc[tag=!service] -include::./partials/metadatalanguage.asciidoc[] +include::./partials/metadatalanguage.asciidoc[tag=!service] -include::./partials/metadatapointofcontact.asciidoc[] +include::./partials/metadatapointofcontact.asciidoc[tag=!service] -include::./partials/resourcetype.asciidoc[] +include::./partials/resourcetype.asciidoc[tag=!service] -include::./partials/fileidentifier.asciidoc[] +include::./partials/fileidentifier.asciidoc[tag=!service] -include::./partials/hierarchylevelname.asciidoc[] +include::./partials/hierarchylevelname.asciidoc[tag=!service] -include::./partials/parentidentifier.asciidoc[] +include::./partials/parentidentifier.asciidoc[tag=!service] -include::./partials/metadatastandardname.asciidoc[] +include::./partials/metadatastandardname.asciidoc[tag=!service] -include::./partials/metadatastandardversion.asciidoc[] +include::./partials/metadatastandardversion.asciidoc[tag=!service] Go to <> == Metadata about the resource -include::./partials/title.asciidoc[] +include::./partials/title.asciidoc[tag=!service] -include::./partials/alternatetitle.asciidoc[] +include::./partials/alternatetitle.asciidoc[tag=!service] -include::./partials/datasetlanguage.asciidoc[] +include::./partials/datasetlanguage.asciidoc[tag=!service] -include::./partials/abstract.asciidoc[] +include::./partials/abstract.asciidoc[tag=!service] -include::./partials/topiccategory.asciidoc[] +include::./partials/topiccategory.asciidoc[tag=!service] -include::./partials/keyword.asciidoc[] +include::./partials/keyword.asciidoc[tag=!service] -include::./partials/temporalextent.asciidoc[] +include::./partials/temporalextent.asciidoc[tag=!service] -include::./partials/datasetreferencedate.asciidoc[] +include::./partials/datasetreferencedate.asciidoc[tag=!service] -include::./partials/lineage.asciidoc[] +include::./partials/lineage.asciidoc[tag=!service] -include::./partials/extent.asciidoc[] +include::./partials/extent.asciidoc[tag=!service] -include::./partials/verticalextent.asciidoc[] +include::./partials/verticalextent.asciidoc[tag=!service] -include::./partials/spatialreferencesystem.asciidoc[] +include::./partials/spatialreferencesystem.asciidoc[tag=!service] -include::./partials/spatialresolution.asciidoc[] +include::./partials/spatialresolution.asciidoc[tag=!service] -include::./partials/resourcelocator.asciidoc[] +include::./partials/resourcelocator.asciidoc[tag=!service] -include::./partials/dataformat.asciidoc[] +include::./partials/dataformat.asciidoc[tag=!service] -include::./partials/responsibleorganisation.asciidoc[] +include::./partials/responsibleorganisation.asciidoc[tag=!service] -include::./partials/limitationsonpublicaccess.asciidoc[] +include::./partials/limitationsonpublicaccess.asciidoc[tag=!service] -include::./partials/useconstraints.asciidoc[] +include::./partials/useconstraints.asciidoc[tag=!service] -include::./partials/additionalinformation.asciidoc[] +include::./partials/additionalinformation.asciidoc[tag=!service] -include::./partials/resourceidentifier.asciidoc[] +include::./partials/resourceidentifier.asciidoc[tag=!service] -include::./partials/conformity.asciidoc[] +include::./partials/conformity.asciidoc[tag=!service] -include::./partials/equivalentscale.asciidoc[] +include::./partials/equivalentscale.asciidoc[tag=!service] -include::./partials/boundingbox.asciidoc[] +include::./partials/boundingbox.asciidoc[tag=!service] -include::./partials/qualityscope.asciidoc[] +include::./partials/qualityscope.asciidoc[tag=!service] -include::./partials/spatialrepresentationtype.asciidoc[] +include::./partials/spatialrepresentationtype.asciidoc[tag=!service] -include::./partials/characterencoding.asciidoc[] +include::./partials/characterencoding.asciidoc[tag=!service] -include::./partials/dataquality.asciidoc[] +include::./partials/dataquality.asciidoc[tag=!service] -include::./partials/maintenanceinformation.asciidoc[] +include::./partials/maintenanceinformation.asciidoc[tag=!service] Go to <> diff --git a/docs/1063-gemini-services.adoc b/docs/1063-gemini-services.adoc index 84324e5..910c5cf 100644 --- a/docs/1063-gemini-services.adoc +++ b/docs/1063-gemini-services.adoc @@ -43,66 +43,66 @@ Return to link:1037-uk-gemini-introduction.html[GEMINI ''''' == Metadata about the resource -include::./partials/metadatadate.asciidoc[] +include::./partials/metadatadate.asciidoc[tag=!dataset] -include::./partials/metadatalanguage.asciidoc[] +include::./partials/metadatalanguage.asciidoc[tag=!dataset] -include::./partials/metadatapointofcontact.asciidoc[] +include::./partials/metadatapointofcontact.asciidoc[tag=!dataset] -include::./partials/resourcetype.asciidoc[] +include::./partials/resourcetype.asciidoc[tag=!dataset] -include::./partials/fileidentifier.asciidoc[] +include::./partials/fileidentifier.asciidoc[tag=!dataset] -include::./partials/hierarchylevelname.asciidoc[] +include::./partials/hierarchylevelname.asciidoc[tag=!dataset] -include::./partials/parentidentifier.asciidoc[] +include::./partials/parentidentifier.asciidoc[tag=!dataset] -include::./partials/metadatastandardname.asciidoc[] +include::./partials/metadatastandardname.asciidoc[tag=!dataset] -include::./partials/metadatastandardversion.asciidoc[] +include::./partials/metadatastandardversion.asciidoc[tag=!dataset] Go to <> == Metadata about the resource -include::./partials/title.asciidoc[] +include::./partials/title.asciidoc[tag=!dataset] -include::./partials/alternatetitle.asciidoc[] +include::./partials/alternatetitle.asciidoc[tag=!dataset] -include::./partials/abstract.asciidoc[] +include::./partials/abstract.asciidoc[tag=!dataset] -include::./partials/keyword.asciidoc[] +include::./partials/keyword.asciidoc[tag=!dataset] -include::./partials/temporalextent.asciidoc[] +include::./partials/temporalextent.asciidoc[tag=!dataset] -include::./partials/datasetreferencedate.asciidoc[] +include::./partials/datasetreferencedate.asciidoc[tag=!dataset] -include::./partials/extent.asciidoc[] +include::./partials/extent.asciidoc[tag=!dataset] -include::./partials/verticalextent.asciidoc[] +include::./partials/verticalextent.asciidoc[tag=!dataset] -include::./partials/spatialreferencesystem.asciidoc[] +include::./partials/spatialreferencesystem.asciidoc[tag=!dataset] -include::./partials/spatialresolution.asciidoc[] +include::./partials/spatialresolution.asciidoc[tag=!dataset] -include::./partials/resourcelocator.asciidoc[] +include::./partials/resourcelocator.asciidoc[tag=!dataset] -include::./partials/responsibleorganisation.asciidoc[] +include::./partials/responsibleorganisation.asciidoc[tag=!dataset] -include::./partials/limitationsonpublicaccess.asciidoc[] +include::./partials/limitationsonpublicaccess.asciidoc[tag=!dataset] -include::./partials/useconstraints.asciidoc[] +include::./partials/useconstraints.asciidoc[tag=!dataset] -include::./partials/spatialdataservicetype.asciidoc[] +include::./partials/spatialdataservicetype.asciidoc[tag=!dataset] -include::./partials/coupledresource.asciidoc[] +include::./partials/coupledresource.asciidoc[tag=!dataset] -include::./partials/conformity.asciidoc[] +include::./partials/conformity.asciidoc[tag=!dataset] -include::./partials/equivalentscale.asciidoc[] +include::./partials/equivalentscale.asciidoc[tag=!dataset] -include::./partials/boundingbox.asciidoc[] +include::./partials/boundingbox.asciidoc[tag=!dataset] -include::./partials/qualityscope.asciidoc[] +include::./partials/qualityscope.asciidoc[tag=!dataset] Go to <> diff --git a/docs/partials/abstract.asciidoc b/docs/partials/abstract.asciidoc index b1b5e25..00d04da 100644 --- a/docs/partials/abstract.asciidoc +++ b/docs/partials/abstract.asciidoc @@ -65,12 +65,12 @@ the United Kingdom as at February 2017. |ISO 19115:2003 |MD_Identification.abstract |Equivalent |ISO 19139:2007 -ifdef::variant-dataset[] +# tag::dataset[] |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:abstract -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:abstract -endif::[] +# end::service[] |Equivalent |=== ==== @@ -89,12 +89,12 @@ Change history... | [source,xml] ---- -ifdef::variant-dataset[] +# tag::dataset[] include::../snippets/dataset-abstract.xml[] -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] include::../snippets/service-abstract.xml[] -endif::[] +# end::service[] ---- |=== ==== diff --git a/docs/partials/alternatetitle.asciidoc b/docs/partials/alternatetitle.asciidoc index de7e2cb..cd91f78 100644 --- a/docs/partials/alternatetitle.asciidoc +++ b/docs/partials/alternatetitle.asciidoc @@ -52,12 +52,12 @@ title |Equivalent |ISO 19139:2007 -ifdef::variant-dataset[] +# tag::dataset[] |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:alternateTitle -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:alternateTitle -endif::[] +# end::service[] |Equivalent |=== ==== @@ -75,7 +75,7 @@ endif::[] |Guidelines |Note that more than one alternative title may be presented, as shown in the example below. |Example -ifdef::variant-dataset[] +# tag::dataset[] | |Example one | @@ -90,8 +90,8 @@ include::../snippets/dataset-alternatetitle-multi.xml[] include::../snippets/dataset-alternatetitle-multi.xml[] ---- |=== -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] | [source,xml] ---- @@ -99,7 +99,7 @@ include::../snippets/service-alternatetitle-multi.xml[] .... ---- |=== -endif::[] +# end::service[] ==== .Metadata errors observed... diff --git a/docs/partials/boundingbox.asciidoc b/docs/partials/boundingbox.asciidoc index 70ec692..5589aa3 100644 --- a/docs/partials/boundingbox.asciidoc +++ b/docs/partials/boundingbox.asciidoc @@ -76,20 +76,20 @@ related to the area covered by the resource. |Standard |Name |Comparison |INSPIRE Metadata |Geographic bounding box |Identical -ifdef::variant-dataset[] +# tag::dataset[] |ISO 19115:2003 |MD_DataIdentification.extent > EX_Extent > EX_GeographicExtent > EX_GeographicBoundingBox |Minor difference in name |ISO 19139:2007 |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |ISO 19115:2003 |SV_ServiceIdentification.extent > EX_Extent > EX_GeographicExtent > EX_GeographicBoundingBox |Minor difference in name |ISO 19139:2007 |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox -endif::[] +# end::service[] | |=== ==== @@ -123,24 +123,24 @@ coordinate values shall be expressed in units of degrees (encoded using decimal numbers) with axes orientated north and east. The geodetic datum is WGS 84. -ifdef::variant-service[] +# tag::service[] Note that the encoding is very similar to that used in metadata instances for datasets or series, except that the extent XML element is in the srv namespace instead of gmd. This is because extent is a property of MD_DataIdentification (ISO 19115) and SV_ServiceIdentification (ISO 19119/Amd 1:2008), not a property of the parent MD_Identification. -endif::[] +# end::service[] |Example | [source,xml] ---- -ifdef::variant-dataset[] +# tag::dataset[] include::../snippets/dataset-boundingbox.xml[] -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] include::../snippets/service-boundingbox.xml[] -endif::[] +# end::service[] ---- |=== ==== diff --git a/docs/partials/conformity.asciidoc b/docs/partials/conformity.asciidoc index 3be9b7b..6450d5c 100644 --- a/docs/partials/conformity.asciidoc +++ b/docs/partials/conformity.asciidoc @@ -126,31 +126,31 @@ using gmd:CI_Citation), an explanation and a pass. possible conformance results: conformant, not conformant and not evaluated. Not evaluated is expressed by a conformity statement with a nilReason (unknown) specified in the pass element. -ifdef::variant-dataset[] +# tag::dataset[] . All gmd:dataQualityInfo XML element shall have a gmd:scope XML element, set to 'dataset' or 'series' as appropriate. -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] . All gmd:dataQualityInfo XML element shall have a gmd:scope XML element, set to 'service'. . It is important to note that if the scope of the data quality information is 'service' then the gmd:levelDescription XML element is required, as shown below. -endif::[] +# end::service[] |Example | [source,xml] ---- -ifdef::variant-dataset[] +# tag::dataset[] include::../snippets/dataset-conformity-inspire-ortho.xml[] ---- -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] include::../snippets/service-conformity-abstracttestsuite.xml[] ---- |=== -endif::[] -ifdef::variant-dataset[] +# end::service[] +# tag::dataset[] | Example of a conformity report for Implementing Rule 1089/2010, where conformance is not evaluated. + Example follows updated guidance to use gmx:Anchor over @@ -168,7 +168,7 @@ a descriptive topological consistency report include::../snippets/dataset-conformity-inspire-topo.xml[] ---- |=== -endif::[] +# end::dataset[] ==== .Metadata errors observed... diff --git a/docs/partials/datasetreferencedate.asciidoc b/docs/partials/datasetreferencedate.asciidoc index abd5911..3cc9d74 100644 --- a/docs/partials/datasetreferencedate.asciidoc +++ b/docs/partials/datasetreferencedate.asciidoc @@ -88,14 +88,14 @@ should be reported for spatial datasets |Equivalent |ISO 19139:2007 -ifdef::variant-dataset[] +# tag::dataset[] |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date |Equivalent -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:citation/gmd:CI_Citation/gmd:date |Equivalent -endif::[] +# end::service[] |=== ==== @@ -122,7 +122,7 @@ link:component/content/article?id=1048#2.2.3[Dates and Times] * Dataset reference date shall include a date type. The content of this XML element is drawn from a link:component/content/article?id=1048#2.2.9[code list]. -ifdef::variant-dataset[] +# tag::dataset[] | Example One: date | [source,xml] @@ -135,8 +135,8 @@ include::../snippets/dataset-datasetreferencedate-date.xml[] ---- include::../snippets/datasetreferencedate-datetime.xml[] ---- -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] | Example One: date | [source,xml] @@ -149,7 +149,7 @@ include::../snippets/service-datasetreferencedate-date.xml[] ---- include::../snippets/datasetreferencedate-datetime.xml[] ---- -endif::[] +# end::service[] |=== ==== diff --git a/docs/partials/equivalentscale.asciidoc b/docs/partials/equivalentscale.asciidoc index 0f6d3fc..0b28e5e 100644 --- a/docs/partials/equivalentscale.asciidoc +++ b/docs/partials/equivalentscale.asciidoc @@ -40,7 +40,7 @@ distance cannot be determined. |INSPIRE Metadata |Spatial resolution |Spatial resolution may also be expressed as distance -ifdef::variant-dataset[] +# tag::dataset[] |ISO 19115:2003 |MD_DataIdentification.spatialResolution > MD_Resolution.equivalentScale > MD_RepresentativeFraction.denominator |Equivalent @@ -48,10 +48,10 @@ MD_Resolution.equivalentScale > MD_RepresentativeFraction.denominator |ISO 19139:2007 |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:spatialResolution/gmd:MD_Resolution/gmd:equivalentScale |Equivalent -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |ISO 19115:2003 |Describe in the Abstract |no direct equivalent -endif::[] +# end::service[] |=== ==== @@ -66,7 +66,7 @@ GEMINI 1 to 2.0: New element ==== [cols="a,a"] |=== -ifdef::variant-dataset[] +# tag::dataset[] |Guidelines | |Example @@ -75,8 +75,8 @@ ifdef::variant-dataset[] ---- include::../snippets/equivalentscale.xml[] ---- -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |Guidelines | * For services, it is not possible to express the restriction of a @@ -86,7 +86,7 @@ Schema. * The spatial resolution restriction text shall include either an equivalent scale as integer valued scale denominator or a resolution distance using a numerical length value and with a unit of length. -endif::[] +# end::service[] | |=== ==== diff --git a/docs/partials/extent.asciidoc b/docs/partials/extent.asciidoc index d98ef87..607fa7b 100644 --- a/docs/partials/extent.asciidoc +++ b/docs/partials/extent.asciidoc @@ -61,7 +61,7 @@ NERC Vocabulary "C64, United Kingdom Charting Progress 2 sea regions" |Standard |Name |Comparison |INSPIRE Metadata |None | -ifdef::variant-dataset[] +# tag::dataset[] |ISO 19115:2003 |MD_DataIdentification.extent > EX_Extent > EX_GeographicExtent > EX_ GeographicDescription.geographicIdentifier |Identical @@ -69,8 +69,8 @@ EX_GeographicExtent > EX_ GeographicDescription.geographicIdentifier |ISO 19139:2007 |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicDescription/gmd:geographicIdentifier |Identical -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |ISO 19119:2006+Amd:1 |SV_ServiceIdentification.extent > EX_Extent > EX_GeographicExtent > EX_ GeographicDescription.geographicIdentifier |Identical @@ -78,7 +78,7 @@ EX_GeographicExtent > EX_ GeographicDescription.geographicIdentifier |ISO 19139:2007 |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicDescription/gmd:geographicIdentifier |Identical -endif::[] +# end::service[] |=== ==== @@ -112,17 +112,17 @@ is http://seadatanet.maris2.nl/v_bodc_vocab_v2/search.asp?lib=C19 . INSPIRE recommendations for encoding free text values which reference a specific external resource or registry is to use gmx:Anchor instead of gco:CharacterString -ifdef::variant-dataset[] +# tag::dataset[] Note that the extent XML element is in the gmd namespace for datasets/series. This differs from service metadata instances where the extent XML element will be in the srv namespace. -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] Note that the extent XML element is in the srv namespace. This differs from dataset metadata instances where the extent XML element will be in the gmd namespace. -endif::[] -ifdef::variant-dataset[] +# end::service[] +# tag::dataset[] |Example One | [source,xml] @@ -135,8 +135,8 @@ include::../snippets/dataset-extent-code.xml[] ---- include::../snippets/dataset-extent-codeauthority.xml[] ---- -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] | Example One | [source,xml] @@ -149,7 +149,7 @@ include::../snippets/service-extent-code.xml[] ---- include::../snippets/service-extent-codeauthority.xml[] ---- -endif::[] +# end::service[] |=== ==== diff --git a/docs/partials/hierarchylevelname.asciidoc b/docs/partials/hierarchylevelname.asciidoc index e80c2d7..9455971 100644 --- a/docs/partials/hierarchylevelname.asciidoc +++ b/docs/partials/hierarchylevelname.asciidoc @@ -60,7 +60,7 @@ New element in GEMINI 2.3 [cols="a,a"] |=== |Guidelines |No specific rules for this metadata element -ifdef::variant-dataset[] +# tag::dataset[] |Example 1 - dataset, where hierarchyLevelName could just be omitted | [source,xml] @@ -73,15 +73,15 @@ include::../snippets/dataset-hierarchylevelname.xml[] ---- include::../snippets/series-hierarchylevelname.xml[] ---- -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |Example | [source,xml] ---- include::../snippets/service-hierarchylevelname.xml[] ---- -endif::[] +# end::service[] |=== ==== diff --git a/docs/partials/keyword.asciidoc b/docs/partials/keyword.asciidoc index c57834c..b3791a7 100644 --- a/docs/partials/keyword.asciidoc +++ b/docs/partials/keyword.asciidoc @@ -93,12 +93,13 @@ broader range of values. |Equivalent |ISO 19139:2007 -ifdef::variant-dataset[] -|/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords -endif::[] -ifdef::variant-service[] -|/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords -endif::[] +| +// tag::dataset[] +/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords +// end::dataset[] +// tag::service[] +/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:descriptiveKeywords/gmd:MD_Keywords +// end::service[] |Equivalent |=== ==== @@ -117,7 +118,7 @@ controlled vocabulary [cols="a,a"] |=== |Guidelines a| -ifdef::variant-dataset[] +// tag::dataset[] [arabic] . The GEMINI2 keyword item comprises keyword value(s) and, conditionally, the specification of an originating controlled @@ -147,9 +148,8 @@ use gco:CharacterString for terms from controlled vocabularies . Recommended best practice is to select a human readable value from a controlled vocabulary. An example from the Marine Geospatial community is http://seadatanet.maris2.nl/v_bodc_vocab_v2/search.asp?lib=P02 -endif::[] -ifdef::variant-service[] -| +// end::dataset[] +// tag::service[] . The GEMINI2 keyword item comprises keyword value(s) and, conditionally, the specification of an originating controlled vocabulary. If keywords are not selected from a controlled vocabulary the encoding shown in Example One shall be used. . In the context of INSPIRE the presence of at least one keyword is mandated. For service metadata there shall be at least one keyword defining the category or subcategory of the service using its language neutral name as defined in Part D 4 of the Metadata Implementing Rules (the language neutral names are the words in brackets using lower camel case notation). The keyword shown in Example Two is an example of this . Where keywords do originate from a controlled vocabulary the encoding shown in Example Two shall be used. Note the inclusion of the gmd:thesaurusName XML element which contains the XML element gmd:CI_Citation. This element must contain at least a title, reference date and date type. In the example keywords have been selected from the GEMET Concepts controlled vocabulary. @@ -158,8 +158,8 @@ ifdef::variant-service[] . The srv:SV_ServiceIdentification XML element has an optional property srv:keywords which exhibits the same behaviour as gmd:descriptiveKeywords. Consequently keywords for service metadata could be encoded in the way shown in Example Five. This approach shall not be followed in GEMINI2 metadata instances . This case arises because the XML element gmd:descriptiveKeywords is a an instance of the property (or role in fact) on the ISO 19115 abstract class MD_Identification, from which both SV_ServiceIdentification and MD_DataIdentification inherit. Therefore, SV_ServiceIdentification inherits the descriptiveKeywords property and adds a similar property called keywords. . Recommended best practice is to select a human readable value from a controlled vocabulary. An example from the Marine Geospatial community is http://seadatanet.maris2.nl/v_bodc_vocab_v2/search.asp?lib=P02 -endif::[] -ifdef::variant-dataset[] +// end::service[] +// tag::dataset[] | Example One (datasets/series) - without originating controlled vocabulary | [source,xml] @@ -170,25 +170,23 @@ include::../snippets/dataset-keyword-freetext.xml[] | [source,xml] ---- -include::../snippets/dataset-keyword-freetext.xml[] +include::../snippets/dataset-keyword-inspire.xml[] ---- -| Example Three (datasets/series) - keywords from 2 controlled -vocabularies +| Example Three (datasets/series) - keywords from 2 controlled vocabularies | [source,xml] ---- include::../snippets/dataset-keyword-controlled.xml[] ---- -endif::[] -ifdef::variant-service[] +// end::dataset[] +// tag::service[] |Example One (services) - without controlled vocabulary | [source,xml] ---- include::../snippets/service-keyword-freetext.xml[] ---- -| Example Two (services) - service keyword from part D4 on the INSPIRE -Metadata Implementing Rules +| Example Two (services) - service keyword from part D4 on the INSPIRE Metadata Implementing Rules | [source,xml] ---- @@ -206,7 +204,7 @@ include::../snippets/service-keyword-gemet.xml[] ---- include::../snippets/service-keyword-controlled.xml[] ---- -endif::[] +// end::service[] |=== ==== diff --git a/docs/partials/limitationsonpublicaccess.asciidoc b/docs/partials/limitationsonpublicaccess.asciidoc index cd0b03a..9c86ee9 100644 --- a/docs/partials/limitationsonpublicaccess.asciidoc +++ b/docs/partials/limitationsonpublicaccess.asciidoc @@ -64,14 +64,14 @@ types of usage, or constraints on the use that can be made of the data. MD_LegalConstraints.accessConstraints & otherConstraints |Equivalent |ISO 19139:2007 -ifdef::variant-dataset[] +# tag::dataset[] |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:accessConstraints & otherConstraints |Equivalent -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:accessConstraints & otherConstraints |Equivalent -endif::[] +# end::service[] |=== ==== @@ -115,12 +115,12 @@ gmd:otherConstraints element | [source,xml] ---- -ifdef::variant-dataset[] +# tag::dataset[] include::../snippets/dataset-limitationsonpublicaccess.xml[] -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] include::../snippets/service-limitationsonpublicaccess.xml[] -endif::[] +# end::service[] ---- | Example Two - no limitations | diff --git a/docs/partials/parentidentifier.asciidoc b/docs/partials/parentidentifier.asciidoc index 0e753a3..e28800d 100644 --- a/docs/partials/parentidentifier.asciidoc +++ b/docs/partials/parentidentifier.asciidoc @@ -22,12 +22,12 @@ forms a part. |Domain |free text |Guidance | -ifdef::variant-dataset[] +# tag::dataset[] Only to be used if the dataset is part of a series -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] Only to be used if the service is designed to be part of a set of services -endif::[] +# end::service[] |Comment | diff --git a/docs/partials/qualityscope.asciidoc b/docs/partials/qualityscope.asciidoc index f169e11..882ae17 100644 --- a/docs/partials/qualityscope.asciidoc +++ b/docs/partials/qualityscope.asciidoc @@ -13,17 +13,17 @@ applies of the data resource |Obligation |Mandatory -ifdef::variant-dataset[] +# tag::dataset[] |Occurrence |Multiple -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |Occurrence |Single -endif::[] +# end::service[] |Data type |Class |Domain |DQ_Scope from ISO 19115 -ifdef::variant-dataset[] +# tag::dataset[] |Guidance a| . For the conformity statement and lineage of metadata describing: * a dataset, set quality scope to 'dataset' @@ -34,12 +34,12 @@ with their Scope set appropriately |Comment |Required in the ISO 19115 encoding of GEMINI 2 metadata records, to assist in managing related metadata records. -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |Guidance | |Comment | -endif::[] +# end::service[] |Examples | @@ -53,16 +53,16 @@ endif::[] |Standard |Name |Comparison |INSPIRE Metadata -ifdef::variant-dataset[] +# tag::dataset[] |metadata/2.0/req/datasets-and-series/one-data-quality-element |INSPIRE only allows a maximum of one Data quality element, so only one scope - the whole resource -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |INSPIRE Metadata |metadata/2.0/req/sds/only-one-dq-element |INSPIRE only allows a maximum of one Data quality element, so only one scope - the whole resource -endif::[] +# end::service[] |ISO 19115:2003 |DQ_DataQuality.scope |Equivalent @@ -85,7 +85,7 @@ New element in GEMINI 2.3 |=== |Guidelines | -ifdef::variant-dataset[] +# tag::dataset[] All gmd:dataQualityInfo XML element shall have a gmd:scope XML element, set to as appropriate. @@ -97,24 +97,24 @@ measures that relate to the the entire dataset or series Other quality measures, e.g. for specific feature types, shall be separate DQ_DataQuality elements, with the relevant Quality scope. In these cases the Level Description must also be set -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] * It is important to note that if the scope of the data quality information is 'service' then the gmd:levelDescription XML element is required * The value of gmd:other must be *service* (in the language of the metadata), as shown below. -endif::[] +# end::service[] |Example | [source,xml] ---- -ifdef::variant-dataset[] +# tag::dataset[] include::../snippets/dataset-qualityscope.xml[] -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] include::../snippets/service-qualityscope.xml[] -endif::[] +# end::service[] ---- |=== ==== @@ -122,10 +122,10 @@ endif::[] .Metadata errors observed... [%collapsible] ==== -ifdef::variant-dataset[] +# tag::dataset[] No error information available -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |Errors observed |*No level description* + ISO 19115 requires that a 'level description' is given for any quality statement that is not describing the 'dataset' or 'series' level. @@ -134,5 +134,5 @@ conformity. This means that any 'service' record must provide a gmd:DQ_Scope/gmd:levelDescription element, as shown above. + A similar rule applies to link:#47[hierarchyLevelName], which must be provided for any record that is not describing a dataset. -endif::[] +# end::service[] ==== \ No newline at end of file diff --git a/docs/partials/resourcelocator.asciidoc b/docs/partials/resourcelocator.asciidoc index 143373b..ed43510 100644 --- a/docs/partials/resourcelocator.asciidoc +++ b/docs/partials/resourcelocator.asciidoc @@ -22,7 +22,7 @@ available |Data type |CharacterString |Domain |Valid URL -ifdef::variant-dataset[] +# tag::dataset[] |Guidance a| . Identify whether the resource may be accessed. . Determine the location of the resource (may be a URL). @@ -57,8 +57,8 @@ dataset http://doi.org/10.5285/1e7d5e08-9e24-471b-ae37-49b477f695e3 |Revision date |July 2009 -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |Guidance a| . Specify a valid URL to the service. . If no online access for the service is available, but there is a @@ -99,7 +99,7 @@ like: + http://myserver/INSPIREWM/MapServer/WMSServer?service=WMS&request=GetCapabilities& |Revision date |July 2009 -endif::[] +# end::service[] |=== .Corresponding element in other standards... @@ -132,7 +132,7 @@ GEMINI 1 to 2.0: Modification of Online resource |=== |Guidelines | -ifdef::variant-dataset[] +# tag::dataset[] . The two examples illustrate different uses of Resource locator. Example one gives direct access to the dataset. Example two gives the location of further information about ordering the dataset. ISO 19115 @@ -171,8 +171,8 @@ include::../snippets/dataset-resourcelocator-required.xml[] include::../snippets/dataset-resourcelocator-information.xml[] ---- |=== -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |Guidelines | . In the examples, the URLs provided are for OGC GetCapabilities @@ -245,7 +245,7 @@ include::../snippets/service-resourcelocator-function-wcs.xml[] include::../snippets/service-resourcelocator-function-invocable.xml[] ---- |=== -endif::[] +# end::service[] ==== .Metadata errors observed... diff --git a/docs/partials/responsibleorganisation.asciidoc b/docs/partials/responsibleorganisation.asciidoc index f24a22e..6cd912f 100644 --- a/docs/partials/responsibleorganisation.asciidoc +++ b/docs/partials/responsibleorganisation.asciidoc @@ -122,18 +122,18 @@ acting as distributor, publisher, author, etc. !distributor |ISO 19115:2003 |MD_Identification.pointOfContact |Similar high-level class -ifdef::variant-dataset[] +# tag::dataset[] |ISO 19139:2007 |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty |Equivalent |=== -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |ISO 19139:2007 |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:pointOfContact/gmd:CI_ResponsibleParty |Equivalent |=== -endif::[] +# end::service[] ==== .Change history... @@ -160,22 +160,22 @@ more fully populated example. . Note on role code: the UK Location portal (data.gov.uk site) interprets ISO 'owner' as Data Provider, and ISO 'publisher' as Data Publisher. -ifdef::variant-dataset[] +# tag::dataset[] | Example One (datasets/series) | [source,xml] ---- include::../snippets/dataset-responsibleorganisation.xml[] ---- -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] | Example One (service) | [source,xml] ---- include::../snippets/service-responsibleorganisation.xml[] ---- -endif::[] +# end::service[] |=== ==== diff --git a/docs/partials/spatialreferencesystem.asciidoc b/docs/partials/spatialreferencesystem.asciidoc index 68cd41e..f142ac0 100644 --- a/docs/partials/spatialreferencesystem.asciidoc +++ b/docs/partials/spatialreferencesystem.asciidoc @@ -70,13 +70,13 @@ reference systems in addition to that in which it is recorded. ==== |=== |Standard |Name |Comparison -ifdef::variant-dataset[] +# tag::dataset[] |INSPIRE Metadata |crs coordinate reference system |Equivalent -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |INSPIRE Metadata |crs coordinate reference system |In INSPIRE it is only mandatory for interoperable spatial data services -endif::[] +# end::service[] |ISO 19115:2003 |MD_ReferenceSystem.referenceSystemIdentifier > RS_Identifier.code |Equivalent @@ -89,7 +89,7 @@ RS_Identifier.code |Equivalent .Change history... [%collapsible] ==== -GEMINI 1 to 2.0: Changed from enumerated list +GEMINI 1 to 2.0: Changed from enumerated list + October 2023: clarifications to Guidance, to align with slight revision of INSPIRE TG ==== diff --git a/docs/partials/spatialresolution.asciidoc b/docs/partials/spatialresolution.asciidoc index 3a04de8..d9d94b1 100644 --- a/docs/partials/spatialresolution.asciidoc +++ b/docs/partials/spatialresolution.asciidoc @@ -54,17 +54,17 @@ the building, i.e. about 10 metres. |INSPIRE Metadata |Spatial resolution |INSPIRE allows the option of either Distance or Equivalent scale. -ifdef::variant-dataset[] +# tag::dataset[] |ISO 19115:2003 |MD_DataIdentification.spatialResolution > MD_Resolution.distance |Equivalent |ISO 19139:2007 |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:spatialResolution |Equivalent -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |ISO 19115:2003 |Describe in the Abstract |no direct equivalent -endif::[] +# end::service[] |=== ==== @@ -82,7 +82,7 @@ GEMINI 1 to 2.0: made conditional |=== |Guidelines | -ifdef::variant-dataset[] +# tag::dataset[] . The encoding example for spatial resolution is shown in the example below. . A distance measurement shall be encoded and the unit of measurement @@ -93,8 +93,8 @@ of the uom attribute shall be: urn:ogc:def:uom:EPSG::9001 . This defines the unit of measure as metres by reference to the http://www.epsg-registry.org/[EPSG registry] link:component/content/article?id=1047[[12]]. -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] . For services, it is not possible to express the restriction of a service concerning the spatial resolution in using the ISO 19139 XML Schema. @@ -102,15 +102,15 @@ Schema. . The spatial resolution restriction text shall include either an equivalent scale as integer valued scale denominator or a resolution distance using a numerical length value and with a unit of length. -endif::[] -ifdef::variant-dataset[] +# end::service[] +# tag::dataset[] |Example | [source,xml] ---- include::../snippets/spatialresolution.xml[] ---- -endif::[] +# end::dataset[] |=== ==== diff --git a/docs/partials/temporalextent.asciidoc b/docs/partials/temporalextent.asciidoc index 89f601a..161bd50 100644 --- a/docs/partials/temporalextent.asciidoc +++ b/docs/partials/temporalextent.asciidoc @@ -10,13 +10,13 @@ include::includes/partials-attributes.adoc[] |Purpose and meaning |This is the date or date range that identifies the currency of the data. It may refer to the period of collection, or the date at which it is deemed to be current. -ifdef::variant-dataset[] +# tag::dataset[] |Obligation |Mandatory for datasets and dataset series -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |Obligation |Conditional for services - where a temporal extent is relevant to the service -endif::[] +# end::service[] |Occurrence |Multiple |Data type |Date @@ -72,14 +72,14 @@ optional if another temporal reference is provided. |ISO 19115:2003 |EX_Extent > EX_TemporalExtent.extent |Identical |ISO 19139:2007 -ifdef::variant-dataset[] +# tag::dataset[] |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:temporalElement |Identical -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:extent/gmd:EX_Extent/gmd:temporalElement |Identical -endif::[] +# end::service[] |=== ==== @@ -161,7 +161,7 @@ before the specified date * 'after': in which case the actual date is unknown but known to be after the specified date . Example Four shows encoding examples using these values. -ifdef::variant-dataset[] +# tag::dataset[] | Example One (datasets/series) : (gml:TimePeriod) | [source,xml] @@ -186,8 +186,8 @@ include::../snippets/temporalextent-unknowndates.xml[] ---- include::../snippets/temporalextent-other.xml[] ---- -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] | Example One (services) : (gml:TimePeriod) | [source,xml] @@ -212,7 +212,7 @@ include::../snippets/temporalextent-unknowndates.xml[] ---- include::../snippets/temporalextent-other.xml[] ---- -endif::[] +# end::service[] |=== ==== diff --git a/docs/partials/title.asciidoc b/docs/partials/title.asciidoc index f445e9c..a7ec149 100644 --- a/docs/partials/title.asciidoc +++ b/docs/partials/title.asciidoc @@ -68,22 +68,22 @@ No error information available |=== |Guidelines |Cannot be empty |Example -ifdef::variant-dataset[] +# tag::dataset[] [#dataset] | [source,xml] ---- include::../snippets/dataset-title.xml[] ---- -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] [#service] | [source,xml] ---- include::../snippets/service-title.xml[] ---- -endif::[] +# end::service[] |=== ==== diff --git a/docs/partials/useconstraints.asciidoc b/docs/partials/useconstraints.asciidoc index 01ef8a3..12256f1 100644 --- a/docs/partials/useconstraints.asciidoc +++ b/docs/partials/useconstraints.asciidoc @@ -54,14 +54,14 @@ Corresponding element in other standards... MD_LegalConstraints.useConstraints & otherConstraints |Equivalent |ISO 19139:2007 -ifdef::variant-dataset[] +# tag::dataset[] |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useConstraints & gmd:otherConstraints |Equivalent -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/gmd:resourceConstraints/gmd:MD_LegalConstraints/gmd:useConstraints & gmd:otherConstraints |Equivalent -endif::[] +# end::service[] |=== ==== @@ -106,12 +106,12 @@ list. | [source,xml] ---- -ifdef::variant-dataset[] +# tag::dataset[] include::../snippets/dataset-useconstraints.xml[] -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] include::../snippets/service-useconstraints.xml[] -endif::[] +# end::service[] ---- | Example Two - with external file | diff --git a/docs/partials/verticalextent.asciidoc b/docs/partials/verticalextent.asciidoc index 305842b..995da98 100644 --- a/docs/partials/verticalextent.asciidoc +++ b/docs/partials/verticalextent.asciidoc @@ -70,7 +70,7 @@ significant, e.g. in geology, mining, meteorology etc. |Standard |Name |Comparison |INSPIRE Metadata |None | -ifdef::variant-dataset[] +# tag::dataset[] |ISO 19115:2003 |MD_DataIdentification.extent > EX_Extent > EX_VerticalExtent |Equivalent @@ -78,8 +78,8 @@ EX_VerticalExtent |Equivalent |/gmd:MD_Metadata/gmd:identificationInfo/gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:verticalElement |Equivalent |=== -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] |ISO 19119:2006+Amd:1 |SV_ServiceIdentification.extent > EX_Extent > EX_VerticalExtent |Identical @@ -87,7 +87,7 @@ EX_VerticalExtent |Identical |/gmd:MD_Metadata/gmd:identificationInfo/srv:SV_ServiceIdentification/srv:extent/gmd:EX_Extent/gmd:verticalElement |Equivalent |=== -endif::[] +# end::service[] ==== .Change history... @@ -137,7 +137,7 @@ CRS is unknown (Example Three) but this renders the vertical extent information ambiguous at best. Consequently it would be better to refrain from including vertical extent information in the metadata instance altogether. -ifdef::variant-dataset[] +# tag::dataset[] | Example One (datasets/series) - Vertical CRS by reference | [source,xml] @@ -150,8 +150,8 @@ include::../snippets/dataset-extent-verticalcrs-reference.xml[] ---- include::../snippets/dataset-extent-verticalcrs-value.xml[] ---- -endif::[] -ifdef::variant-service[] +# end::dataset[] +# tag::service[] | Example One (services) - Vertical CRS by reference | [source,xml] @@ -164,7 +164,7 @@ include::../snippets/service-extent-verticalcrs-reference.xml[] ---- include::../snippets/service-extent-verticalcrs-value.xml[] ---- -endif::[] +# end::service[] |Example Three - Vertical CRS unknown | [source,xml] diff --git a/docs/snippets/characterencoding.xml b/docs/snippets/characterencoding.xml index ca382da..673c938 100644 --- a/docs/snippets/characterencoding.xml +++ b/docs/snippets/characterencoding.xml @@ -9,7 +9,7 @@ ISO/IEC 8859-1 (also known as Latin 1) @@ -20,4 +20,4 @@ ... - \ No newline at end of file + diff --git a/docs/snippets/dataquality-topo-quantitative.xml b/docs/snippets/dataquality-topo-quantitative.xml index 7e713c8..d114f88 100644 --- a/docs/snippets/dataquality-topo-quantitative.xml +++ b/docs/snippets/dataquality-topo-quantitative.xml @@ -7,7 +7,7 @@ @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/docs/snippets/dataset-conformity-inspire-ortho.xml b/docs/snippets/dataset-conformity-inspire-ortho.xml index 6e30b15..681a8be 100644 --- a/docs/snippets/dataset-conformity-inspire-ortho.xml +++ b/docs/snippets/dataset-conformity-inspire-ortho.xml @@ -6,7 +6,7 @@ dataset + codeList='https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_ScopeCode'>dataset ... @@ -28,7 +28,7 @@ publication @@ -48,4 +48,4 @@ ... - \ No newline at end of file + diff --git a/docs/snippets/dataset-keyword-controlled.xml b/docs/snippets/dataset-keyword-controlled.xml index 440a797..898d251 100644 --- a/docs/snippets/dataset-keyword-controlled.xml +++ b/docs/snippets/dataset-keyword-controlled.xml @@ -23,7 +23,7 @@ publication @@ -49,7 +49,7 @@ publication @@ -62,4 +62,4 @@ ... - \ No newline at end of file + diff --git a/docs/snippets/dataset-limitationsonpublicaccess.xml b/docs/snippets/dataset-limitationsonpublicaccess.xml index 856ea72..8757bf1 100644 --- a/docs/snippets/dataset-limitationsonpublicaccess.xml +++ b/docs/snippets/dataset-limitationsonpublicaccess.xml @@ -8,7 +8,7 @@ ... otherRestrictions @@ -21,4 +21,4 @@ ... - \ No newline at end of file + diff --git a/docs/snippets/dataset-qualityscope.xml b/docs/snippets/dataset-qualityscope.xml index 7af4f22..02f05cb 100644 --- a/docs/snippets/dataset-qualityscope.xml +++ b/docs/snippets/dataset-qualityscope.xml @@ -6,7 +6,7 @@ dataset + codeList='https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_ScopeCode'>dataset ... @@ -14,4 +14,4 @@ ... - \ No newline at end of file + diff --git a/docs/snippets/dataset-useconstraints.xml b/docs/snippets/dataset-useconstraints.xml index 5e1f1b3..b580b50 100644 --- a/docs/snippets/dataset-useconstraints.xml +++ b/docs/snippets/dataset-useconstraints.xml @@ -7,7 +7,7 @@ otherRestrictions @@ -20,4 +20,4 @@ ... - \ No newline at end of file + diff --git a/docs/snippets/lineage.xml b/docs/snippets/lineage.xml index b280646..0d8e15b 100644 --- a/docs/snippets/lineage.xml +++ b/docs/snippets/lineage.xml @@ -6,7 +6,7 @@ dataset + codeList='https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_ScopeCode'>dataset @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/docs/snippets/resourcetype.xml b/docs/snippets/resourcetype.xml index dbc8f73..9b6ec6b 100644 --- a/docs/snippets/resourcetype.xml +++ b/docs/snippets/resourcetype.xml @@ -2,7 +2,7 @@ ... dataset + codeList='https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_ScopeCode'>dataset ... - \ No newline at end of file + diff --git a/docs/snippets/service-conformity-abstracttestsuite.xml b/docs/snippets/service-conformity-abstracttestsuite.xml index ededc66..90de4c4 100644 --- a/docs/snippets/service-conformity-abstracttestsuite.xml +++ b/docs/snippets/service-conformity-abstracttestsuite.xml @@ -6,7 +6,7 @@ service + codeList='https://schemas.isotc211.org/schemas/19139/-/resources/codelist/gmxCodelists.xml#MD_ScopeCode'>service ... @@ -34,7 +34,7 @@ publication @@ -55,4 +55,4 @@ ... - \ No newline at end of file + diff --git a/docs/snippets/service-keyword-controlled.xml b/docs/snippets/service-keyword-controlled.xml index 3d59c99..4eaefda 100644 --- a/docs/snippets/service-keyword-controlled.xml +++ b/docs/snippets/service-keyword-controlled.xml @@ -30,7 +30,7 @@ publication @@ -43,4 +43,4 @@ ... - \ No newline at end of file + diff --git a/docs/snippets/service-keyword-inspire.xml b/docs/snippets/service-keyword-inspire.xml index eb6c496..0cb6f30 100644 --- a/docs/snippets/service-keyword-inspire.xml +++ b/docs/snippets/service-keyword-inspire.xml @@ -6,40 +6,37 @@ - humanCatalogueViewer + humanCatalogueViewer - - Commission Regulation (EC) No 1205/2008 of 3 December 2008 implementing Directive 2007/2/ - EC of the European Parliament and of the Council as regards metadata - - - INSPIRE Metadata Implementing Rules - - - - - 2008-12-03 - + + Commission Regulation (EC) No 1205/2008 of 3 December 2008 implementing Directive 2007/2/EC of the European Parliament and of the Council as regards metadata + + + INSPIRE Metadata Implementing Rules + + + + + 2008-12-03 + - publication + publication - + - - - OJ:L:2008:326:0012:01 + + + OJ:L:2008:326:0012:01 D 4 CLASSIFICATION OF SPATIAL DATA SERVICES - + @@ -47,4 +44,4 @@ ... - \ No newline at end of file + diff --git a/docs/snippets/service-useconstraints.xml b/docs/snippets/service-useconstraints.xml index 2e391c7..d966a3c 100644 --- a/docs/snippets/service-useconstraints.xml +++ b/docs/snippets/service-useconstraints.xml @@ -7,7 +7,7 @@ otherRestrictions @@ -20,4 +20,4 @@ ... - \ No newline at end of file +