From d4541ee04b228274c5f1155d15f8a60577a7b825 Mon Sep 17 00:00:00 2001 From: Peter Parslow Date: Fri, 3 Nov 2023 14:30:54 +0000 Subject: [PATCH 01/14] Update conformity.asciidoc Clarify guidance & comments as per https://github.com/agiorguk/gemini/issues/12 --- docs/partials/conformity.asciidoc | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/docs/partials/conformity.asciidoc b/docs/partials/conformity.asciidoc index 926c133..3be9b7b 100644 --- a/docs/partials/conformity.asciidoc +++ b/docs/partials/conformity.asciidoc @@ -7,10 +7,10 @@ include::includes/partials-attributes.adoc[] |UK GEMINI id |41 |Definition |Statement of conformity with the product specification or -user requirement against which the data is being evaluated +user requirement |Purpose and meaning |The purpose of this is to record the conformity to -the INSPIRE or other data specification +INSPIRE and any other data specification |Obligation |Mandatory @@ -59,25 +59,14 @@ Guidelines, publication, 2010-04-26 !true !Only mandatory items included !=== |Guidance a| -. At least one conformity statement shall be to an INSPIRE -specification, even if simply to say that the data set is not conformant -or not tested -. Other conformity statements may be added, citing INSPIRE technical -guidance or other specifications +. For Gemini compliance, you must provide a conformity statement referring to the INSPIRE specifications, even if the dataset is not conformant, or you didn't test it. +. Datasets, dataset series and metadata about invocable spatial data services shall declare conformity to [INSPIRE Regulation 1089/2010] and shall use the title and citation date in the example and encoding guidelines below. +. Metadata about network services shall declare conformity to [INSPIRE Regulation 976/2009]. +. Other conformity statements may be added, where each conformity statement shall relate to only one specification. . Each conformity statement shall relate to only one specification -. Assess the conformity of the data resource against its product -specification or the INSPIRE thematic data specification. -. State the data specification to which the degree of conformity applied -and optionally an 'Explanation', for example to reference the -conformance criteria in the specification against which conformance is -being claimed. -. For INSPIRE, Datasets and dataset series shall declare conformity to -[Regulation 1089/2010]. +. Each conformity statement shall state the specification that it is about, the degree of conformity (true or false) and optionally an 'Explanation', for example to reference the conformance criteria in the specification against which conformance is being claimed. |Comment a| -. The specification is identified in the element Specification. -. The conformance of a data resource may be considered with respect to -more than one specification. . For INSPIRE, the citation title shall be the official title of the INSPIRE Implementing Rule, specification document or Conformance Class . For INSPIRE, the date given will be the date of publication of the @@ -85,6 +74,7 @@ INSPIRE Implementing Rule, specification document or Conformance Class . For INSPIRE Implementing Rule documents, the value of the title element shall match exactly the official title of the cited document in the language of the metadata. +. If conformity with INSPIRE has not been evaluated, the degree (gmd:pass) element shall be empty and contain a nil reason attribute with value "unknown" |Examples |Conformance of a dataset to Regulation 1089/2010 would have the title: + @@ -93,7 +83,7 @@ Directive 2007/2/EC of the European Parliament and of the Council as regards interoperability of spatial data sets and services., + and would give a publication date of 2010-12-08 -|Revision date |April 2020 +|Revision date |November 2023 |=== .Corresponding element in other standards... @@ -119,6 +109,7 @@ DQ_ConformanceResult |Equivalent * GEMINI 1 to 2.0: New element * GEMINI 2.2 to 2.3: changed the way to encode that a resource has not been tested against the relevant INSPIRE specification +* November 2023 clarified guidance and comments ==== .Encoding guidelines... @@ -196,4 +187,4 @@ Any deviation may result in the validation failure message "The gmd:pass element is not nillable and shall have a value" - even if the error is in the spelling of the title. |=== -==== \ No newline at end of file +==== From 9e6316920e4010d77f517ef78c1b08d4748eefa0 Mon Sep 17 00:00:00 2001 From: Peter Parslow Date: Fri, 3 Nov 2023 14:45:22 +0000 Subject: [PATCH 02/14] Update 1055-uk-gemini-major-changes-since-1-0.asciidoc So far, just for the change resulting from https://github.com/agiorguk/gemini/issues/12 --- docs/1055-uk-gemini-major-changes-since-1-0.asciidoc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/1055-uk-gemini-major-changes-since-1-0.asciidoc b/docs/1055-uk-gemini-major-changes-since-1-0.asciidoc index d670f6f..6f58bd0 100644 --- a/docs/1055-uk-gemini-major-changes-since-1-0.asciidoc +++ b/docs/1055-uk-gemini-major-changes-since-1-0.asciidoc @@ -57,9 +57,15 @@ longer just be the century. === Editorial changes since the launch of GEMINI 2.3 +==== November 2023 + +link:1062-gemini-datasets-and-data-series.html#41[Conformity] + +* Clarified guidance and comments, including how to specify that the resource hasn't been tested against INSPIRE + ==== October 2023 -Simplified home page ("introduction" / "landing page") as requested by Geospatial Commission +Simplified home page ("introduction" / "landing page") as requested by Geospatial Commission. This included resolution of some specific requests for things to mention: https://github.com/agiorguk/gemini/issues/31; https://github.com/agiorguk/gemini/issues/58; https://github.com/agiorguk/gemini/issues/24 Remove mention of IPSV from guidance on Keyword (https://github.com/agiorguk/gemini/issues/19) From 3b1e3b81419d421bcb8fdff2d83dbec37932874d Mon Sep 17 00:00:00 2001 From: Peter Parslow Date: Fri, 3 Nov 2023 15:16:01 +0000 Subject: [PATCH 03/14] Update service-keyword-gemet.xml Use Anchor xlinks to individual GEMET concepts Can't see a fixed URL for the whole collection of GEMET concepts. --- docs/snippets/service-keyword-gemet.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/snippets/service-keyword-gemet.xml b/docs/snippets/service-keyword-gemet.xml index 377821f..5099240 100644 --- a/docs/snippets/service-keyword-gemet.xml +++ b/docs/snippets/service-keyword-gemet.xml @@ -6,10 +6,10 @@ - water monitoring + water monitoring - water quality + water quality @@ -36,4 +36,4 @@ ... - \ No newline at end of file + From 5d55fb213d03e851536e88ce8269027c0f340cde Mon Sep 17 00:00:00 2001 From: Peter Parslow Date: Fri, 3 Nov 2023 15:37:50 +0000 Subject: [PATCH 04/14] Update service-keyword-inspire.xml Use Anchor to entry in INSPIRE registry Also corrected indentation --- docs/snippets/service-keyword-inspire.xml | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/snippets/service-keyword-inspire.xml b/docs/snippets/service-keyword-inspire.xml index eb6c496..13a0014 100644 --- a/docs/snippets/service-keyword-inspire.xml +++ b/docs/snippets/service-keyword-inspire.xml @@ -6,40 +6,40 @@ - humanCatalogueViewer + humanCatalogueViewer - - Commission Regulation (EC) No 1205/2008 of 3 December 2008 implementing Directive 2007/2/ + + 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 - + + + INSPIRE Metadata Implementing Rules + + + + + 2008-12-03 + publication - + - - - OJ:L:2008:326:0012:01 + + + OJ:L:2008:326:0012:01 D 4 CLASSIFICATION OF SPATIAL DATA SERVICES - + @@ -47,4 +47,4 @@ ... - \ No newline at end of file + From d39b7bbaf08b316e374b4afbbb154899d237b617 Mon Sep 17 00:00:00 2001 From: Jo Cook Date: Mon, 13 Nov 2023 13:52:55 +0000 Subject: [PATCH 05/14] Update dev-build.yml --- .github/workflows/dev-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index b91dfcc..5c14e74 100644 --- 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: archaeogeek/gemini-dev + external_repository: agiorguk/gemini-dev publish_branch: gh-pages publish_dir: ./docs/ enable_jekyll: true From 61fdfb50c1f39780bb4cb7ebae6df98c47b18a61 Mon Sep 17 00:00:00 2001 From: Peter Parslow Date: Fri, 17 Nov 2023 11:30:37 +0000 Subject: [PATCH 06/14] Update service-keyword-inspire.xml See https://github.com/agiorguk/gemini/issues/29 --- docs/snippets/service-keyword-inspire.xml | 39 +++++++++++------------ 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/docs/snippets/service-keyword-inspire.xml b/docs/snippets/service-keyword-inspire.xml index dce9b61..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 - + From 95d35e54ab78ad3b48557fb35b4f6a64d12465b5 Mon Sep 17 00:00:00 2001 From: archaeogeek Date: Wed, 6 Dec 2023 11:31:36 +0000 Subject: [PATCH 07/14] Fixed some broken links in additionalinformation and responsibleorganisation elements --- docs/partials/additionalinformation.asciidoc | 5 ++--- docs/partials/responsibleorganisation.asciidoc | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/partials/additionalinformation.asciidoc b/docs/partials/additionalinformation.asciidoc index 68590b9..bb5ef98 100644 --- a/docs/partials/additionalinformation.asciidoc +++ b/docs/partials/additionalinformation.asciidoc @@ -22,9 +22,8 @@ a reference (e.g. a URL). |Guidance a| . Information about access to the resource should be in -<<19[Resource locator]. -. Information about fees should be in <<25[Limitations on public -access] +<>. +. Information about fees should be in <>. . Other relevant information should be in this element, or provided by a link which is given in this element. . References to other documents may be by URL, DOI, or other means. diff --git a/docs/partials/responsibleorganisation.asciidoc b/docs/partials/responsibleorganisation.asciidoc index 6cd912f..f2ea71f 100644 --- a/docs/partials/responsibleorganisation.asciidoc +++ b/docs/partials/responsibleorganisation.asciidoc @@ -155,7 +155,7 @@ corrected. . The encoding example for responsible organisation is shown below. The example shows the minimum required information. . The format of address and contact information is described at -link:component/content/article?id=1048#2.2.8[Responsible party], with a +xref:1048-uk-gemini-encoding-guidance#_responsible_party[Responsible party], with a 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 From fd4270529f3915ffc3944b0e66d8438c7ceea8e1 Mon Sep 17 00:00:00 2001 From: Peter Parslow Date: Wed, 3 Jan 2024 11:41:16 +0000 Subject: [PATCH 08/14] Update useconstraints.asciidoc Make the "Corresponding element in other standards" directly collapsible, as in the other elements (without the leading dot, we get an extra "details" heading as the actually collapsible part) --- docs/partials/useconstraints.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/partials/useconstraints.asciidoc b/docs/partials/useconstraints.asciidoc index 12256f1..ce7a4bc 100644 --- a/docs/partials/useconstraints.asciidoc +++ b/docs/partials/useconstraints.asciidoc @@ -42,7 +42,7 @@ can have open access (e.g. to look at it), but restricted use. |Revision date |September 2018 |=== -Corresponding element in other standards... +.Corresponding element in other standards... [%collapsible] ==== |=== From 20419bcb5030bc83e3016a849140592a9c7fb28a Mon Sep 17 00:00:00 2001 From: archaeogeek Date: Tue, 13 Feb 2024 09:08:03 +0000 Subject: [PATCH 09/14] Fixed incorrect reference to metadatadate snippet in metadatalanguage encoding guidelines --- docs/partials/metadatalanguage.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/partials/metadatalanguage.asciidoc b/docs/partials/metadatalanguage.asciidoc index 9cee1f5..4d0dd5c 100644 --- a/docs/partials/metadatalanguage.asciidoc +++ b/docs/partials/metadatalanguage.asciidoc @@ -88,7 +88,7 @@ content of the gmd:LanguageCode element | [source,xml] ---- -include::../snippets/metadatadate.xml[] +include::../snippets/metadatalanguage.xml[] ---- |=== ==== From d77bcf527a0d94ef51a03d47978b73048288eaa1 Mon Sep 17 00:00:00 2001 From: archaeogeek Date: Mon, 11 Mar 2024 09:22:50 +0000 Subject: [PATCH 10/14] Split guidance into datasets and services as per https://github.com/agiorguk/gemini/issues/12 --- docs/partials/conformity.asciidoc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/partials/conformity.asciidoc b/docs/partials/conformity.asciidoc index 6450d5c..bab8d90 100644 --- a/docs/partials/conformity.asciidoc +++ b/docs/partials/conformity.asciidoc @@ -59,9 +59,14 @@ Guidelines, publication, 2010-04-26 !true !Only mandatory items included !=== |Guidance a| -. For Gemini compliance, you must provide a conformity statement referring to the INSPIRE specifications, even if the dataset is not conformant, or you didn't test it. -. Datasets, dataset series and metadata about invocable spatial data services shall declare conformity to [INSPIRE Regulation 1089/2010] and shall use the title and citation date in the example and encoding guidelines below. +. For Gemini compliance, you shall provide a conformity statement referring to the INSPIRE specifications, even if the dataset or service is not conformant, or you didn't test it. +# tag::dataset[] +. Datasets and dataset series shall declare conformity to [INSPIRE Regulation 1089/2010] and shall use the title and citation date in the example and encoding guidelines below. +# end::dataset[] +# tag::service[] +. Metadata about invocable spatial data services shall declare conformity to [INSPIRE Regulation 1089/2010] and shall use the title and citation date in the example and encoding guidelines below. . Metadata about network services shall declare conformity to [INSPIRE Regulation 976/2009]. +# end::service[] . Other conformity statements may be added, where each conformity statement shall relate to only one specification. . Each conformity statement shall relate to only one specification . Each conformity statement shall state the specification that it is about, the degree of conformity (true or false) and optionally an 'Explanation', for example to reference the conformance criteria in the specification against which conformance is being claimed. From 385a62037644f4ff90bc9558828cc92540e5d409 Mon Sep 17 00:00:00 2001 From: Jo Cook Date: Mon, 11 Mar 2024 09:27:35 +0000 Subject: [PATCH 11/14] Update dev-build.yml --- .github/workflows/dev-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index 5c14e74..b91dfcc 100644 --- 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 From 6305d1b518338b5f639d718f7600d13432b9b38a Mon Sep 17 00:00:00 2001 From: archaeogeek Date: Mon, 11 Mar 2024 09:30:50 +0000 Subject: [PATCH 12/14] added workflow action config to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4c14a88..3ecd8a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ docs/*.html pending/ +.github/workflows/*.yml From 815497576a8d120fd9bb891f10adc4269dbb60f0 Mon Sep 17 00:00:00 2001 From: archaeogeek Date: Thu, 21 Mar 2024 14:27:01 +0000 Subject: [PATCH 13/14] fixed a couple of typos in links to other pages --- docs/1037-uk-gemini-introduction.asciidoc | 2 +- ...a-guidelines-for-geospatial-data-resources-part-2.asciidoc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/1037-uk-gemini-introduction.asciidoc b/docs/1037-uk-gemini-introduction.asciidoc index 94e673e..8d56884 100644 --- a/docs/1037-uk-gemini-introduction.asciidoc +++ b/docs/1037-uk-gemini-introduction.asciidoc @@ -14,7 +14,7 @@ entry points to the guidance: ** 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: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] 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 d032a7a..f667545 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 @@ -378,9 +378,9 @@ user. 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] Each metadata element is listed separately, as described in link:1051-uk-gemini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.html#4.3[UK GEMINI Introduction]. From c5f5ece3a6820a25e192245e852fae426a0fa1c7 Mon Sep 17 00:00:00 2001 From: archaeogeek Date: Wed, 10 Apr 2024 12:08:50 +0100 Subject: [PATCH 14/14] fixed typos in resourceidentifier guidance --- docs/partials/resourceidentifier.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/partials/resourceidentifier.asciidoc b/docs/partials/resourceidentifier.asciidoc index 729182d..4d6918e 100644 --- a/docs/partials/resourceidentifier.asciidoc +++ b/docs/partials/resourceidentifier.asciidoc @@ -35,7 +35,7 @@ These elements are described in the table below pattern defined by a code pace !Identifier of a code space within which one or more codes are defined -!Obligation !mandatory !conditional ~ must be suppled if the code by +!Obligation !mandatory !conditional ~ must be supplied if the code by itself does not uniquely identify the resource. !Occurrence !single !single @@ -45,7 +45,7 @@ itself does not uniquely identify the resource. !Domain !free text !free text !Other comments !- !This code space is often defined by some authority -organization, were one organization may define multiple code spaces. The +organization, where one organization may define multiple code spaces. The range and format of each code space identifier is defined by that code space authority. !===