From 4d48548202d9daadc3a88acfa1ed75d4c759c226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 28 Oct 2024 11:17:44 +0100 Subject: [PATCH 1/3] geocat qualified relation, documentation and conforms to --- .../geocat-examples/dataset-conforms-to.rst | 11 ++++ .../dataset-documentation copy.rst | 42 +++++++++++++++ .../dataset-qualified-relation.rst | 11 ++++ .../glossar/bibliothek/geocat-mapping.rst | 52 +++++++++++++++---- .../geocat-mappings/dataset-conforms-to.rst | 10 ++++ .../geocat-mappings/dataset-documentation.rst | 16 ++++++ ...lso.rst => dataset-qualified-relation.rst} | 4 +- 7 files changed, 135 insertions(+), 11 deletions(-) create mode 100644 source/content/glossar/bibliothek/geocat-examples/dataset-conforms-to.rst create mode 100644 source/content/glossar/bibliothek/geocat-examples/dataset-documentation copy.rst create mode 100644 source/content/glossar/bibliothek/geocat-examples/dataset-qualified-relation.rst create mode 100644 source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst create mode 100644 source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst rename source/content/glossar/bibliothek/geocat-mappings/{dataset-see-also.rst => dataset-qualified-relation.rst} (73%) diff --git a/source/content/glossar/bibliothek/geocat-examples/dataset-conforms-to.rst b/source/content/glossar/bibliothek/geocat-examples/dataset-conforms-to.rst new file mode 100644 index 00000000..58411243 --- /dev/null +++ b/source/content/glossar/bibliothek/geocat-examples/dataset-conforms-to.rst @@ -0,0 +1,11 @@ +.. code-block:: xml + :caption: Mapping of the che:dataModel to dct:conforms to + :emphasize-lines: 9 + + + + + https://models.geo.admin.ch/ASTRA/ + + + diff --git a/source/content/glossar/bibliothek/geocat-examples/dataset-documentation copy.rst b/source/content/glossar/bibliothek/geocat-examples/dataset-documentation copy.rst new file mode 100644 index 00000000..8ec1d0e1 --- /dev/null +++ b/source/content/glossar/bibliothek/geocat-examples/dataset-documentation copy.rst @@ -0,0 +1,42 @@ +.. code-block:: xml + :caption: Mapping of the documentation of all other resources except the first one with protocol ``WWW:LINK`` + :emphasize-lines: 3,19,20,21 + + + + https://swisstopo.admin.ch + + + https://swisstopo.admin.ch + + + https://swisstopo.admin.ch + + + https://swisstopo.admin.ch + + + https://swisstopo.admin.ch + + + + + WWW:LINK + + + Landing Page + + + Landing Page + + + + + + + + + + diff --git a/source/content/glossar/bibliothek/geocat-examples/dataset-qualified-relation.rst b/source/content/glossar/bibliothek/geocat-examples/dataset-qualified-relation.rst new file mode 100644 index 00000000..cdacbd1c --- /dev/null +++ b/source/content/glossar/bibliothek/geocat-examples/dataset-qualified-relation.rst @@ -0,0 +1,11 @@ +.. code-block:: xml + :caption: Geocat Identifiers for ``dcat:qualifiedRelation`` + :emphasize-lines: 4 + + + + + 73856ca2:f21d:4cc9:90f6:f3e8375555df + + + diff --git a/source/content/glossar/bibliothek/geocat-mapping.rst b/source/content/glossar/bibliothek/geocat-mapping.rst index cc609143..fa662786 100644 --- a/source/content/glossar/bibliothek/geocat-mapping.rst +++ b/source/content/glossar/bibliothek/geocat-mapping.rst @@ -122,9 +122,15 @@ Mapping to dcat:Dataset * - :ref:`accrual periodicity ` - :ref:`//gmd:identificationInfo//che:CHE_MD_MaintenanceInformation ` - - * - :ref:`see also ` - - :ref:`//gmd:identificationInfo//gmd:aggregationInfo ` - - + * - :ref:`qualified relation ` + - :ref:`//gmd:identificationInfo//gmd:aggregationInfo ` + - + * - :ref:`documentation ` + - :ref:`//gmd:distributionInfo/gmd:MD_Distribution ` + - new property, depends on gmd:protocol + * - :ref:`conforms to ` + - :ref:`//gmd:contentInfo/che:CHE_MD_FeatureCatalogueDescription/che:dataModel ` + - new property .. _iso_19139_che-distribution-mapping: @@ -413,19 +419,47 @@ Dataset .. include:: geocat-examples/dataset-accrual-periodicity.rst -.. _geocat-dataset-see-also: +.. _geocat-dataset-qualified-relation: + +``//gmd:identificationInfo//gmd:aggregationInfo`` to ``dcat:qualifiedRelation`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. container:: Mapping + + .. include:: geocat-mappings/dataset-qualified-relation.rst + +.. toggle-header:: + :header: Definition of ``dcat:qualifiedRelation`` in DCAT-AP CH + + .. include:: geocat-examples/dataset-qualified-relation.rst + +.. _geocat-dataset-documentation: + +``//gmd:distributionInfo/gmd:MD_Distribution`` to ``foaf:page`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. container:: Mapping + + .. include:: geocat-mappings/dataset-documentation.rst + +.. toggle-header:: + :header: Definition of ``foaf:page`` in DCAT-AP CH + + .. include:: geocat-examples/dataset-documentation.rst + +.. _geocat-dataset-conforms-to: -``//gmd:identificationInfo//gmd:aggregationInfo`` to ``dct:seeAlso`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +``//che:dataModel//che:LocalisedURL`` to ``dct:conformsTo`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. container:: Mapping - .. include:: geocat-mappings/dataset-see-also.rst + .. include:: geocat-mappings/dataset-conforms-to.rst .. toggle-header:: - :header: Definition of ``dcat:seeAlso`` in DCAT-AP CH + :header: Definition of ``dct:conformsTo`` in DCAT-AP CH - .. include:: geocat-examples/dataset-see-also.rst + .. include:: geocat-examples/dataset-conforms-to.rst .. _iso_19139_che-distribution: diff --git a/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst b/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst new file mode 100644 index 00000000..cc3e3444 --- /dev/null +++ b/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst @@ -0,0 +1,10 @@ +:DCAT: :ref:`dct:conformsTo ` +:XPATH: ``che:CHEMD_Metadata/gmd:contentInfo/che:CHE_MD_FeatureCatalogueDescription/che:dataModel/`` +:Value: ``.//che:PTFreeURL/che:URLGroup/che:LocalisedURL 0><0>`` +:Usage Notes: + +.. code-block:: xml + :caption: ISO-19139_che XPath for geocat distribution + + che:CHEMD_Metadata/gmd:contentInfo/che:CHE_MD_FeatureCatalogueDescription/che:dataModel/che:PTFreeURL/che:URLGroup/che:LocalisedURL 0><0> + diff --git a/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst b/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst new file mode 100644 index 00000000..c256607a --- /dev/null +++ b/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst @@ -0,0 +1,16 @@ +:DCAT: :ref:`foaf:page ` +:XPATH: ``//gmd:distributionInfo/gmd:MD_Distribution//gmd:transferOptions//gmd:CI_OnlineResource`` +:Protocol: ``WWW:LINK``, ``WWW:LINK-1.0-http--link`` +:Value: ``.//gmd:linkage/gmd:URL/text()`` +:Fallback-Value: ``'.//che:LocalisedURL`` for any language +:Usage Notes: The protocol ``WWW:LINK-1.0-http--link`` is deprecated, please use ``WWW:LINK`` instead + +.. code-block:: xml + :caption: ISO-19139_che XPath for geocat distribution + + //gmd:distributionInfo/gmd:MD_Distribution//gmd:transferOptions//gmd:CI_OnlineResource + +.. code-block:: xml + :caption: ISO-19139_che XPath for distribution protocol + + //gmd:distributionInfo/gmd:MD_Distribution//gmd:transferOptions//gmd:CI_OnlineResource//gmd:protocol diff --git a/source/content/glossar/bibliothek/geocat-mappings/dataset-see-also.rst b/source/content/glossar/bibliothek/geocat-mappings/dataset-qualified-relation.rst similarity index 73% rename from source/content/glossar/bibliothek/geocat-mappings/dataset-see-also.rst rename to source/content/glossar/bibliothek/geocat-mappings/dataset-qualified-relation.rst index 4da22544..4f160b63 100644 --- a/source/content/glossar/bibliothek/geocat-mappings/dataset-see-also.rst +++ b/source/content/glossar/bibliothek/geocat-mappings/dataset-qualified-relation.rst @@ -1,9 +1,9 @@ -:DCAT: :ref:`rdfs:seeAlso ` +:DCAT: :ref:`dcat:qualifiedRelation ` :XPATH: ``//gmd:identificationInfo//gmd:aggregationInfo//gmd:aggregateDataSetIdentifier/gmd:MD_Identifier`` :Value: ``/gmd:code/gco:CharacterString`` :Mapping of Values: The geocat identifier is mapped to a dct:identifier by attaching ``@`` .. code-block:: xml - :caption: XPATH for rdfs:seeAlso: all such values are taken + :caption: XPATH for dcat:qualifiedRelation: all such values are taken //gmd:identificationInfo//gmd:aggregationInfo//gmd:aggregateDataSetIdentifier/gmd:MD_Identifier/gmd:code/gco:CharacterString From 6b714d7030e766234f7d656e27d9fa20433430a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 28 Oct 2024 18:51:18 +0100 Subject: [PATCH 2/3] fix documentation --- .../{dataset-documentation copy.rst => dataset-documentation.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename source/content/glossar/bibliothek/geocat-examples/{dataset-documentation copy.rst => dataset-documentation.rst} (100%) diff --git a/source/content/glossar/bibliothek/geocat-examples/dataset-documentation copy.rst b/source/content/glossar/bibliothek/geocat-examples/dataset-documentation.rst similarity index 100% rename from source/content/glossar/bibliothek/geocat-examples/dataset-documentation copy.rst rename to source/content/glossar/bibliothek/geocat-examples/dataset-documentation.rst From 18f9660dffa22765d91b76cb3409e35e04db0925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mich=C3=A8le=20Spichtig?= Date: Mon, 11 Nov 2024 10:42:31 +0100 Subject: [PATCH 3/3] revision properties --- source/content/glossar/bibliothek/geocat-mapping.rst | 10 +++++----- .../geocat-mappings/dataset-conforms-to.rst | 11 ++++++++--- .../geocat-mappings/dataset-documentation.rst | 6 +++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/source/content/glossar/bibliothek/geocat-mapping.rst b/source/content/glossar/bibliothek/geocat-mapping.rst index fa662786..ddeca343 100644 --- a/source/content/glossar/bibliothek/geocat-mapping.rst +++ b/source/content/glossar/bibliothek/geocat-mapping.rst @@ -429,35 +429,35 @@ Dataset .. include:: geocat-mappings/dataset-qualified-relation.rst .. toggle-header:: - :header: Definition of ``dcat:qualifiedRelation`` in DCAT-AP CH + :header: Example for geocat mapping to ``dcat:qualifiedRelation`` .. include:: geocat-examples/dataset-qualified-relation.rst .. _geocat-dataset-documentation: ``//gmd:distributionInfo/gmd:MD_Distribution`` to ``foaf:page`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. container:: Mapping .. include:: geocat-mappings/dataset-documentation.rst .. toggle-header:: - :header: Definition of ``foaf:page`` in DCAT-AP CH + :header: Example for geocat mapping to ``foaf:page`` .. include:: geocat-examples/dataset-documentation.rst .. _geocat-dataset-conforms-to: ``//che:dataModel//che:LocalisedURL`` to ``dct:conformsTo`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. container:: Mapping .. include:: geocat-mappings/dataset-conforms-to.rst .. toggle-header:: - :header: Definition of ``dct:conformsTo`` in DCAT-AP CH + :header: Example for geocat mapping to ``dct:conformsTo`` .. include:: geocat-examples/dataset-conforms-to.rst diff --git a/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst b/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst index cc3e3444..cdab5aff 100644 --- a/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst +++ b/source/content/glossar/bibliothek/geocat-mappings/dataset-conforms-to.rst @@ -1,10 +1,15 @@ :DCAT: :ref:`dct:conformsTo ` :XPATH: ``che:CHEMD_Metadata/gmd:contentInfo/che:CHE_MD_FeatureCatalogueDescription/che:dataModel/`` -:Value: ``.//che:PTFreeURL/che:URLGroup/che:LocalisedURL 0><0>`` +:Value: ``.//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel/text()`` :Usage Notes: .. code-block:: xml - :caption: ISO-19139_che XPath for geocat distribution + :caption: ISO-19139_che XPath for dct:conforms to - che:CHEMD_Metadata/gmd:contentInfo/che:CHE_MD_FeatureCatalogueDescription/che:dataModel/che:PTFreeURL/che:URLGroup/che:LocalisedURL 0><0> + + .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURL[@locale="#DE"]/text() + .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURLL[@locale="#FR"]/text() + .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURL[@locale="#EN"]/text() + .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURL[@locale="#IT"]/text() + .//gmd:contentInfo//che:CHE_MD_FeatureCatalogueDescription//che:dataModel//che:PT_FreeURL//che:URLGroup//che:LocalisedURL/text() diff --git a/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst b/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst index c256607a..4dd20ed5 100644 --- a/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst +++ b/source/content/glossar/bibliothek/geocat-mappings/dataset-documentation.rst @@ -1,12 +1,12 @@ :DCAT: :ref:`foaf:page ` :XPATH: ``//gmd:distributionInfo/gmd:MD_Distribution//gmd:transferOptions//gmd:CI_OnlineResource`` -:Protocol: ``WWW:LINK``, ``WWW:LINK-1.0-http--link`` +:Protocol: ``WWW:LINK`` :Value: ``.//gmd:linkage/gmd:URL/text()`` :Fallback-Value: ``'.//che:LocalisedURL`` for any language -:Usage Notes: The protocol ``WWW:LINK-1.0-http--link`` is deprecated, please use ``WWW:LINK`` instead +:Usage Notes: The first resource with WWW:LINK protocol is mapped as dcat:landingPage. All other resources with WWW:LINK protocol are mapped as foaf:page. .. code-block:: xml - :caption: ISO-19139_che XPath for geocat distribution + :caption: ISO-19139_che XPath for foaf:page //gmd:distributionInfo/gmd:MD_Distribution//gmd:transferOptions//gmd:CI_OnlineResource