Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/metawal-4.4.x' into metawal-4.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@GeryNi
GeryNi committed Oct 4, 2024
2 parents 2185b59 + c811c78 commit b3db8db
Show file tree
Hide file tree
Showing 34 changed files with 15,785 additions and 1,053 deletions.
11 changes: 10 additions & 1 deletion schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,17 +210,26 @@
-->
<xsl:template mode="iso19115-3-to-dcat"
match="mdb:metadataIdentifier
|mdb:identificationInfo/*/mri:citation/*/cit:identifier
|cit:identifier">
<xsl:variable name="code"
select="*/mcc:code/*/text()"/>
<xsl:variable name="codeSpace"
select="*/mcc:codeSpace/*/text()"/>
<xsl:variable name="isUrn"
as="xs:boolean"
select="starts-with($codeSpace, 'urn:')"/>
<xsl:variable name="separator"
as="xs:string"
select="if ($isUrn) then ':' else '/'"/>

<xsl:variable name="codeWithPrefix"
select="if (string($codeSpace))
then concat($codeSpace,
(if (ends-with($codeSpace, '/')) then '' else '/'),
(if (ends-with($codeSpace, $separator)) then '' else $separator),
$code)
else $code"/>

<xsl:variable name="codeType"
select="if (matches($codeWithPrefix, '^https?://|urn:'))
then 'anyURI' else 'string'"/>
Expand Down
13 changes: 8 additions & 5 deletions ...5-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core-dataset.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,18 +178,22 @@
<xsl:call-template name="iso19115-3-to-dcat-resource"/>

<xsl:apply-templates mode="iso19115-3-to-eu-dcat-ap"
select="mdb:identificationInfo/*/mri:citation/*/cit:identifier
|mdb:resourceLineage/*/mrl:source"/>
select="mdb:resourceLineage/*/mrl:source"/>

<xsl:call-template name="rdf-eu-dcat-ap-theme"/>
</xsl:template>


<!--
[o] other identifier Identifier 0..* A secondary identifier of the Dataset, such as MAST/ADS17, DataCite18, DOI19, EZID20 or W3ID21.
Only the first resource identifier is mapped to dct:identifier (even if more are allowed in DCAT or DCAT-AP)
because MobilityDCAT restrict it to 0..1. The other identifiers are mapped to adms:identifier.
https://www.w3.org/TR/vocab-adms/#identifier
-->
<xsl:template mode="iso19115-3-to-eu-dcat-ap"
match="cit:identifier">
<xsl:template mode="iso19115-3-to-dcat"
match="mdb:identificationInfo/*/mri:citation/*/cit:identifier[position() > 1]"
priority="20">
<xsl:variable name="code"
select="*/mcc:code/*/text()"/>
<xsl:variable name="codeSpace"
Expand All @@ -211,7 +215,6 @@
</xsl:template>



<!--
applicable legislation Legal Resource 0..* The legislation that mandates the creation or management of the Dataset.
-->
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -26,7 +26,7 @@
<foaf:isPrimaryTopicOf>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/ns/dcat#CatalogRecord"/>
<dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">urn:uuid/{uuid}</dct:identifier>
<dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">urn:uuid:{uuid}</dct:identifier>
<dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2023-12-08T12:26:19.337626Z</dct:modified>
<dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2019-04-02T12:33:24</dct:issued>
<dct:title xml:lang="fre">Plan de secteur en vigueur (version coordonnée vectorielle)</dct:title>
Expand Down
118 changes: 59 additions & 59 deletions ...est/resources/org/fao/geonet/api/records/formatters/iso19115-3.2018-dcat-service-core.rdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
<foaf:isPrimaryTopicOf>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/ns/dcat#CatalogRecord"/>
<dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">urn:uuid/{uuid}</dct:identifier>
<dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#anyURI">urn:uuid:{uuid}</dct:identifier>
<dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2023-12-11T07:25:51.082626Z</dct:modified>
<dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2019-04-02T12:35:21</dct:issued>
<dct:title xml:lang="fre">INSPIRE - Sites protégés en Wallonie (BE) - Service de téléchargement


</dct:title>
<dct:title xml:lang="eng">INSPIRE - Protected site in Walloon region (BE) - Download
service</dct:title>
Expand Down Expand Up @@ -64,7 +64,7 @@
dérivées selon le mécanisme de désignation;
- Accéder aux séries de couches de données géographiques relatives au thème "Sites protégés" et aux sites de
désignation par site protégé.

