Merge branch 'fix_raster_all_aggregate' into 'master'

fix class check in CRS fallback See merge request lpjml/lpjmlkit!58
PIK-LPJmL · Mar 17, 2023 · 8b09957 · 8b09957
2 parents 7ff48b3 + 4a6991b
commit 8b09957
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '1632288'
+ValidationKey: '1651805'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,6 +1,6 @@
 {
   "title": "lpjmlkit: Toolkit for basic LPJmL handling",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "description": "<p>A collection of basic functions to facilitate the work with the\n    Dynamic Global Vegetation Model (DGVM) Lund-Potsdam-Jena managed Land\n    (LPJmL) hosted at the Potsdam Institute for Climate Impact Research (PIK).\n    It provides functions for performing LPJmL simulations, as well as reading,\n    processing and writing model-related data such as inputs and outputs or\n    configuration files.<\/p>",
   "creators": [
     {

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: lpjmlkit
 Type: Package
 Title: Toolkit for basic LPJmL handling
-Version: 0.8.4
+Version: 0.8.5
 Authors@R: c(
     person("Jannes", "Breier", , "jannesbr@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9055-6904")),
     person("Sebastian","Ostberg", , "ostberg@pik-potsdam.de", role = "aut", comment = c(ORCID = "0000-0002-2368-7015")),
@@ -48,4 +48,4 @@ Suggests:
     maps
 Config/testthat/edition: 3
 VignetteBuilder: knitr
-Date: 2023-03-16
+Date: 2023-03-17
diff --git a/R/LPJmLData_as.R b/R/LPJmLData_as.R
@@ -563,7 +563,7 @@ raster_crs_fallback <- function(projstring) {
     },
     type = "message"
   )
-  if (class(success) == "try-error") {
+  if (methods::is(success, "try-error")) {
     projstring <- "+proj=longlat +datum=WGS84 +ellps=WGS84 +towgs84=0,0,0"
   }
   projstring

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Toolkit for basic LPJmL handling <a href=''><img src='inst/img/logo.png' align='right' height='139' /></a>
 
-R package **lpjmlkit**, version **0.8.4**
+R package **lpjmlkit**, version **0.8.5**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/lpjmlkit)](https://cran.r-project.org/package=lpjmlkit)  [![R build status](https://github.com/PIK-LPJmL/lpjmlkit/workflows/check/badge.svg)](https://github.com/PIK-LPJmL/lpjmlkit/actions) [![codecov](https://codecov.io/gh/PIK-LPJmL/lpjmlkit/branch/master/graph/badge.svg)](https://app.codecov.io/gh/PIK-LPJmL/lpjmlkit) [![r-universe](https://pik-piam.r-universe.dev/badges/lpjmlkit)](https://pik-piam.r-universe.dev/builds)
 
@@ -76,7 +76,7 @@ In case of questions / problems please contact Jannes Breier <jannesbr@pik-potsd
 
 To cite package **lpjmlkit** in publications use:
 
-Breier J, Ostberg S, Wirth S, Minoli S, Stenzel F, Müller C (2023). _lpjmlkit: Toolkit for basic LPJmL handling_. R package version 0.8.4, <URL: https://github.com/PIK-LPJmL/lpjmlkit>.
+Breier J, Ostberg S, Wirth S, Minoli S, Stenzel F, Müller C (2023). _lpjmlkit: Toolkit for basic LPJmL handling_. R package version 0.8.5, <URL: https://github.com/PIK-LPJmL/lpjmlkit>.
 
 A BibTeX entry for LaTeX users is
 
@@ -85,7 +85,7 @@ A BibTeX entry for LaTeX users is
   title = {lpjmlkit: Toolkit for basic LPJmL handling},
   author = {Jannes Breier and Sebastian Ostberg and Stephen Björn Wirth and Sara Minoli and Fabian Stenzel and Christoph Müller},
   year = {2023},
-  note = {R package version 0.8.4},
+  note = {R package version 0.8.5},
   url = {https://github.com/PIK-LPJmL/lpjmlkit},
 }
 ```