Skip to content

Commit

Permalink
add mapping (Coord2Country) to mstools
Browse files Browse the repository at this point in the history
  • Loading branch information
k4rst3ns committed Oct 14, 2024
1 parent 176fe35 commit c3cac0e
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '1593200'
ValidationKey: '1800900'
AutocreateReadme: yes
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: |
any::lucode2
any::covr
any::madrat
any::magclass
any::citation
any::gms
any::goxygen
any::GDPuc
lucode2
covr
madrat
magclass
citation
gms
goxygen
GDPuc
# piam packages also available on CRAN (madrat, magclass, citation,
# gms, goxygen, GDPuc) will usually have an outdated binary version
# available; by using extra-packages we get the newest version
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repos:
- id: mixed-line-ending

- repo: https://github.com/lorenzwalthert/precommit
rev: 7910e0323d7213f34275a7a562b9ef0fde8ce1b9 # frozen: v0.4.2
rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7 # frozen: v0.4.3
hooks:
- id: parsable-R
- id: deps-in-desc
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ type: software
title: |-
mstools: Tool functions that can be used by several madrat-dependent or
magpie4 output functions
version: 0.8.0
date-released: '2024-07-11'
version: 0.9.0
date-released: '2024-10-14'
abstract: Tool functions that can be used by several madrat-dependent or magpie4 output
functions.
authors:
Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ Type: Package
Package: mstools
Title: Tool functions that can be used by several madrat-dependent or
magpie4 output functions
Version: 0.8.0
Date: 2024-07-11
Version: 0.9.0
Date: 2024-10-14
Authors@R: c(
person("Benjamin Leon", "Bodirsky", , "[email protected]", role = c("aut", "cre")),
person("Kristine", "Karstens", role = "aut"),
Expand All @@ -26,4 +26,4 @@ Suggests:
covr,
testthat
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
2 changes: 1 addition & 1 deletion R/toolGetMappingCoord2Country.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#' @export

toolGetMappingCoord2Country <- function(pretty = FALSE, extended = FALSE) {
out <- toolGetMapping("mapCoords2Country.rds", where = "mrcommons")
out <- toolGetMapping("mapCoords2Country.rds", where = "mstools")

if (!extended) {
out <- out[1:67420, ]
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Tool functions that can be used by several madrat-dependent or
magpie4 output functions

R package **mstools**, version **0.8.0**
R package **mstools**, version **0.9.0**

[![CRAN status](https://www.r-pkg.org/badges/version/mstools)](https://cran.r-project.org/package=mstools) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158582.svg)](https://doi.org/10.5281/zenodo.1158582) [![R build status](https://github.com/pik-piam/magpie4/workflows/check/badge.svg)](https://github.com/pik-piam/magpie4/actions) [![codecov](https://codecov.io/gh/pik-piam/magpie4/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/magpie4) [![r-universe](https://pik-piam.r-universe.dev/badges/mstools)](https://pik-piam.r-universe.dev/builds)

Expand Down Expand Up @@ -40,7 +40,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky <bodirsky@

To cite package **mstools** in publications use:

Bodirsky B, Karstens K, Beier F, Dietrich J (2024). _mstools: Tool functions that can be used by several madrat-dependent or magpie4 output functions_. doi: 10.5281/zenodo.1158582 (URL: https://doi.org/10.5281/zenodo.1158582), R package version 0.8.0, <URL: https://github.com/pik-piam/magpie4>.
Bodirsky B, Karstens K, Beier F, Dietrich J (2024). _mstools: Tool functions that can be used by several madrat-dependent or magpie4 output functions_. doi:10.5281/zenodo.1158582 <https://doi.org/10.5281/zenodo.1158582>, R package version 0.9.0, <https://github.com/pik-piam/magpie4>.

A BibTeX entry for LaTeX users is

Expand All @@ -50,7 +50,7 @@ A BibTeX entry for LaTeX users is
magpie4 output functions},
author = {Benjamin Leon Bodirsky and Kristine Karstens and Felicitas Beier and Jan Philipp Dietrich},
year = {2024},
note = {R package version 0.8.0},
note = {R package version 0.9.0},
doi = {10.5281/zenodo.1158582},
url = {https://github.com/pik-piam/magpie4},
}
Expand Down
Binary file added inst/extdata/mapCoords2Country.rds
Binary file not shown.

0 comments on commit c3cac0e

Please sign in to comment.