enhacne country2iso dictionary (used to read in data from Global Ener…

…gy Monitor)
fbenke-pik · Oct 17, 2023 · 55ce17a · 55ce17a
1 parent 78ac7b4
commit 55ce17a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '7249374'
+ValidationKey: '70925670'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

diff --git a/CITATION.cff b/CITATION.cff
@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'madrat: May All Data be Reproducible and Transparent (MADRaT) *'
-version: 3.6.9
-date-released: '2023-10-16'
+version: 3.6.10
+date-released: '2023-10-17'
 abstract: Provides a framework which should improve reproducibility and transparency
   in data processing. It provides functionality such as automatic meta data creation
   and management, rudimentary quality management, data caching, work-flow management

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: madrat
 Title: May All Data be Reproducible and Transparent (MADRaT) *
-Version: 3.6.9
-Date: 2023-10-16
+Version: 3.6.10
+Date: 2023-10-17
 Authors@R: c(
     person("Jan Philipp", "Dietrich", , "[email protected]", role = c("aut", "cre")),
     person("Lavinia", "Baumstark", , "[email protected]", role = "aut"),

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # May All Data be Reproducible and Transparent (MADRaT) *
 
-R package **madrat**, version **3.6.9**
+R package **madrat**, version **3.6.10**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/madrat)](https://cran.r-project.org/package=madrat) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1115490.svg)](https://doi.org/10.5281/zenodo.1115490) [![R build status](https://github.com/pik-piam/madrat/workflows/check/badge.svg)](https://github.com/pik-piam/madrat/actions) [![codecov](https://codecov.io/gh/pik-piam/madrat/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/madrat) [![r-universe](https://pik-piam.r-universe.dev/badges/madrat)](https://pik-piam.r-universe.dev/builds)
 
@@ -55,7 +55,7 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi
 
 To cite package **madrat** in publications use:
 
-Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Sauer P (2023). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi:10.5281/zenodo.1115490 <https://doi.org/10.5281/zenodo.1115490>, R package version 3.6.9, <https://github.com/pik-piam/madrat>.
+Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Sauer P (2023). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi:10.5281/zenodo.1115490 <https://doi.org/10.5281/zenodo.1115490>, R package version 3.6.10, <https://github.com/pik-piam/madrat>.
 
 A BibTeX entry for LaTeX users is
 
@@ -64,7 +64,7 @@ A BibTeX entry for LaTeX users is
   title = {madrat: May All Data be Reproducible and Transparent (MADRaT)},
   author = {Jan Philipp Dietrich and Lavinia Baumstark and Stephen Wirth and Anastasis Giannousakis and Renato Rodrigues and Benjamin Leon Bodirsky and Debbora Leip and Ulrich Kreidenweis and David Klein and Pascal Sauer},
   year = {2023},
-  note = {R package version 3.6.9},
+  note = {R package version 3.6.10},
   doi = {10.5281/zenodo.1115490},
   url = {https://github.com/pik-piam/madrat},
 }

diff --git a/inst/extdata/country2iso.csv b/inst/extdata/country2iso.csv
@@ -11,6 +11,7 @@ agypten;EGY
 AI;AIA
 AL;ALB
 Aland Islands;ALA
+Åland Islands;ALA
 Albania;ALB
 albanien;ALB
 Algeria;DZA
@@ -231,6 +232,7 @@ Dominican Republic;DOM
 Dominican_Republic;DOM
 DOMINICANR;DOM
 Dominika,Rep,;DOM
+DR Congo;COD
 DZ;DZA
 east & west pakistan;XXX
 East Timor;TLS
@@ -690,6 +692,7 @@ Republic of North Macedonia;MKD
 republic of south sudan;SSD
 republic of south vietnam;XXX
 republic of sudan;XXX
+Republic of the Congo;COG
 Reunion;REU
 Réunion;REU
 rhodesia-nyasaland;XXX
@@ -853,6 +856,7 @@ TH;THA
 Thailand;THA
 The former Yugoslav Rep. of Macedonia;MKD
 The former Yugoslav Republic of Macedonia;MKD
+The Gambia;GMB
 Timor Leste;TLS
 Timor-Leste;TLS
 timor-leste (formerly east timor);TLS
@@ -944,6 +948,7 @@ Virgin Islands, British;VGB
 Virgin Islands, U.S.;VIR
 Virgin Islands, US;VIR
 Virgin_Islands;VIR
+Virgin Islands (U_S_);VIR
 VN;VNM
 Volkrep,China;CHN
 VU;VUT
@@ -980,3 +985,4 @@ Zimbabwe;ZWE
 ZM;ZMB
 ZW;ZWE
 zypern;CYP
+