diff --git a/.buildlibrary b/.buildlibrary index f3e9878..22aa711 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '12878004' +ValidationKey: '12899964' 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 index b426e1a..e3146ca 100644 --- 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: 'mrland: MadRaT land data package' -version: 0.64.3 -date-released: '2024-11-01' +version: 0.64.4 +date-released: '2024-11-04' abstract: The package provides land related data via the madrat framework. authors: - family-names: Dietrich diff --git a/DESCRIPTION b/DESCRIPTION index 130a9df..3111028 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrland Title: MadRaT land data package -Version: 0.64.3 -Date: 2024-11-01 +Version: 0.64.4 +Date: 2024-11-04 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")), person("Abhijeet", "Mishra", role = "aut"), diff --git a/R/spatial_header.R b/R/spatial_header.R index 26fa342..2b9db7b 100644 --- a/R/spatial_header.R +++ b/R/spatial_header.R @@ -34,8 +34,8 @@ spatial_header <- function(mapping) { # nolint regionscode <- regionscode(map) reg <- .getColumn(map, c("region", "RegionCode")) names(reg) <- .getColumn(map, c("country", "CountryCode")) - iso <- toolGetMapping("CountryToCellMapping.rds", where = "mrcommons")$iso + iso <- toolGetMapping("CountryToCellMapping.rds", where = "mstools")$iso spatialHeader <- paste(reg[iso], seq_along(iso), - sep = ".") + sep = ".") return(spatialHeader) } diff --git a/README.md b/README.md index e9e972a..328377e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRaT land data package -R package **mrland**, version **0.64.3** +R package **mrland**, version **0.64.4** [![CRAN status](https://www.r-pkg.org/badges/version/mrland)](https://cran.r-project.org/package=mrland) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3822083.svg)](https://doi.org/10.5281/zenodo.3822083) [![R build status](https://github.com/pik-piam/mrland/workflows/check/badge.svg)](https://github.com/pik-piam/mrland/actions) [![codecov](https://codecov.io/gh/pik-piam/mrland/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrland) [![r-universe](https://pik-piam.r-universe.dev/badges/mrland)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich , R package version 0.64.3, . +Dietrich J, Mishra A, Weindl I, Bodirsky B, Wang X, Baumstark L, Kreidenweis U, Klein D, Steinmetz N, Chen D, Humpenoeder F, von Jeetze P, Wirth S, Beier F, Hoetten D, Sauer P, Tommey J (2024). _mrland: MadRaT land data package_. doi:10.5281/zenodo.3822083 , R package version 0.64.4, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrland: MadRaT land data package}, author = {Jan Philipp Dietrich and Abhijeet Mishra and Isabelle Weindl and Benjamin Leon Bodirsky and Xiaoxi Wang and Lavinia Baumstark and Ulrich Kreidenweis and David Klein and Nele Steinmetz and David Chen and Florian Humpenoeder and Patrick {von Jeetze} and Stephen Wirth and Felicitas Beier and David Hoetten and Pascal Sauer and Jake Tommey}, year = {2024}, - note = {R package version 0.64.3}, + note = {R package version 0.64.4}, url = {https://github.com/pik-piam/mrland}, doi = {10.5281/zenodo.3822083}, }