From f6c9d97379541abeb0189ddda484d3436cb474eb Mon Sep 17 00:00:00 2001 From: eblondel Date: Wed, 2 Oct 2024 23:24:06 +0200 Subject: [PATCH] #181 M4 MPC namespace --- R/ISOPortrayalCatalogueReference.R | 9 +++++++-- inst/extdata/coverage/geometa_coverage_inventory.csv | 4 ++-- inst/extdata/coverage/geometa_coverage_summary.csv | 4 ++-- inst/extdata/coverage/geometa_coverage_summary.html | 8 ++++---- inst/extdata/coverage/geometa_coverage_summary.md | 4 ++-- man/ISOPortrayalCatalogueReference.Rd | 4 +++- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/R/ISOPortrayalCatalogueReference.R b/R/ISOPortrayalCatalogueReference.R index 1774aac4..0c0a8673 100644 --- a/R/ISOPortrayalCatalogueReference.R +++ b/R/ISOPortrayalCatalogueReference.R @@ -48,7 +48,9 @@ #' xml <- md$encode() #' #' @references -#' ISO 19115:2003 - Geographic information -- Metadata +#' - ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_PortrayalCatalogueReference} +#' +#' - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/mpc/1.0/mpc/#element_MD_PortrayalCatalogueReference} #' #' @author Emmanuel Blondel #' @@ -56,7 +58,10 @@ ISOPortrayalCatalogueReference <- R6Class("ISOPortrayalCatalogueReference", inherit = ISOAbstractObject, private = list( xmlElement = "MD_PortrayalCatalogueReference", - xmlNamespacePrefix = "GMD" + xmlNamespacePrefix = list( + "19139" = "GMD", + "19115-3" = "MPC" + ) ), public = list( #'@field portrayalCatalogueCitation portrayalCatalogueCitation [1..*] diff --git a/inst/extdata/coverage/geometa_coverage_inventory.csv b/inst/extdata/coverage/geometa_coverage_inventory.csv index 816aa473..647a73f5 100644 --- a/inst/extdata/coverage/geometa_coverage_inventory.csv +++ b/inst/extdata/coverage/geometa_coverage_inventory.csv @@ -126,7 +126,7 @@ "ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_MetadataExtensionInformation","ISOMetadataExtensionInformation",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD" "ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_ObligationCode","ISOObligation",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD" "ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_PixelOrientationCode","ISOPixelOrientation",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD" -"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_PortrayalCatalogueReference","ISOPortrayalCatalogueReference",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD" +"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_PortrayalCatalogueReference","ISOPortrayalCatalogueReference",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD" "ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_ProgressCode","ISOProgress",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD" "ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_RangeDimension","ISORangeDimension",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD" "ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_ReferenceSystem","ISOReferenceSystem",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD" @@ -629,7 +629,7 @@ "ISO/TS 19115-3:2023","ISO 19115-1:2014","MetaData Base (MDB) Version: 2.0","MDB","MD_MetadataScope","ISOMetadataScope",TRUE,TRUE,"ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MDB" "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Maintenance Information (MMI) Version: 1.0","MMI","MD_MaintenanceFrequencyCode","",FALSE,FALSE,"ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MMI" "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Maintenance Information (MMI) Version: 1.0","MMI","MD_MaintenanceInformation","",FALSE,FALSE,"ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MMI" -"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Portrayal Catalogues (MPC) Version: 1.0","MPC","MD_PortrayalCatalogueReference","",FALSE,FALSE,"ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MPC" +"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Portrayal Catalogues (MPC) Version: 1.0","MPC","MD_PortrayalCatalogueReference","ISOPortrayalCatalogueReference",TRUE,TRUE,"ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MPC" "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Resource Content (MRC) Version: 1.0","MRC","AbstractMD_ContentInformation","ISOAbstractContentInformation",TRUE,TRUE,"ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MRC" "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Resource Content (MRC) Version: 1.0","MRC","MD_AttributeGroup","",FALSE,FALSE,"ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MRC" "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Resource Content (MRC) Version: 1.0","MRC","MD_Band","ISOBand",TRUE,TRUE,"ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MRC" diff --git a/inst/extdata/coverage/geometa_coverage_summary.csv b/inst/extdata/coverage/geometa_coverage_summary.csv index 9e137149..a57fd93e 100644 --- a/inst/extdata/coverage/geometa_coverage_summary.csv +++ b/inst/extdata/coverage/geometa_coverage_summary.csv @@ -10,7 +10,7 @@ "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for COnstraints (MCO) Version: 1.0","MCO",5,1,5,1,83.33 "ISO/TS 19115-3:2023","ISO 19115-1:2014","MetaData Base (MDB) Version: 2.0","MDB",2,0,2,0,100 "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Maintenance Information (MMI) Version: 1.0","MMI",0,2,0,2,0 -"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Portrayal Catalogues (MPC) Version: 1.0","MPC",0,1,0,1,0 +"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Portrayal Catalogues (MPC) Version: 1.0","MPC",1,0,1,0,100 "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Resource Content (MRC) Version: 1.0","MRC",16,3,16,3,84.21 "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Resource Distribution (MRD) Version: 1.0","MRD",0,7,0,7,0 "ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Resource Identification (MRI) Version: 1.0","MRI",0,12,0,12,0 @@ -23,7 +23,7 @@ "ISO/TS 19115-3:2023","ISO/TS 19139:2007","CATalogue Objects (CAT) Version: 1.0","CAT",2,15,2,15,11.76 "ISO/TS 19115-3:2023","ISO/TS 19139:2007","Feature Catalog Common (FCC) Version: 1.0","FCC",0,2,0,2,0 "ISO/TS 19139:2007","ISO 19110:2005","Geographic Information - Methodology for feature cataloguing","GFC",17,0,0,17,100 -"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD",132,0,47,85,100 +"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD",132,0,48,84,100 "ISO/TS 19139:2007","ISO 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI",40,0,7,33,100 "ISO/TS 19139:2007","ISO 19119:2005","Geographic Information - Service Metadata","SRV",7,12,0,19,36.84 "ISO/TS 19139:2007","ISO/TS 19103:2005","Geographic Common extensible markup language","GCO",22,0,22,0,100 diff --git a/inst/extdata/coverage/geometa_coverage_summary.html b/inst/extdata/coverage/geometa_coverage_summary.html index 9d92055f..de597452 100644 --- a/inst/extdata/coverage/geometa_coverage_summary.html +++ b/inst/extdata/coverage/geometa_coverage_summary.html @@ -509,11 +509,11 @@ Metadata for Portrayal Catalogues (MPC) Version: 1.0 MPC -ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MPC -0 +ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MPC 1 0 1 +0 ISO/TS 19115-3:2023 @@ -659,8 +659,8 @@ ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD 132 0 -47 -85 +48 +84 ISO/TS 19139:2007 diff --git a/inst/extdata/coverage/geometa_coverage_summary.md b/inst/extdata/coverage/geometa_coverage_summary.md index 62a0448a..5bbeda5b 100644 --- a/inst/extdata/coverage/geometa_coverage_summary.md +++ b/inst/extdata/coverage/geometa_coverage_summary.md @@ -11,7 +11,7 @@ |ISO/TS 19115-3:2023 |ISO 19115-1:2014 |Metadata for COnstraints (MCO) Version: 1.0 |MCO |[![ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MCO](https://img.shields.io/badge/-83%25-33cc7a.svg)](https://github.com/eblondel/geometa)| 5| 1| 5| 1| |ISO/TS 19115-3:2023 |ISO 19115-1:2014 |MetaData Base (MDB) Version: 2.0 |MDB |[![ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MDB](https://img.shields.io/badge/-100%25-4a4ea8.svg)](https://github.com/eblondel/geometa)| 2| 0| 2| 0| |ISO/TS 19115-3:2023 |ISO 19115-1:2014 |Metadata for Maintenance Information (MMI) Version: 1.0 |MMI |[![ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MMI](https://img.shields.io/badge/-0%25-ad0f0f.svg)](https://github.com/eblondel/geometa)| 0| 2| 0| 2| -|ISO/TS 19115-3:2023 |ISO 19115-1:2014 |Metadata for Portrayal Catalogues (MPC) Version: 1.0 |MPC |[![ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MPC](https://img.shields.io/badge/-0%25-ad0f0f.svg)](https://github.com/eblondel/geometa)| 0| 1| 0| 1| +|ISO/TS 19115-3:2023 |ISO 19115-1:2014 |Metadata for Portrayal Catalogues (MPC) Version: 1.0 |MPC |[![ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MPC](https://img.shields.io/badge/-100%25-4a4ea8.svg)](https://github.com/eblondel/geometa)| 1| 0| 1| 0| |ISO/TS 19115-3:2023 |ISO 19115-1:2014 |Metadata for Resource Content (MRC) Version: 1.0 |MRC |[![ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MRC](https://img.shields.io/badge/-84%25-33cc7a.svg)](https://github.com/eblondel/geometa)| 16| 3| 16| 3| |ISO/TS 19115-3:2023 |ISO 19115-1:2014 |Metadata for Resource Distribution (MRD) Version: 1.0 |MRD |[![ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MRD](https://img.shields.io/badge/-0%25-ad0f0f.svg)](https://github.com/eblondel/geometa)| 0| 7| 0| 7| |ISO/TS 19115-3:2023 |ISO 19115-1:2014 |Metadata for Resource Identification (MRI) Version: 1.0 |MRI |[![ISO/TS 19115-3:2023 - ISO 19115-1:2014 - MRI](https://img.shields.io/badge/-0%25-ad0f0f.svg)](https://github.com/eblondel/geometa)| 0| 12| 0| 12| @@ -24,7 +24,7 @@ |ISO/TS 19115-3:2023 |ISO/TS 19139:2007 |CATalogue Objects (CAT) Version: 1.0 |CAT |[![ISO/TS 19115-3:2023 - ISO/TS 19139:2007 - CAT](https://img.shields.io/badge/-12%25-ad0f0f.svg)](https://github.com/eblondel/geometa)| 2| 15| 2| 15| |ISO/TS 19115-3:2023 |ISO/TS 19139:2007 |Feature Catalog Common (FCC) Version: 1.0 |FCC |[![ISO/TS 19115-3:2023 - ISO/TS 19139:2007 - FCC](https://img.shields.io/badge/-0%25-ad0f0f.svg)](https://github.com/eblondel/geometa)| 0| 2| 0| 2| |ISO/TS 19139:2007 |ISO 19110:2005 |Geographic Information - Methodology for feature cataloguing |GFC |[![ISO/TS 19139:2007 - ISO 19110:2005 - GFC](https://img.shields.io/badge/-100%25-4a4ea8.svg)](https://github.com/eblondel/geometa)| 17| 0| 0| 17| -|ISO/TS 19139:2007 |ISO 19115-1:2003 |Geographic Information - Metadata |GMD |[![ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD](https://img.shields.io/badge/-100%25-4a4ea8.svg)](https://github.com/eblondel/geometa)| 132| 0| 47| 85| +|ISO/TS 19139:2007 |ISO 19115-1:2003 |Geographic Information - Metadata |GMD |[![ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD](https://img.shields.io/badge/-100%25-4a4ea8.svg)](https://github.com/eblondel/geometa)| 132| 0| 48| 84| |ISO/TS 19139:2007 |ISO 19115-2:2009 |Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data |GMI |[![ISO/TS 19139:2007 - ISO 19115-2:2009 - GMI](https://img.shields.io/badge/-100%25-4a4ea8.svg)](https://github.com/eblondel/geometa)| 40| 0| 7| 33| |ISO/TS 19139:2007 |ISO 19119:2005 |Geographic Information - Service Metadata |SRV |[![ISO/TS 19139:2007 - ISO 19119:2005 - SRV](https://img.shields.io/badge/-37%25-ff0c0c.svg)](https://github.com/eblondel/geometa)| 7| 12| 0| 19| |ISO/TS 19139:2007 |ISO/TS 19103:2005 |Geographic Common extensible markup language |GCO |[![ISO/TS 19139:2007 - ISO/TS 19103:2005 - GCO](https://img.shields.io/badge/-100%25-4a4ea8.svg)](https://github.com/eblondel/geometa)| 22| 0| 22| 0| diff --git a/man/ISOPortrayalCatalogueReference.Rd b/man/ISOPortrayalCatalogueReference.Rd index d1668083..a65ffef8 100644 --- a/man/ISOPortrayalCatalogueReference.Rd +++ b/man/ISOPortrayalCatalogueReference.Rd @@ -57,7 +57,9 @@ ISOPortrayalCatalogueReference } \references{ -ISO 19115:2003 - Geographic information -- Metadata +- ISO 19139 \url{https://schemas.isotc211.org/19139/-/gmd/1.0/gmd/#element_MD_PortrayalCatalogueReference} + + - ISO 19115-3 \url{https://schemas.isotc211.org/19115/-3/mpc/1.0/mpc/#element_MD_PortrayalCatalogueReference} } \author{ Emmanuel Blondel