#181 rename 19115-1/2 to 19139

eblondel · Oct 1, 2024 · 98bfe25 · 98bfe25
1 parent 313df1b
commit 98bfe25
Show file tree

Hide file tree

Showing 25 changed files with 397 additions and 386 deletions.
diff --git a/R/ISOCodelist.R b/R/ISOCodelist.R
@@ -17,7 +17,7 @@ ISOCodelist <- R6Class("ISOCodelist",
      metadataStandardCompliance = FALSE,
      xmlElement = "CT_Codelist",
      xmlNamespacePrefix = list(
-       "19115-1/2" = "GMX",
+       "19139" = "GMX",
        "19115-3" = "CAT"
      )
    ),

diff --git a/R/ISOProgress.R b/R/ISOProgress.R
@@ -75,7 +75,7 @@ ISOStatus<- R6Class("ISOStatus",
      deprecated = TRUE,
      xmlElement = "MD_ProgressCode",
      xmlNamespacePrefix = list(
-       "19115-1/2" = "GMD",
+       "19139" = "GMD",
        "19115-3" = "MCC"
      )
    ),

diff --git a/R/ISORecordType.R b/R/ISORecordType.R
@@ -17,7 +17,7 @@ ISORecordType <- R6Class("ISORecordType",
    private = list(
      xmlElement = "RecordType",
      xmlNamespacePrefix = list(
-       "19115-1/2" = "GCO",
+       "19139" = "GCO",
        "19115-3" = "GCO"
      )
    ),

diff --git a/R/ISOScope.R b/R/ISOScope.R
@@ -72,7 +72,7 @@ ISOHierarchyLevel <- R6Class("ISOHierarchyLevel",
    deprecated = TRUE,
    xmlElement = "MD_ScopeCode",
    xmlNamespacePrefix = list(
-     "19115-1/2" = "GMD",
+     "19139" = "GMD",
      "19115-3" = "MCC"
    )
  ),

diff --git a/R/ISOTelephone.R b/R/ISOTelephone.R
@@ -50,7 +50,7 @@ ISOTelephone <- R6Class("ISOTelephone",
      #'@param voice voice
      #'@param locales list of localized voices. Default is \code{NULL}
      setVoice = function(voice, locales = NULL){
-       self$stopIfMetadataStandardIsNot("19115-1/2")
+       self$stopIfMetadataStandardIsNot("19139")
        if(!is(voice,"character")) voice <- as.character(voice)
        self$voice = voice
        if(!is.null(locales)){
@@ -62,7 +62,7 @@ ISOTelephone <- R6Class("ISOTelephone",
      #'@param facsimile facsimile
      #'@param locales list of localized facsimiles. Default is \code{NULL}
      setFacsimile = function(facsimile, locales = NULL){
-       self$stopIfMetadataStandardIsNot("19115-1/2")
+       self$stopIfMetadataStandardIsNot("19139")
        if(!is(facsimile,"character")) facsimile <- as.character(facsimile)
        self$facsimile = facsimile
        if(!is.null(locales)){

diff --git a/R/profile.R b/R/profile.R
@@ -12,12 +12,7 @@
   assign(".geometa.iana", new.env(), envir= asNamespace(pkgname))
 
   #set default metadata standard
-  #setMetadataStandard(version = "19139")
-  #setISOMetadataNamespaces(version = "19139")
-  .geometa.iso$version <- "19139"
-  setISOMetadataSchemas(version = "19139")
-  setISOCodelists()
-
+  setMetadataStandard(version = "19139")
 
   #set IANA Mime Types
   setIANAMimeTypes()

diff --git a/inst/extdata/coverage/geometa_coverage_inventory.csv b/inst/extdata/coverage/geometa_coverage_inventory.csv
diff --git a/inst/extdata/coverage/geometa_coverage_summary.csv b/inst/extdata/coverage/geometa_coverage_summary.csv
@@ -1,27 +1,27 @@
 "Specification","Schema","Title","Namespace","Supported","Missing","Refactored","Torefactor","Coverage"
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Citation and responsible party information (CIT) Version: 2.0","CIT",15,1,15,1,93.75
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Geospatial COmmon Objects (GCO) Version: 1.0","GCO",22,2,22,2,91.67
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Geospatial Common eXtension (GCX) Version: 1.0","GCX",3,0,3,0,100
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Geospatial EXtent (GEX) Version: 1.0","GEX",8,0,8,0,100
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN",7,0,7,0,100
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for ACquisition (MAC) Version: 2.0","MAC",0,24,0,24,0
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for Application Schemas (MAS) Version: 2.0","MAS",1,0,1,0,100
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata Common Classes (MCC) Version: 1.0","MCC",6,25,6,25,19.35
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for COnstraints (MCO) Version: 1.0","MCO",5,1,5,1,83.33
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","MetaData Base (MDB) Version: 2.0","MDB",2,0,2,0,100
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for Maintenance Information (MMI) Version: 1.0","MMI",0,2,0,2,0
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for Portrayal Catalogues (MPC) Version: 1.0","MPC",0,1,0,1,0
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for Resource Content (MRC) Version: 1.0","MRC",0,19,0,19,0
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for Resource Distribution (MRD) Version: 1.0","MRD",0,7,0,7,0
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for Resource Identification (MRI) Version: 1.0","MRI",0,12,0,12,0
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for Resource Lineage (MRL) Version: 2.0","MRL",0,11,0,11,0
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for Reference Systems (MRS) Version: 1.0","MRS",0,2,0,2,0
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for Spatial Representation (MSR) Version: 2.0","MSR",0,17,0,17,0
-"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata for SeRVices (SRV) Version: 2.0","SRV",7,1,0,8,87.5
-"ISO/TS 19115-3:2016","ISO 19157","Data Quality abstract Classes (DQC) Version 1.0","DQC",0,2,0,2,0
-"ISO/TS 19115-3:2016","ISO 19157","Metadata for Data Quality (MDQ) Version: 1.0","MDQ",0,43,0,43,0
-"ISO/TS 19115-3:2016","ISO/TS 19139:2007","CATalogue Objects (CAT) Version: 1.0","CAT",2,15,2,15,11.76
-"ISO/TS 19115-3:2016","ISO/TS 19139:2007","Feature Catalog Common (FCC) Version: 1.0","FCC",0,2,0,2,0
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Citation and responsible party information (CIT) Version: 2.0","CIT",15,1,15,1,93.75
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Geospatial COmmon Objects (GCO) Version: 1.0","GCO",22,2,22,2,91.67
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Geospatial Common eXtension (GCX) Version: 1.0","GCX",3,0,3,0,100
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Geospatial EXtent (GEX) Version: 1.0","GEX",8,0,8,0,100
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN",7,0,7,0,100
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for ACquisition (MAC) Version: 2.0","MAC",0,24,0,24,0
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Application Schemas (MAS) Version: 2.0","MAS",1,0,1,0,100
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata Common Classes (MCC) Version: 1.0","MCC",6,25,6,25,19.35
+"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 Resource Content (MRC) Version: 1.0","MRC",0,19,0,19,0
+"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
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Resource Lineage (MRL) Version: 2.0","MRL",0,11,0,11,0
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Reference Systems (MRS) Version: 1.0","MRS",0,2,0,2,0
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for Spatial Representation (MSR) Version: 2.0","MSR",0,17,0,17,0
+"ISO/TS 19115-3:2023","ISO 19115-1:2014","Metadata for SeRVices (SRV) Version: 2.0","SRV",7,1,0,8,87.5
+"ISO/TS 19115-3:2023","ISO 19157","Data Quality abstract Classes (DQC) Version 1.0","DQC",0,2,0,2,0
+"ISO/TS 19115-3:2023","ISO 19157","Metadata for Data Quality (MDQ) Version: 1.0","MDQ",0,43,0,43,0
+"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,39,93,100
 "ISO/TS 19139:2007","ISO 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI",40,0,0,40,100