Merge branch 'dev' into PeterParslow-patch-Issue-67

agiorguk · Jul 31, 2024 · f05cc3f · f05cc3f
2 parents eab9188 + 29a0510
commit f05cc3f
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 78 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: archaeogeek/gemini-dev
+        external_repository: agiorguk/gemini-dev
         publish_branch: gh-pages
         publish_dir: ./docs/
         enable_jekyll: true
diff --git a/docs/1046-xml-element-order.asciidoc b/docs/1046-xml-element-order.asciidoc
@@ -18,6 +18,8 @@ to{nbsp}link:1037-uk-gemini-introduction.html[GEMINI
 |gmd:hierarchyLevelName |47 |Hierarchy level name
 |gmd:contact |35 |Metadata point of contact
 |gmd:dateStamp |30 |Metadata date
+|gmd:metadataStandardName |54 |Metadata standard name
+|gmd:metadataStandardVersion |55 |Metadata standard version
 |gmd:referenceSystemInfo |17 |Spatial reference system
 |gmd:identificationInfo | |
 |*_gmd:MD_DataIdentification_* | |
@@ -122,6 +124,6 @@ to{nbsp}link:1037-uk-gemini-introduction.html[GEMINI
 |   gmd:DQ_DomainConsistency |41 |Conformity
 |===
 
-_Last updated: April 2018_
+_Last updated: July 2024_
 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
@@ -438,7 +438,7 @@ content, such as gmd:identificationInfo (Figure 9).
 The first XML child element of any GEMINI2 metadata instance shall be
 gmd:fileIdentifier. The content of this XML element is the identifier of
 the metadata instance. File identifier is not to be confused with the
-metadata item link:datasets.html#36[Resource Identifier].
+metadata item link:1062-gemini-datasets-and-data-series.html#36[Resource Identifier].
 
 The content of the XML element shall be a unique managed identifier,
 such as a system generated UUID. Once the identifier has been set for a
@@ -1044,7 +1044,7 @@ series, ISO 19115 hierarchyLevelName element must also be set, to
 
 ==== Detailed guidance for each metadata element
 
-link:datasets.html[Datasets]
+link:1062-gemini-datasets-and-data-series.html[Datasets]
 
 === Metadata for services
 
@@ -1109,7 +1109,7 @@ with null values with the nil reason being missing (Figure 25).
 
 ==== Detailed guidance for each metadata element
 
-link:services.html[Services]
+link:1063-gemini-services.html[Services]
 
 _Last technical update: March 2019_
 

diff --git a/...ini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.asciidoc b/...ini-v2-2-specification-for-discovery-metadata-for-geospatial-resources.asciidoc
@@ -276,47 +276,6 @@ this element
 
 - *Errors observed* - observations on errors noted with each element
 
-== Extended metadata
-
-=== Additional metadata elements
-
-In many organisations, there is a need to record additional items of
-metadata to meet specific local requirements. This may be to incorporate
-particular characteristics of the data resources, or for particular
-applications. Additional metadata elements may be included in a metadata
-implementation. These elements should be taken from ISO 19115,
-which includes a comprehensive collection of metadata elements for
-geographic information, and also allows for further extensions.
-
-=== Extension of code lists
-
-Several metadata elements specified in UK GEMINI use enumerated code
-lists. These are pre-defined sets of values identified by codes. They
-are useful to standardise the entries to aid searches of metadata for
-specified values. The code lists included in UK GEMINI are taken from
-ISO 19115. In some cases, the explanations of the values have been
-modified to make them more appropriate to the UK context.
-
-Some of these code lists will require extension. Additional codes may be
-created as follows:
-
-. identify the new value, which should be distinct from existing values;
-. choose a name that encapsulates the essential concept;
-. provide a definition that is understandable and concise;
-. chose a new code that has not been used before for this element;
-. document the new codes, and disseminate them to users.
-
-Such code extensions may be either specific to a metadata implementation
-in an organisation or sector, or for general usage. In the latter case,
-proposed new codes should be
-submitted{nbsp}to{nbsp}[email protected]{nbsp}for
-inclusion in the next version of UK GEMINI. It is expected that future
-editions of UK GEMINI will incorporate such modified code lists.
-
-*Note that any new code values cannot be used in a national metadata
-service until incorporated in the Standard, nor will they be valid for
-the purposes of INSPIRE.*
-
 _Last updated: May 2018_
 
 http://creativecommons.org/licenses/by/4.0/[image:https://i.creativecommons.org/l/by/4.0/88x31.png[Creative Commons Licence]] +

diff --git a/docs/1055-uk-gemini-major-changes-since-1-0.asciidoc b/docs/1055-uk-gemini-major-changes-since-1-0.asciidoc
@@ -57,6 +57,10 @@ longer just be the century.
 
 === Editorial changes since the launch of GEMINI 2.3
 
+==== TBC
+
+link:1062-gemini-datasets-and-data-series.html#19[Resource locator]: Add guidance on selecting appropriate OnLineFunctionCode
+
 ==== May 2024
 
 First release after migrating to GitHub based maintenance and publication

diff --git a/docs/partials/alternatetitle.asciidoc b/docs/partials/alternatetitle.asciidoc
@@ -22,8 +22,7 @@ alternative titles by which the data resource is known.
 
 |Guidance a|
 . Should be provided when the data resource has more than one title.
-. There is no need to fill in this entry unless there are other names
-used for the dataset, for example historic names.
+. There is no need to fill in this entry unless there are other names in use.
 . Commonly used abbreviations or acronyms should be recorded. If the
 acronym or abbreviation has been used in the main Title, then use the
 full name in the Alternative Title.
@@ -106,4 +105,4 @@ include::../snippets/service-alternatetitle-multi.xml[]
 [%collapsible]
 ====
 No error information available
-====
+====
diff --git a/docs/partials/boundingbox.asciidoc b/docs/partials/boundingbox.asciidoc
@@ -109,11 +109,15 @@ Bounding box, which was made multiple
 |===
 |Guidelines
 |
-. The encoding example for geographic bounding box for datasets is shown
-in the example
-. Note that the extent XML element is in the gmd namespace. This differs
-from service metadata instances where the extent XML element will be in
-the srv namespace.
+# tag::service[]
+. 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.
+. Note that the EX_Extent XML element is in the gmd namespace, even though it is being used to describe a service.
+# end::service[]
 . The definition of the equivalent ISO 19115 class,
 EX_GeographicBoundingBox, is 'Geographic area of the entire dataset
 referenced to WGS 84'. Consequently, the CRS of the coordinates
@@ -122,15 +126,6 @@ http://www.opengis.net/def/crs/EPSG/0/4326). This means that the
 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.
-
-# 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.
-# end::service[]
 |Example
 |
 [source,xml]
@@ -166,4 +161,4 @@ Six decimal places of a degree is something like 1cm, so the longitude
 above is being given to roughly the nearest molecule.
 
 |===
-====
+====
diff --git a/docs/partials/conformity.asciidoc b/docs/partials/conformity.asciidoc
@@ -10,7 +10,7 @@ include::includes/partials-attributes.adoc[]
 user requirement
 
 |Purpose and meaning |The purpose of this is to record the conformity to
-INSPIRE and any other data specification
+INSPIRE and any other specification
 
 |Obligation |Mandatory
 
@@ -31,12 +31,12 @@ For details see below. +
 !===
 !Metadata element name !specification !degree !explanation
 !Definition !Citation of the product specification or user requirement
-against which data resource is evaluated !degree of conformity with the
+against which the resource is evaluated !degree of conformity with the
 specification !meaning of conformance for this result
 
 !Meaning !The purpose of this element is to identify the specification
 against which conformity is evaluated !The purpose of this element is to
-identify the conformity of the data resource to the cited specification
+identify the conformity of the resource to the cited specification
 !The purpose of this element is to explain the meaning of conformity in
 this context
 
@@ -49,10 +49,10 @@ this context
 !Domain ! !true if conformant +
 false if not conformant !free text
 
-!Rules !Cite the specification to which the data resource should conform
-!The data resource should be evaluated against the specification and the
+!Rules !Cite the specification to which the resource should conform
+!The resource should be evaluated against the specification and the
 result recorded !Include a statement about which aspects of the
-specification the data resource conforms and any exceptions
+specification the resource conforms to, and any exceptions
 
 !Examples !D2.8.I.5 INSPIRE Data Specification on Addresses -
 Guidelines, publication, 2010-04-26 !true !Only mandatory items included

diff --git a/docs/partials/datasetreferencedate.asciidoc b/docs/partials/datasetreferencedate.asciidoc
@@ -118,10 +118,10 @@ GEMINI 1 to 2.0: Addition of date type
 GEMINI2 also allows the date and time to be published in metadata. In
 this case the date encoding shown in Example Two must be used.
 * The format of date and date-time values is described at
-link:component/content/article?id=1048#2.2.3[Dates and Times]
+link:1048-uk-gemini-encoding-guidance.html#_dates_and_times[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].
+link:1048-uk-gemini-encoding-guidance.html#_code_lists[code list].
 # tag::dataset[]
 | Example One: date
 |

diff --git a/docs/partials/resourcelocator.asciidoc b/docs/partials/resourcelocator.asciidoc
@@ -39,7 +39,15 @@ point to one of the values of the ISO 19139 code list
 CI_OnLineFunctionCode)
 * name (this appears on the data.gov.uk site)
 * description (data.gov.uk uses this if no 'name' provided)
-
+. Guidance on selecting appropriate OnLineFunctionCode value for function sub-element.
+!===
+!OnLineFunctionCode !	Meaning !	Example
+!download	! online instructions for transferring data from one storage device or system to another ! WFS Direct URL to file
+!information ! online information about the resource ! WMS Product page
+!offlineAccess ! online instructions for requesting the resource from the provider ! web page containing ordering information
+!order ! online order process for obtaining the resource ! Product ordering page
+!search ! online search interface for seeking out information about the resource ! distributors web site search page	
+!===
 |Comment a|
 The URL provided as the value of the gmd:linkage element should point to
 one of following type of resources:
@@ -283,4 +291,4 @@ Defra metadata audit, October 2015: Very few records included direct
 links to WMS end points.
 
 |===
-====
+====
diff --git a/docs/partials/responsibleorganisation.asciidoc b/docs/partials/responsibleorganisation.asciidoc
@@ -82,6 +82,7 @@ for each.
 These appear in the data.gov.uk search results.
 . If the data was created by someone other than the Data Provider, this
 should also be recorded, using the role value 'Originator'.
+. If you need to identify an individual by name, use CI_ResponsibleParty.individualName. 
 
 |Comment |Facsimile number is no longer required
 
@@ -109,7 +110,7 @@ organisation !The mapping product manager
 acting as distributor, publisher, author, etc. !distributor
 !===
 
-|Revision date |July 2009
+|Revision date |July 2024
 |===
 
 .Corresponding element in other standards...
@@ -183,4 +184,4 @@ include::../snippets/service-responsibleorganisation.xml[]
 [%collapsible]
 ====
 No error information available
-====
+====
diff --git a/docs/partials/useconstraints.asciidoc b/docs/partials/useconstraints.asciidoc
@@ -99,8 +99,6 @@ shown in Example Two may be used. This is recommended for licenses, even
 the use of ISO 19115 otherRestrictions would not generally include
 license restrictions, as they have their own term in the ISO 19115 code
 list.
-. If there are no limitations the value of gmd:otherConstraints shall be
-'no limitations' (see Example Three).
 . There may be more than one gmd:otherConstraints element
 |Example One
 |