From c269bdcb2778c2469e79158694b5691a7d682fc9 Mon Sep 17 00:00:00 2001 From: fnecas Date: Thu, 25 Jul 2024 11:55:54 +0200 Subject: [PATCH 1/2] feat: set datafeeder template on 19115-3 standard --- datafeeder/inspire/topic_category.xsl | 31 +- datafeeder/metadata_template.xml | 528 +++++++++++++------------- datafeeder/metadata_transform.xsl | 408 ++++++++++---------- 3 files changed, 496 insertions(+), 471 deletions(-) diff --git a/datafeeder/inspire/topic_category.xsl b/datafeeder/inspire/topic_category.xsl index d1de3055..be0eba96 100644 --- a/datafeeder/inspire/topic_category.xsl +++ b/datafeeder/inspire/topic_category.xsl @@ -1,13 +1,12 @@ + xmlns:geonet="http://www.fao.org/geonetwork" xmlns:skos="http://www.w3.org/2004/02/skos/core#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:util="java:org.fao.geonet.util.XslUtil" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" + version="2.0" exclude-result-prefixes="#all"> - @@ -82,4 +81,4 @@ The document must have an empty gmd:identificationInfo/gmd:MD_DataIdentification - \ No newline at end of file + diff --git a/datafeeder/metadata_template.xml b/datafeeder/metadata_template.xml index 48a5f575..17081309 100644 --- a/datafeeder/metadata_template.xml +++ b/datafeeder/metadata_template.xml @@ -1,270 +1,274 @@ - - - - 42a640cf-6899-4373-aa82-f45c4828ab24 - - - - - - - - - - - - - 1970-01-01T00:00:00 - - - ISO 19115:2003/19139 - - - 1.0 - - - - - - - - - - - - - - - - - + xsi:schemaLocation="http://standards.iso.org/iso/19115/-3/mdb/2.0 https://schemas.isotc211.org/19115/-3/mdb/2.0/mdb.xsd"> + + + + 42a640cf-6899-4373-aa82-f45c4828ab24 + + + urn:uuid + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1970-01-01T02:40:00 + + + + + + + + + + 1970-01-01T02:40:00 + + + + + + + + + + ISO 19115-3 + + + + + + + Template + + + + + + + + + + + + WGS 1984 + + + + + + + + + + Template - - - - + + + + 1970-01-01 - - - - - - - - - + + + + + + + + + 1970-01-01 - - - - - - - - - - - - - - - - + + + + + + + + + Template abstract - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + 25000 + + + + + + + + + + + 2.78913293567365 + + + 3.272498092970729 + + + 50.4997300394295 + + + 50.7945765614518 + + + + + + + + + + + + + + + Template - - - - - - - - GEMET - INSPIRE themes, version 1.0 - - - - + + + + + + + + Catégories + + + + 2020-09-24 - - - - - - - - - - geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme - - - - - - - - - - - - - - - No conditions apply to access and use - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - - - - SHP - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - COMMISSION REGULATION (EU) No 1089/2010 of 23 November 2010 implementing Directive 2007/2/EC of the European Parliament and of the Council as regards interoperability of spatial data sets and services - - - - - 2010-12-08 - - - - - - - - - - Conformance has not been evaluated - - - - - - - - - - Template Lineage - - - - - - + + + + + + + + + + geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories + + + + + + + + + + + + + + No conditions apply to access and use + + + + + + + + + + + + + + + + + + farming + + + + + + + + + + + + + Template + + + + + + + + + + + diff --git a/datafeeder/metadata_transform.xsl b/datafeeder/metadata_transform.xsl index 57820045..6110f99f 100644 --- a/datafeeder/metadata_transform.xsl +++ b/datafeeder/metadata_transform.xsl @@ -1,24 +1,24 @@ - + - + @@ -30,154 +30,166 @@ Default template to apply MetadataRecordProperties.java properties to a record t - + - - - - - - + + + + + + + + + + + match="//mdb:identificationInfo/mri:MD_DataIdentification/mri:citation/cit:CI_Citation/cit:title/gco:CharacterString"> - + - - - - - - - - - - - - - - - - GEMET - INSPIRE themes, version 1.0 - - - - - 2008-06-01 - - - - - - - - - - geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme - - - - - - + + + + + + + + + + + + + + + + + Catégories + + + + + 2024-05-14 + + + + + + + + + + 2024-05-14 + + + + + + + + + + geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories + + + + + + + + + match="//mdb:identificationInfo/mri:MD_DataIdentification/mri:citation/cit:CI_Citation/cit:date[1]/cit:CI_Date/cit:date/gco:Date"> + match="//mdb:identificationInfo/mri:MD_DataIdentification/mri:citation/cit:CI_Citation/cit:date[2]/cit:CI_Date/cit:date/gco:Date"> + match="//mdb:metadataLinkage/cit:CI_OnlineResource/cit:linkage/gco:CharacterString"> - - - + match="//mdb:identificationInfo/mri:MD_DataIdentification/mri:extent/gex:EX_Extent/gex:geographicElement/gex:EX_GeographicBoundingBox"> + + - - + + - - + + - - + + - - + + + match="//mdb:identificationInfo/mri:MD_DataIdentification/mri:spatialRepresentationType/mcc:MD_SpatialRepresentationTypeCode/@codeListValue"> - - - - - - + + + + + + - - - - - + + + + + - - + + + select="$props//datasetResponsibleParty//organizationName" /> + select="$props//datasetResponsibleParty//address//deliveryPoint" /> @@ -185,17 +197,17 @@ Default template to apply MetadataRecordProperties.java properties to a record t - + - - + + + select="$props//metadataResponsibleParty//organizationName" /> + select="$props//metadataResponsibleParty//address//deliveryPoint" /> @@ -203,53 +215,54 @@ Default template to apply MetadataRecordProperties.java properties to a record t - + + match="//mdb:resourceLineage/mrl:LI_Lineage/mrl:statement/gco:CharacterString"> - + - - - - - - - - - - - - + match="//mdb:distributionInfo/mrd:MD_Distribution/mrd:transferOptions"> + + + + + + + + + + + + + + - + - + match="//mdb:referenceSystemInfo/mrs:MD_ReferenceSystem/mrs:referenceSystemIdentifier/mcc:MD_Identifier/mcc:code"> + - + - @@ -262,82 +275,90 @@ Default template to apply MetadataRecordProperties.java properties to a record t - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - + From 6b53c520c72899e383453beff32c070035b90d69 Mon Sep 17 00:00:00 2001 From: Florian Necas Date: Tue, 12 Nov 2024 15:13:45 +0100 Subject: [PATCH 2/2] feat: add back 19139 --- datafeeder/inspire/topic_category-19115-3.xsl | 84 +++ datafeeder/inspire/topic_category.xsl | 31 +- datafeeder/metadata_template-19115-3.xml | 274 +++++++++ datafeeder/metadata_template.xml | 528 +++++++++--------- datafeeder/metadata_transform-19115-3.xsl | 394 +++++++++++++ datafeeder/metadata_transform.xsl | 388 ++++++------- 6 files changed, 1213 insertions(+), 486 deletions(-) create mode 100644 datafeeder/inspire/topic_category-19115-3.xsl create mode 100644 datafeeder/metadata_template-19115-3.xml create mode 100644 datafeeder/metadata_transform-19115-3.xsl diff --git a/datafeeder/inspire/topic_category-19115-3.xsl b/datafeeder/inspire/topic_category-19115-3.xsl new file mode 100644 index 00000000..be0eba96 --- /dev/null +++ b/datafeeder/inspire/topic_category-19115-3.xsl @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + No mapping exists for rdf:about= ''. + Keyword: '' + + + + + + No matching topic category for keyword '' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/datafeeder/inspire/topic_category.xsl b/datafeeder/inspire/topic_category.xsl index be0eba96..a6863376 100644 --- a/datafeeder/inspire/topic_category.xsl +++ b/datafeeder/inspire/topic_category.xsl @@ -1,17 +1,18 @@ + xmlns:dcterms="http://purl.org/dc/terms/" xmlns:gco="http://www.isotc211.org/2005/gco" + xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:srv="http://www.isotc211.org/2005/srv" + xmlns:gmx="http://www.isotc211.org/2005/gmx" xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:util="java:org.fao.geonet.util.XslUtil" version="2.0" exclude-result-prefixes="#all"> - + The document must have an empty gmd:identificationInfo/gmd:MD_DataIdentification/gmd:topicCategory + --> @@ -23,11 +24,11 @@ The document must have an empty gmd:identificationInfo/gmd:MD_DataIdentification - - + + - - + + @@ -38,7 +39,7 @@ The document must have an empty gmd:identificationInfo/gmd:MD_DataIdentification - No matching topic category for keyword '' + No matching topic category for keyword '' @@ -81,4 +82,4 @@ The document must have an empty gmd:identificationInfo/gmd:MD_DataIdentification - + \ No newline at end of file diff --git a/datafeeder/metadata_template-19115-3.xml b/datafeeder/metadata_template-19115-3.xml new file mode 100644 index 00000000..17081309 --- /dev/null +++ b/datafeeder/metadata_template-19115-3.xml @@ -0,0 +1,274 @@ + + + + + 42a640cf-6899-4373-aa82-f45c4828ab24 + + + urn:uuid + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1970-01-01T02:40:00 + + + + + + + + + + 1970-01-01T02:40:00 + + + + + + + + + + ISO 19115-3 + + + + + + + Template + + + + + + + + + + + + WGS 1984 + + + + + + + + + + + Template + + + + + 1970-01-01 + + + + + + + + + + 1970-01-01 + + + + + + + + + + Template abstract + + + + + + + + + + + + + + + + + 25000 + + + + + + + + + + + 2.78913293567365 + + + 3.272498092970729 + + + 50.4997300394295 + + + 50.7945765614518 + + + + + + + + + + + + + + + + Template + + + + + + + + Catégories + + + + + 2020-09-24 + + + + + + + + + + geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories + + + + + + + + + + + + + + No conditions apply to access and use + + + + + + + + + + + + + + + + + + farming + + + + + + + + + + + + + Template + + + + + + + + + + + diff --git a/datafeeder/metadata_template.xml b/datafeeder/metadata_template.xml index 17081309..3a7940de 100644 --- a/datafeeder/metadata_template.xml +++ b/datafeeder/metadata_template.xml @@ -1,274 +1,270 @@ - + - - - - 42a640cf-6899-4373-aa82-f45c4828ab24 - - - urn:uuid - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1970-01-01T02:40:00 - - - - - - - - - - 1970-01-01T02:40:00 - - - - - - - - - - ISO 19115-3 - - - - - - - Template - - - - - - - - - - - - WGS 1984 - - - - - - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.isotc211.org/2005/gmd http://schemas.opengis.net/csw/2.0.2/profiles/apiso/1.0.0/apiso.xsd"> + + 42a640cf-6899-4373-aa82-f45c4828ab24 + + + + + + + + + + + + + 1970-01-01T00:00:00 + + + ISO 19115:2003/19139 + + + 1.0 + + + + + + + + + + + + + + + + + Template - - - - + + + + 1970-01-01 - - - - - - - - - + + + + + + + + + 1970-01-01 - - - - - - - - - + + + + + + + + + + + + + + + + Template abstract - - - - - - - - - - - - - - - - - 25000 - - - - - - - - - - - 2.78913293567365 - - - 3.272498092970729 - - - 50.4997300394295 - - - 50.7945765614518 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + Template - - - - - - - - Catégories - - - - + + + + + + + + GEMET - INSPIRE themes, version 1.0 + + + + 2020-09-24 - - - - - - - - - - geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories - - - - - - - - - - - - - - No conditions apply to access and use - - - - - - - - - - - - - - - - - - farming - - - - - - - - - - - - - Template - - - - - - - - - - - + + + + + + + + + + geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme + + + + + + + + + + + + + + + No conditions apply to access and use + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + + + + SHP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + COMMISSION REGULATION (EU) No 1089/2010 of 23 November 2010 implementing Directive 2007/2/EC of the European Parliament and of the Council as regards interoperability of spatial data sets and services + + + + + 2010-12-08 + + + + + + + + + + Conformance has not been evaluated + + + + + + + + + + Template Lineage + + + + + + diff --git a/datafeeder/metadata_transform-19115-3.xsl b/datafeeder/metadata_transform-19115-3.xsl new file mode 100644 index 00000000..6110f99f --- /dev/null +++ b/datafeeder/metadata_transform-19115-3.xsl @@ -0,0 +1,394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Catégories + + + + + 2024-05-14 + + + + + + + + + + 2024-05-14 + + + + + + + + + + geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/datafeeder/metadata_transform.xsl b/datafeeder/metadata_transform.xsl index 6110f99f..c54edd14 100644 --- a/datafeeder/metadata_transform.xsl +++ b/datafeeder/metadata_transform.xsl @@ -1,16 +1,16 @@ @@ -18,7 +18,7 @@ Default template to apply MetadataRecordProperties.java properties to a record template adhering to http://schemas.opengis.net/csw/2.0.2/profiles/apiso/1.0.0/apiso.xsd --> - + @@ -30,160 +30,148 @@ - + - - - - - - - - - - + + + + + + + match="gmd:identificationInfo/gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:title/gco:CharacterString"> - + - - - - - - - - - - - - - - - - - Catégories - - - - - 2024-05-14 - - - - - - - - - - 2024-05-14 - - - - - - - - - - geonetwork.thesaurus.external.theme.thesaurus_mot_cle_thematique_categories - - - - - - - + + + + + + + + + + + + + + + + GEMET - INSPIRE themes, version 1.0 + + + + + 2008-06-01 + + + + + + + + + + geonetwork.thesaurus.external.theme.httpinspireeceuropaeutheme-theme + + + + + + - + match="//gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date[1]/gmd:CI_Date/gmd:date/gco:Date"> + match="//gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:date[2]/gmd:CI_Date/gmd:date/gco:Date"> + match="//gmd:MD_DataIdentification/gmd:citation/gmd:CI_Citation/gmd:identifier/gmd:MD_Identifier/gmd:code/gco:CharacterString"> + - - + match="//gmd:MD_DataIdentification/gmd:extent/gmd:EX_Extent/gmd:geographicElement/gmd:EX_GeographicBoundingBox"> + + - - + + - - + + - - + + - - + + + match="//gmd:MD_DataIdentification/gmd:spatialRepresentationType/gmd:MD_SpatialRepresentationTypeCode/@codeListValue"> - - - - - - + + + + + + - - - - - + + + + + - - + + - + - - + + - + + match="//gmd:dataQualityInfo/gmd:DQ_DataQuality/gmd:lineage/gmd:LI_Lineage/gmd:statement/gco:CharacterString"> - + - - - - - - - - - - - - - - + match="//gmd:distributionInfo//gmd:MD_Distribution//gmd:transferOptions//gmd:MD_DigitalTransferOptions"> + + + + + + + + + + + + - + - + match="gmd:referenceSystemInfo//gmd:MD_ReferenceSystem//gmd:referenceSystemIdentifier//gmd:RS_Identifier/gmd:code"> + - + + @@ -275,90 +262,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - +