diff --git a/.gitignore b/.gitignore index 4c14a88..3ecd8a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ docs/*.html pending/ +.github/workflows/*.yml 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]. 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 819970d..6f58bd0 100644 --- a/docs/1055-uk-gemini-major-changes-since-1-0.asciidoc +++ b/docs/1055-uk-gemini-major-changes-since-1-0.asciidoc @@ -59,11 +59,13 @@ longer just be the century. ==== November 2023 -Fix links (URIs) to ISO 19139 code lists, as per revised INSPIRE TG. +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) 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/conformity.asciidoc b/docs/partials/conformity.asciidoc index a58efbb..bab8d90 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,19 @@ 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 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 -. 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 +79,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 +88,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 +114,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 +192,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 +==== 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. !=== 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 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] ==== |=== 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 + 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 - +