Merge branch 'dev' into dev

agiorguk · Nov 13, 2023 · 7e8d4b7 · 7e8d4b7
2 parents a626716 + 0ef1dbe
commit 7e8d4b7
Show file tree

Hide file tree

Showing 24 changed files with 252 additions and 253 deletions.
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -23,7 +23,7 @@ jobs:
       uses: peaceiris/actions-gh-pages@v3
       with: 
         personal_token: ${{ secrets.API_TOKEN_GITHUB }}
-        external_repository: agiorguk/gemini-dev
+        external_repository: archaeogeek/gemini-dev
         publish_branch: gh-pages
         publish_dir: ./docs/
         enable_jekyll: true
diff --git a/docs/1037-uk-gemini-introduction.asciidoc b/docs/1037-uk-gemini-introduction.asciidoc
@@ -7,6 +7,7 @@ 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]
+
 * 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]

diff --git 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 <<UK GEMINI 2.3 2020-06-29 dataset or series, top of page>>
 
 == 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 <<top, top of page>>
diff --git 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 <<UK GEMINI 2.3 2020-06-29 service, top of page>>
 
 == 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 <<top, top of page>>
diff --git 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
@@ -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,16 +90,16 @@ include::../snippets/dataset-alternatetitle-multi.xml[]
 include::../snippets/dataset-alternatetitle-multi.xml[]
 ----
 |===
-endif::[]
-ifdef::variant-service[]
+# end::dataset[]
+# tag::service[]
 |
 [source,xml]
 ----
 include::../snippets/service-alternatetitle-multi.xml[]
 ....
 ----
 |===
-endif::[]
+# end::service[]
 ====
 
 .Metadata errors observed...

diff --git 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[]
 ----
 |===
 ====