Skip to content

DCAT updates for contacts and distributions #8992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
+141 −2
Draft

DCAT updates for contacts and distributions #8992

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d83b23
when iso19115-3.2018.che format have to be searched elsewhere
cmangeat Aug 20, 2025
a847f7c
when iso19115-3.2018.che, when prioritizing individuals
cmangeat Aug 20, 2025
2b20cfc
fix tests, both mrd:MD_DigitalTransferOptions and mrd:MD_Distribution…
cmangeat Aug 21, 2025
fd0ce3b
extra distribution section for formats defined at distributionInfo level
cmangeat Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions ...iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-distribution.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,15 @@
</foaf:page>
</xsl:template>

<xsl:template mode="iso19115-3-to-dcat"
match="mdb:distributionInfo/mrd:MD_Distribution/mrd:distributionFormat">
<dcat:distribution>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless I'm really wrong, this element will be invalid. See https://semiceu.github.io/DCAT-AP/releases/3.0.0/#Distribution, access URL is required.

I think what @fxprunayre meant is to modify the existing template to process the online resources, to use the transferOptions format if exists, otherwise use the distribution ones as you did in the original code.

I would rather add an additional rule https://github.com/geonetwork/core-geonetwork/blob/main/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-distribution.xsl#L336-L339 and gives priority to transferOptions format if any and then fallback on distribution ones.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot ! We did not know about it. Back to draft / analysis, ;-) !

<dcat:Distribution>
<xsl:apply-templates mode="iso19115-3-to-dcat-distribution" select="*/mrd:formatSpecificationCitation"/>
</dcat:Distribution>
</dcat:distribution>
</xsl:template>

<!--
RDF Property: dcat:distribution
Definition: An available distribution of the dataset.
Expand Down Expand Up @@ -366,16 +375,14 @@
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates mode="iso19115-3-to-dcat-distribution"
select="ancestor::mrd:MD_Distribution/mrd:distributionFormat/*/mrd:formatSpecificationCitation |
ancestor::mrd:MD_DigitalTransferOptions/mrd:distributionFormat/*/mrd:formatSpecificationCitation"/>
select="ancestor::mrd:MD_DigitalTransferOptions/mrd:distributionFormat/*/mrd:formatSpecificationCitation"/>
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>

<xsl:apply-templates mode="iso19115-3-to-dcat-distribution"
select="ancestor::mrd:MD_Distribution/mrd:distributionFormat/*/mrd:fileDecompressionTechnique |
ancestor::mrd:MD_DigitalTransferOptions/mrd:distributionFormat/*/mrd:fileDecompressionTechnique"/>
select="ancestor::mrd:MD_DigitalTransferOptions/mrd:distributionFormat/*/mrd:fileDecompressionTechnique"/>


<xsl:if test="$isCopyingDatasetInfoToDistribution">
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
|mdb:identificationInfo/*/mri:extent/*/gex:geographicElement/gex:EX_GeographicBoundingBox
|mdb:identificationInfo/*/mri:extent/*/gex:geographicElement/gex:EX_GeographicDescription
|mdb:identificationInfo/*/mri:extent/*/gex:temporalElement/*/gex:extent
|mdb:distributionInfo/mrd:MD_Distribution/mrd:distributionFormat
|mdb:distributionInfo//mrd:onLine
|.//mpc:portrayalCatalogueCitation/*/cit:onlineResource
|.//mrl:additionalDocumentation//cit:onlineResource
Expand Down
40 changes: 20 additions & 20 deletions ...est/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset-core.rdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,26 @@
<dct:description xml:lang="fr">pds_codt_pic</dct:description>
</foaf:Document>
</foaf:page>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile
(.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File
Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
Expand Down Expand Up @@ -479,16 +499,6 @@
<dcat:endpointURL rdf:resource="https://geoservices.wallonie.be/arcgis/rest/services/AMENAGEMENT_TERRITOIRE/PDS/MapServer"/>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
Expand Down Expand Up @@ -516,16 +526,6 @@
</dct:conformsTo>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<foaf:page>
Expand Down
40 changes: 20 additions & 20 deletions .../formatters/iso19115-3.2018-eu-dcat-ap-dataset-core-multipleAccrualPeriodicityAllowed.rdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,26 @@
<dct:description xml:lang="fr">pds_codt_pic</dct:description>
</foaf:Document>
</foaf:page>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile
(.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File
Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
Expand Down Expand Up @@ -529,16 +549,6 @@
<dcat:endpointURL rdf:resource="https://geoservices.wallonie.be/arcgis/rest/services/AMENAGEMENT_TERRITOIRE/PDS/MapServer"/>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg/2014/1143/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
Expand Down Expand Up @@ -569,16 +579,6 @@
</dct:conformsTo>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg/2014/1143/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
Expand Down
40 changes: 20 additions & 20 deletions ...sources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,26 @@
<dct:description xml:lang="fr">pds_codt_pic</dct:description>
</foaf:Document>
</foaf:page>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile
(.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File
Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
Expand Down Expand Up @@ -520,16 +540,6 @@
<dcat:endpointURL rdf:resource="https://geoservices.wallonie.be/arcgis/rest/services/AMENAGEMENT_TERRITOIRE/PDS/MapServer"/>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg/2014/1143/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
Expand Down Expand Up @@ -560,16 +570,6 @@
</dct:conformsTo>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg/2014/1143/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
Expand Down
40 changes: 20 additions & 20 deletions ...ces/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,26 @@
<dct:description xml:lang="fr">pds_codt_pic</dct:description>
</foaf:Document>
</foaf:page>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile
(.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File
Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
Expand Down Expand Up @@ -529,16 +549,6 @@
<dcat:endpointURL rdf:resource="https://geoservices.wallonie.be/arcgis/rest/services/AMENAGEMENT_TERRITOIRE/PDS/MapServer"/>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg/2014/1143/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
Expand Down Expand Up @@ -569,16 +579,6 @@
</dct:conformsTo>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg/2014/1143/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
Expand Down
40 changes: 20 additions & 20 deletions ...rg/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-mobility-dataset-core.rdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,26 @@
<dct:description xml:lang="fr">pds_codt_pic</dct:description>
</foaf:Document>
</foaf:page>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile
(.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File
Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
</dcat:Distribution>
</dcat:distribution>
<dcat:distribution>
<dcat:Distribution>
<dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2023-02-21</dct:issued>
Expand Down Expand Up @@ -524,16 +544,6 @@
<dcat:endpointURL rdf:resource="https://geoservices.wallonie.be/arcgis/rest/services/AMENAGEMENT_TERRITOIRE/PDS/MapServer"/>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg/2014/1143/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
Expand Down Expand Up @@ -564,16 +574,6 @@
</dct:conformsTo>
</rdf:Description>
</dcat:accessService>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI Shapefile (.shp)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dct:format>
<dct:MediaTypeOrExtent>
<rdfs:label>ESRI File Geodatabase (.fgdb)</rdfs:label>
</dct:MediaTypeOrExtent>
</dct:format>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg/2014/1143/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
<dcatap:applicableLegislation rdf:resource="http://data.europa.eu/eli/reg_impl/2023/138/oj"/>
Expand Down
Loading
Loading