Skip to content

Commit

Permalink
#181 - M4 - LAN existing classes refactoring + test ISO 19115-3 local…
Browse files Browse the repository at this point in the history 
…ization on ISOCitationSeries
  • Loading branch information
@eblondel
eblondel committed Sep 11, 2024
1 parent 7af6be6 commit 1829029
Show file tree
Hide file tree
Showing 13 changed files with 119 additions and 31 deletions.
5 changes: 4 additions & 1 deletion R/ISOCharacterSet.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ ISOCharacterSet <- R6Class("ISOCharacterSet",
inherit = ISOCodeListValue,
private = list(
xmlElement = "MD_CharacterSetCode",
xmlNamespacePrefix = "GMD"
xmlNamespacePrefix = list(
"19115-1/2" = "GMD",
"19115-3" = "LAN"
)
),
public = list(

Expand Down
2 changes: 2 additions & 0 deletions R/ISOCodeListValue.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ ISOCodeListValue <- R6Class("ISOCodeListValue",
description <- xmlValue(xml) #try to pick up value instead
if(is.null(value)) value <- description
}
if(is.list(id)) id = id[[getMetadataStandard()]]
if(id=="MD_ScopeCode") id <- "MX_ScopeCode"
if(id=="CountryCode") id <- "Country"
cl <- getISOCodelist(id)
if(is.null(cl)){
stop(sprintf("No ISO codelist for identifier '%s'", id))
Expand Down
10 changes: 8 additions & 2 deletions R/ISOCountry.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,14 @@
ISOCountry <- R6Class("ISOCountry",
inherit = ISOCodeListValue,
private = list(
xmlElement = "Country",
xmlNamespacePrefix = "GMD"
xmlElement = list(
"19115-1/2" = "Country",
"19115-3" = "CountryCode"
),
xmlNamespacePrefix = list(
"19115-1/2" = "GMD",
"19115-3" = "LAN"
)
),
public = list(

Expand Down
5 changes: 4 additions & 1 deletion R/ISOFreeText.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ ISOFreeText <- R6Class("ISOFreeText",
inherit = ISOAbstractObject,
private = list(
xmlElement = "PT_FreeText",
xmlNamespacePrefix = "GMD"
xmlNamespacePrefix = list(
"19115-1/2" = "GMD",
"19115-3" = "LAN"
)
),
public = list(
#'@field textGroup textGroup [1..*]: ISOLocalisedCharacterString
Expand Down
5 changes: 4 additions & 1 deletion R/ISOLanguage.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ ISOLanguage <- R6Class("ISOLanguage",
inherit = ISOCodeListValue,
private = list(
xmlElement = "LanguageCode",
xmlNamespacePrefix = "GMD"
xmlNamespacePrefix = list(
"19115-1/2" = "GMD",
"19115-3" = "LAN"
)
),
public = list(

Expand Down
5 changes: 4 additions & 1 deletion R/ISOLocale.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ ISOLocale <- R6Class("ISOLocale",
inherit = ISOAbstractObject,
private = list(
xmlElement = "PT_Locale",
xmlNamespacePrefix = "GMD"
xmlNamespacePrefix = list(
"19115-1/2" = "GMD",
"19115-3" = "LAN"
)
),
public = list(
#'@field languageCode languageCode [1..1]: ISOLanguage
Expand Down
5 changes: 4 additions & 1 deletion R/ISOLocaleContainer.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ ISOLocaleContainer <- R6Class("ISOLocaleContainer",
inherit = ISOAbstractObject,
private = list(
xmlElement = "PT_LocaleContainer",
xmlNamespacePrefix = "GMD"
xmlNamespacePrefix = list(
"19115-1/2" = "GMD",
"19115-3" = "LAN"
)
),
public = list(

Expand Down
5 changes: 4 additions & 1 deletion R/ISOLocalisedCharacterString.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ ISOLocalisedCharacterString <- R6Class("ISOLocalisedCharacterString",
inherit = ISOBaseCharacterString,
private = list(
xmlElement = "LocalisedCharacterString",
xmlNamespacePrefix = "GMD"
xmlNamespacePrefix = list(
"19115-1/2" = "GMD",
"19115-3" = "LAN"
)
),
public = list(

Expand Down
28 changes: 14 additions & 14 deletions inst/extdata/coverage/geometa_coverage_inventory.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","CI_RoleCode","ISORole",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","CI_Series","ISOCitationSeries",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","CI_Telephone","ISOTelephone",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","Country","ISOCountry",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","Country","ISOCountry",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","DQ_AbsoluteExternalPositionalAccuracy","ISOAbsoluteExternalPositionalAccuracy",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","DQ_AccuracyOfATimeMeasurement","ISOAccuracyOfATimeMeasurement",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","DQ_CompletenessCommission","ISOCompletenessCommission",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
Expand Down Expand Up @@ -80,17 +80,17 @@
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","EX_SpatialTemporalExtent","ISOSpatialTemporalExtent",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","EX_TemporalExtent","ISOTemporalExtent",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","EX_VerticalExtent","ISOVerticalExtent",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","LanguageCode","ISOLanguage",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","LanguageCode","ISOLanguage",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","LI_Lineage","ISOLineage",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","LI_ProcessStep","ISOProcessStep",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","LI_Source","ISOSource",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","LocalisedCharacterString","ISOLocalisedCharacterString",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","LocalisedCharacterString","ISOLocalisedCharacterString",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_AggregateInformation","ISOAggregateInformation",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_ApplicationSchemaInformation","ISOApplicationSchemaInformation",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_Band","ISOBand",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_BrowseGraphic","ISOBrowseGraphic",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_CellGeometryCode","ISOCellGeometry",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_CharacterSetCode","ISOCharacterSet",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_CharacterSetCode","ISOCharacterSet",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_ClassificationCode","ISOClassification",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_Constraints","ISOConstraints",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_CoverageContentTypeCode","ISOCoverageContentType",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
Expand Down Expand Up @@ -143,9 +143,9 @@
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_TopologyLevelCode","ISOTopologyLevel",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_Usage","ISOUsage",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","MD_VectorSpatialRepresentation","ISOVectorSpatialRepresentation",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","PT_FreeText","ISOFreeText",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","PT_Locale","ISOLocale",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","PT_LocaleContainer","ISOLocaleContainer",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","PT_FreeText","ISOFreeText",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","PT_Locale","ISOLocale",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","PT_LocaleContainer","ISOLocaleContainer",TRUE,TRUE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","RS_Identifier","ISOReferenceIdentifier",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD","URL","ISOURL",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-1:2003 - GMD"
"ISO/TS 19139:2007","ISO 19115-2:2009","Geographic Information - Metadata - Part 2: Extensions for imagery and gridded data","GMI","AbstractMI_GeolocationInformation","ISOImageryAbstractGeolocationInformation",TRUE,FALSE,"ISO/TS 19139:2007 - ISO 19115-2:2009 - GMI"
Expand Down Expand Up @@ -553,13 +553,13 @@
"ISO/TS 19115-3:2016","ISO 19115-1:2014","Geospatial EXtent (GEX) Version: 1.0","GEX","EX_SpatialTemporalExtent","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - GEX"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","Geospatial EXtent (GEX) Version: 1.0","GEX","EX_TemporalExtent","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - GEX"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","Geospatial EXtent (GEX) Version: 1.0","GEX","EX_VerticalExtent","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - GEX"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","CountryCode","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","LanguageCode","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","LocalisedCharacterString","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","MD_CharacterSetCode","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","PT_FreeText","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","PT_Locale","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","PT_LocaleContainer","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","CountryCode","ISOCountry",TRUE,TRUE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","LanguageCode","ISOLanguage",TRUE,TRUE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","LocalisedCharacterString","ISOLocalisedCharacterString",TRUE,TRUE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","MD_CharacterSetCode","ISOCharacterSet",TRUE,TRUE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","PT_FreeText","ISOFreeText",TRUE,TRUE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","PT_Locale","ISOLocale",TRUE,TRUE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN","PT_LocaleContainer","ISOLocaleContainer",TRUE,TRUE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - LAN"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata Common Classes (MCC) Version: 1.0","MCC","Abstract_AcquisitionInformation","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - MCC"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata Common Classes (MCC) Version: 1.0","MCC","Abstract_ApplicationSchemaInformation","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - MCC"
"ISO/TS 19115-3:2016","ISO 19115-1:2014","Metadata Common Classes (MCC) Version: 1.0","MCC","Abstract_Citation","<missing>",FALSE,FALSE,"ISO/TS 19115-3:2016 - ISO 19115-1:2014 - MCC"
Expand Down
4 changes: 2 additions & 2 deletions inst/extdata/coverage/geometa_coverage_summary.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"ISO/TS 19115-3:2016","ISO 19115-1:2014","Citation and responsible party information (CIT) Version: 2.0","CIT",11,5,11,5,68.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 EXtent (GEX) Version: 1.0","GEX",0,8,0,8,0
"ISO/TS 19115-3:2016","ISO 19115-1:2014","metadata for LANguage and localization (LAN) Version: 1.0","LAN",0,7,0,7,0
"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 Common Classes (MCC) Version: 1.0","MCC",0,31,0,31,0
"ISO/TS 19115-3:2016","ISO 19115-1:2014","MetaData Base (MDB) Version: 2.0","MDB",0,2,0,2,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 19157","Data Quality abstract Classes (DQC) Version 1.0","DQC",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,11,121,100
"ISO/TS 19139:2007","ISO 19115-1:2003","Geographic Information - Metadata","GMD",132,0,18,114,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
"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
Expand Down
Loading

0 comments on commit 1829029

Please sign in to comment.