Skip to content

Commit

Permalink
Formatters / DCAT-AP / Allow PO URI to be used for constraints.
Browse files Browse the repository at this point in the history 
In DCAT-AP, the Publication Office vocabulary is used for license and the mapping was expecting ISO to encode original URI (eg. http://creativecommons.org/licenses/by/4.0/) and not PO ones (eg. http://publications.europa.eu/resource/authority/licence/CC_BY_4_0). So ISO record using PO URI was not returning the licence in DCAT-AP (and was in DCAT - because all licence URI are allowed).

The vocabulary is encoded with the following and `skos:exactMatch` was used for the mapping:
```xml

   <skos:Concept rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"
                 at:deprecated="false">
...
      <skos:exactMatch rdf:resource="http://creativecommons.org/licenses/by/4.0/"/>
```

Adding also `rdf:about` to allow PO URI to be used in ISO record.

Eg. if
```xml
         <mri:resourceConstraints>
            <mco:MD_LegalConstraints>
               <mco:useConstraints>
                  <mco:MD_RestrictionCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_RestrictionCode"
                                          codeListValue="otherRestrictions"/>
               </mco:useConstraints>
               <mco:otherConstraints>
                  <gcx:Anchor xlink:href="http://inspire.ec.europa.eu/metadata-codelist/ConditionsApplyingToAccessAndUse/noConditionsApply">No conditions apply to access and use.</gcx:Anchor>
               </mco:otherConstraints>
            </mco:MD_LegalConstraints>
         </mri:resourceConstraints>
         <mri:resourceConstraints>
            <mco:MD_LegalConstraints>
               <mco:useConstraints>
                  <mco:MD_RestrictionCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_RestrictionCode"
                                          codeListValue="license"/>
               </mco:useConstraints>
               <mco:otherConstraints>
                  <gcx:Anchor xlink:href="http://publications.europa.eu/resource/authority/licence/BSL_1_0">BSL</gcx:Anchor>
               </mco:otherConstraints>
               <mco:otherConstraints>
                  <gcx:Anchor xlink:href="http://creativecommons.org/licenses/by/4.0/">Ces données sont disponibles sous licence CC-BY 4.0 (original).</gcx:Anchor>
               </mco:otherConstraints>
            </mco:MD_LegalConstraints>
         </mri:resourceConstraints>
```

DCAT (preserve all URI)
```xml
<dct:license>
<dct:LicenseDocument rdf:about="http://inspire.ec.europa.eu/metadata-codelist/ConditionsApplyingToAccessAndUse/noConditionsApply"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/BSL_1_0"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://creativecommons.org/licenses/by/4.0/"/>
```

DCAT-AP (only allow PO URI)
```xml

<dct:accessRights>
<dct:RightsStatement rdf:about="http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/noLimitations"/>
</dct:accessRights>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/BSL_1_0"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
```
  • Loading branch information
@fxprunayre
fxprunayre committed Nov 21, 2024
1 parent 3dace18 commit e4bdeb9
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ...o19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@
<xsl:variable name="euDcatLicense"
select="$euLicenses/rdf:RDF/skos:Concept[
matches(skos:exactMatch/@rdf:resource,
concat('https?://', $licenseUriWithoutHttp, '/?'))
or matches(@rdf:about,
concat('https?://', $licenseUriWithoutHttp, '/?'))]"/>

<xsl:if test="$euDcatLicense != ''">
Expand Down
3 changes: 3 additions & 0 deletions ...est/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset-core.rdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,9 @@
<dct:license>
<dct:LicenseDocument rdf:about="https://opensource.org/licenses/CATOSL-1.1"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="https://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
</dct:license>
<dct:rights>
<dct:RightsStatement>
<dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
Expand Down
3 changes: 3 additions & 0 deletions ...src/test/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-dataset.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1207,6 +1207,9 @@
<mco:otherConstraints>
<gco:CharacterString>https://opensource.org/licenses/CATOSL-1.1</gco:CharacterString>
</mco:otherConstraints>
<mco:otherConstraints>
<gcx:Anchor xlink:href="https://publications.europa.eu/resource/authority/licence/CC_BY_4_0">Ces données sont disponibles sous licence CC-BY 4.0.</gcx:Anchor>
</mco:otherConstraints>
</mco:MD_LegalConstraints>
</mri:resourceConstraints>
<mri:resourceConstraints>
Expand Down
3 changes: 3 additions & 0 deletions .../formatters/iso19115-3.2018-eu-dcat-ap-dataset-core-multipleAccrualPeriodicityAllowed.rdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,9 @@
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
</dct:license>
<dct:rights>
<dct:RightsStatement>
<dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
Expand Down
3 changes: 3 additions & 0 deletions ...sources/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-dataset-core.rdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,9 @@
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
</dct:license>
<dct:rights>
<dct:RightsStatement>
<dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
Expand Down
3 changes: 3 additions & 0 deletions ...ces/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-hvd-dataset-core.rdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,9 @@
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
</dct:license>
<dct:rights>
<dct:RightsStatement>
<dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
Expand Down
3 changes: 3 additions & 0 deletions ...rg/fao/geonet/api/records/formatters/iso19115-3.2018-eu-dcat-ap-mobility-dataset-core.rdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,9 @@
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
</dct:license>
<dct:rights>
<dct:RightsStatement>
<dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
Expand Down
3 changes: 3 additions & 0 deletions ...rces/org/fao/geonet/api/records/formatters/iso19115-3.2018-eu-geodcat-ap-dataset-core.rdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,9 @@
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CATOSL_1_1"/>
</dct:license>
<dct:license>
<dct:LicenseDocument rdf:about="http://publications.europa.eu/resource/authority/licence/CC_BY_4_0"/>
</dct:license>
<dct:rights>
<dct:RightsStatement>
<dct:description xml:lang="fre">Conditions d'accès et d'utilisation spécifiques</dct:description>
Expand Down

0 comments on commit e4bdeb9

Please sign in to comment.