</dct:description>
<foaf:primaryTopic rdf:resource="https://metawal.wallonie.be/geonetwork/srv/api/records/3dbe0017-a71f-4923-9b44-fdb5afef5778"/>
</rdf:Description>
Expand All @@ -73,8 +73,8 @@
<foaf:Document rdf:about="https://metawal.wallonie.be/geonetwork/srv/api/records/3dbe0017-a71f-4923-9b44-fdb5afef5778"/>
</dcat:landingPage>
<dct:title xml:lang="fre">INSPIRE - Sites protégés en Wallonie (BE) - Service de téléchargement


</dct:title>
<dct:title xml:lang="eng">INSPIRE - Protected site in Walloon region (BE) - Download
service</dct:title>
Expand Down Expand Up @@ -109,7 +109,7 @@
dérivées selon le mécanisme de désignation;
- Accéder aux séries de couches de données géographiques relatives au thème "Sites protégés" et aux sites de
désignation par site protégé.

</dct:description>
<dcat:contactPoint>
<rdf:Description>
Expand All @@ -118,7 +118,7 @@
<rdf:Description>
<vcard:organisation-name xml:lang="fre">Helpdesk carto du SPW (SPW - Secrétariat général - SPW Digital - Département de la
Géomatique - Direction de l'Intégration des géodonnées)

</vcard:organisation-name>
</rdf:Description>
</vcard:org>
Expand All @@ -133,7 +133,7 @@
<rdf:type rdf:resource="http://www.w3.org/ns/prov#Agent"/>
<foaf:name xml:lang="fre">Direction de l'Intégration des géodonnées (SPW - Secrétariat général - SPW Digital
- Département de la Géomatique - Direction de l'Intégration des géodonnées)

</foaf:name>
<foaf:mbox rdf:resource="mailto:helpdesk.carto@spw.wallonie.be"/>
</rdf:Description>
Expand All @@ -150,154 +150,154 @@
<rdf:type rdf:resource="http://xmlns.com/foaf/0.1/Organization"/>
<rdf:type rdf:resource="http://www.w3.org/ns/prov#Agent"/>
<foaf:name xml:lang="fre">Service public de Wallonie (SPW)

</foaf:name>
<foaf:mbox rdf:resource="mailto:helpdesk.carto@spw.wallonie.be"/>
<foaf:workplaceHomepage xml:lang="fre">https://geoportail.wallonie.be

</foaf:workplaceHomepage>
</rdf:Description>
</dct:rightsHolder>
<dcat:theme>
<skos:Concept rdf:about="https://metawal.wallonie.be/thesaurus/theme-geoportail-wallon#ThemesGeoportailWallon/10">
<skos:prefLabel xml:lang="fre">Nature et environnement

</skos:prefLabel>
</skos:Concept>
</dcat:theme>
<dcat:theme>
<skos:Concept rdf:about="https://metawal.wallonie.be/thesaurus/theme-geoportail-wallon#SubThemesGeoportailWallon/1010">
<skos:prefLabel xml:lang="fre">Faune et flore

</skos:prefLabel>
</skos:Concept>
</dcat:theme>
<dcat:theme>
<skos:Concept rdf:about="http://inspire.ec.europa.eu/theme/ps">
<skos:prefLabel xml:lang="fre">Sites protégés

</skos:prefLabel>
</skos:Concept>
</dcat:theme>
<dcat:keyword xml:lang="fre">zones naturelles, paysages, écosystèmes

</dcat:keyword>
<dcat:keyword xml:lang="fre">politique environnementale

</dcat:keyword>
<dcat:keyword xml:lang="fre">biologie

</dcat:keyword>
<dcat:keyword xml:lang="fre">site naturel

</dcat:keyword>
<dcat:keyword xml:lang="fre">écologie

</dcat:keyword>
<dcat:keyword xml:lang="fre">évaluation du patrimoine naturel

</dcat:keyword>
<dcat:keyword xml:lang="fre">politique de conservation de la nature

</dcat:keyword>
<dcat:keyword xml:lang="fre">monument historique

</dcat:keyword>
<dcat:keyword xml:lang="fre">parc naturel

</dcat:keyword>
<dcat:keyword xml:lang="fre">espace naturel

</dcat:keyword>
<dcat:keyword xml:lang="fre">législation en matière de préservation de la nature

</dcat:keyword>
<dcat:keyword xml:lang="fre">conservation des ressources naturelles

</dcat:keyword>
<dcat:keyword xml:lang="fre">site naturel protégé

</dcat:keyword>
<dcat:keyword xml:lang="fre">archéologie

</dcat:keyword>
<dcat:keyword xml:lang="fre">milieu naturel

</dcat:keyword>
<dcat:keyword xml:lang="fre">patrimoine naturel

</dcat:keyword>
<dcat:keyword xml:lang="fre">paysage

</dcat:keyword>
<dcat:keyword xml:lang="fre">géologie

</dcat:keyword>
<dcat:keyword xml:lang="fre">monument

</dcat:keyword>
<dcat:keyword xml:lang="fre">conservation

</dcat:keyword>
<dcat:keyword xml:lang="fre">espace protégé

</dcat:keyword>
<dcat:keyword xml:lang="fre">patrimoine culturel

</dcat:keyword>
<dcat:keyword xml:lang="fre">Reporting INSPIRE

</dcat:keyword>
<dcat:keyword xml:lang="fre">natura2000

</dcat:keyword>
<dcat:keyword xml:lang="fre">N2K

</dcat:keyword>
<dcat:keyword xml:lang="fre">biodiversité

</dcat:keyword>
<dcat:keyword xml:lang="fre">protected sites

</dcat:keyword>
<dcat:keyword xml:lang="fre">site protégé

</dcat:keyword>
<dcat:keyword xml:lang="fre">aire protégée

</dcat:keyword>
<dcat:keyword xml:lang="fre">inspire

</dcat:keyword>
<dcat:keyword xml:lang="fre">téléchargement

</dcat:keyword>
<dcat:keyword xml:lang="fre">Feed

</dcat:keyword>
<dcat:keyword xml:lang="fre">ATOM

</dcat:keyword>
<dcat:keyword xml:lang="fre">IUCN

</dcat:keyword>
<dcat:keyword xml:lang="fre">ProtectedSite

</dcat:keyword>
<dcat:theme>
<skos:Concept rdf:about="http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceCategory/infoProductAccessService">
<skos:prefLabel xml:lang="fre">Service d’accès aux produits

</skos:prefLabel>
</skos:Concept>
</dcat:theme>
<dcat:keyword xml:lang="fre">Location of sites (Habitats Directive)

</dcat:keyword>
<dcat:theme>
<skos:Concept rdf:about="http://inspire.ec.europa.eu/metadata-codelist/SpatialScope/regional">
<skos:prefLabel xml:lang="fre">Régional

</skos:prefLabel>
</skos:Concept>
</dcat:theme>
Expand All @@ -310,7 +310,7 @@
<dct:rights>
<dct:RightsStatement>
<dct:description xml:lang="fre">Conditions d'utilisation spécifiques

</dct:description>
</dct:RightsStatement>
</dct:rights>
Expand All @@ -322,7 +322,7 @@
</dct:conformsTo>
<adms:versionNotes xml:lang="fre">Ce service de téléchargement simple INSPIRE basé sur ATOM est au standard Atom RFC 4287, à
la spécification GeoRSS Simple et à la spécification OpenSearch (pour les éléments concernés).

</adms:versionNotes>
<dct:spatial>
<rdf:Description>
Expand All @@ -333,25 +333,25 @@
<foaf:page>
<foaf:Document rdf:about="https://metawal.wallonie.be/geonetwork/srv/api/records/3dbe0017-a71f-4923-9b44-fdb5afef5778/attachments/download_Inspire_20190430.png">
<dct:description xml:lang="fre">INSPIRE_PS_DS_PIC

</dct:description>
</foaf:Document>
</foaf:page>
<dcat:distribution>
<dcat:Distribution>
<dct:title xml:lang="fre">INSPIRE Sites Protégés - Service de téléchargement

</dct:title>
<dct:description xml:lang="fre">Adresse de connexion au service de téléchargement ATOM Feed des couches de données
du thème "Sites protégés".

</dct:description>
<dcat:accessURL rdf:resource="https://geoservices.wallonie.be/inspire/atom/PS_Service.xml"/>
<dcat:accessService>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/ns/dcat#DataService"/>
<dct:title xml:lang="fre">INSPIRE Sites Protégés - Service de téléchargement

</dct:title>
<dcat:endpointURL rdf:resource="https://geoservices.wallonie.be/inspire/atom/PS_Service.xml"/>
</rdf:Description>
Expand Down Expand Up @@ -383,4 +383,4 @@
<dcat:Dataset rdf:about="https://metawal.wallonie.be/geonetwork/srv/api/records/09b168b9-6f7c-4e6a-adb4-e3352eeda75b"/>
</dcat:servesDataset>
</rdf:Description>
</rdf:RDF>
</rdf:RDF>
Loading

0 comments on commit b3db8db

Please sign in to comment.