diff --git a/CITATION.cff b/CITATION.cff index 422a43cb..7c2f52c9 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -8,7 +8,7 @@ message: 'To cite package "tidyterra" in publications use:' type: software license: MIT title: 'tidyterra: ''tidyverse'' Methods and ''ggplot2'' Helpers for ''terra'' Objects' -version: 0.5.1.9000 +version: 0.5.2 doi: 10.21105/joss.05751 abstract: Extension of the 'tidyverse' for 'SpatRaster' and 'SpatVector' objects of the 'terra' package. It includes also new 'geom_' functions that provide a convenient diff --git a/DESCRIPTION b/DESCRIPTION index c092f33d..a22a307b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: tidyterra Title: 'tidyverse' Methods and 'ggplot2' Helpers for 'terra' Objects -Version: 0.5.1.9000 +Version: 0.5.2 Authors@R: c( person("Diego", "Hernangómez", , "diego.hernangomezherrero@gmail.com", role = c("aut", "cre", "cph"), comment = c(ORCID = "0000-0001-8457-4658")), diff --git a/NEWS.md b/NEWS.md index 9d82bf8c..3e79c905 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# tidyterra (development version) +# tidyterra 0.5.2 - Adapt tests to **ggplot2** 3.5.0 (#129) @teunbrand. - Reduce package size, specially relevant in the external raster `asia.tif`. diff --git a/README.md b/README.md index 3b8b8a75..58459bb8 100644 --- a/README.md +++ b/README.md @@ -39,9 +39,6 @@ objects with [{ggplot2}](https://ggplot2.tidyverse.org/). ## Overview -You can have a look to the documentation of the dev version in - - {tidyverse} methods implemented on {tidyterra} works differently depending on the type of Spat\* object: diff --git a/codemeta.json b/codemeta.json index 671ccb9d..e42cb2a9 100644 --- a/codemeta.json +++ b/codemeta.json @@ -8,7 +8,7 @@ "codeRepository": "https://github.com/dieghernan/tidyterra", "issueTracker": "https://github.com/dieghernan/tidyterra/issues", "license": "https://spdx.org/licenses/MIT", - "version": "0.5.1.9000", + "version": "0.5.2", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -308,7 +308,7 @@ "SystemRequirements": null }, "keywords": ["r", "terra", "ggplot-extension", "r-spatial", "rspatial", "r-package", "rstats", "rstats-package", "cran", "cran-r"], - "fileSize": "2732.516KB", + "fileSize": "2194.951KB", "citation": [ { "@type": "ScholarlyArticle", diff --git a/inst/WORDLIST b/inst/WORDLIST index ff9be693..1a2cdf49 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -45,7 +45,6 @@ coltab coord cpt crs -dev disaggregated downsampled dplyr @@ -61,13 +60,13 @@ linetype linewidth lon magrittr -maptiles metR natively plotmath proj purrr rasters +readr reprojected rescaled rlang diff --git a/inst/schemaorg.json b/inst/schemaorg.json index e5d495ed..0d830237 100644 --- a/inst/schemaorg.json +++ b/inst/schemaorg.json @@ -39,5 +39,5 @@ "url": "https://cran.r-project.org" }, "runtimePlatform": "R version 4.3.2 (2023-10-31 ucrt)", - "version": "0.5.1.9000" + "version": "0.5.2" } diff --git a/man/figures/logo.png b/man/figures/logo.png index 83936614..1340d30e 100644 Binary files a/man/figures/logo.png and b/man/figures/logo.png differ diff --git a/revdep/README.md b/revdep/README.md index 714725a2..d70a5ebb 100644 --- a/revdep/README.md +++ b/revdep/README.md @@ -1,71 +1,66 @@ # Platform -|field |value | -|:--------|:---------------------------------------------------------------------| -|version |R version 4.3.2 (2023-10-31 ucrt) | -|os |Windows Server 2022 x64 (build 20348) | -|system |x86_64, mingw32 | -|ui |RTerm | -|language |(EN) | -|collate |English_United States.utf8 | -|ctype |English_United States.utf8 | -|tz |UTC | -|date |2024-01-05 | -|pandoc |2.19.2 @ C:\HOSTED~1\windows\pandoc\219~1.2\x64\PANDOC~1.2\pandoc.exe | +|field |value | +|:--------|:--------------------------------------| +|version |R version 4.3.2 (2023-10-31 ucrt) | +|os |Windows 11 x64 (build 22621) | +|system |x86_64, mingw32 | +|ui |RStudio | +|language |(EN) | +|collate |Spanish_Spain.utf8 | +|ctype |Spanish_Spain.utf8 | +|tz |Europe/Madrid | +|date |2024-01-19 | +|rstudio |2023.12.0+369 Ocean Storm (desktop) | +|pandoc |2.19.2 @ C:\PROGRA~1\Pandoc\pandoc.exe | # Dependencies |package |old |new |Δ | |:------------|:-------|:-------|:--| -|tidyterra |0.5.1 |0.5.1 |NA | -|classInt |0.4-10 |0.4-10 |NA | -|cli |3.6.2 |3.6.2 |NA | -|colorspace |2.1-0 |2.1-0 |NA | -|cpp11 |0.4.7 |0.4.7 |NA | -|data.table |1.14.10 |1.14.10 |NA | -|DBI |1.2.0 |1.2.0 |NA | -|dplyr |1.1.4 |1.1.4 |NA | -|e1071 |1.7-14 |1.7-14 |NA | -|fansi |1.0.6 |1.0.6 |NA | -|farver |2.1.1 |2.1.1 |NA | -|generics |0.1.3 |0.1.3 |NA | -|ggplot2 |3.4.4 |3.4.4 |NA | -|glue |1.6.2 |1.6.2 |NA | -|gtable |0.3.4 |0.3.4 |NA | -|isoband |0.2.7 |0.2.7 |NA | -|labeling |0.4.3 |0.4.3 |NA | -|lifecycle |1.0.4 |1.0.4 |NA | -|magrittr |2.0.3 |2.0.3 |NA | -|munsell |0.5.0 |0.5.0 |NA | -|pillar |1.9.0 |1.9.0 |NA | -|pkgconfig |2.0.3 |2.0.3 |NA | -|proxy |0.4-27 |0.4-27 |NA | -|purrr |1.0.2 |1.0.2 |NA | -|R6 |2.5.1 |2.5.1 |NA | -|RColorBrewer |1.1-3 |1.1-3 |NA | -|Rcpp |1.0.11 |1.0.11 |NA | -|rlang |1.1.2 |1.1.2 |NA | -|s2 |1.1.6 |1.1.6 |NA | -|scales |1.3.0 |1.3.0 |NA | -|sf |1.0-15 |1.0-15 |NA | -|stringi |1.8.3 |1.8.3 |NA | -|stringr |1.5.1 |1.5.1 |NA | -|terra |1.7-65 |1.7-65 |NA | -|tibble |3.2.1 |3.2.1 |NA | -|tidyr |1.3.0 |1.3.0 |NA | -|tidyselect |1.2.0 |1.2.0 |NA | -|units |0.8-5 |0.8-5 |NA | -|utf8 |1.2.4 |1.2.4 |NA | -|vctrs |0.6.5 |0.6.5 |NA | -|viridisLite |0.4.2 |0.4.2 |NA | -|withr |2.5.2 |2.5.2 |NA | -|wk |0.9.1 |0.9.1 |NA | +|tidyterra |0.5.1 |0.5.2 |* | +|classInt |0.4-10 |0.4-10 | | +|cli |3.6.2 |3.6.2 | | +|colorspace |2.1-0 |2.1-0 | | +|cpp11 |0.4.7 |0.4.7 | | +|data.table |1.14.10 |1.14.10 | | +|DBI |1.2.1 |1.2.1 | | +|dplyr |1.1.4 |1.1.4 | | +|e1071 |1.7-14 |1.7-14 | | +|fansi |1.0.6 |1.0.6 | | +|farver |2.1.1 |2.1.1 | | +|generics |0.1.3 |0.1.3 | | +|ggplot2 |3.4.4 |3.4.4 | | +|glue |1.7.0 |1.7.0 | | +|gtable |0.3.4 |0.3.4 | | +|isoband |0.2.7 |0.2.7 | | +|labeling |0.4.3 |0.4.3 | | +|lifecycle |1.0.4 |1.0.4 | | +|magrittr |2.0.3 |2.0.3 | | +|munsell |0.5.0 |0.5.0 | | +|pillar |1.9.0 |1.9.0 | | +|pkgconfig |2.0.3 |2.0.3 | | +|proxy |0.4-27 |0.4-27 | | +|purrr |1.0.2 |1.0.2 | | +|R6 |2.5.1 |2.5.1 | | +|RColorBrewer |1.1-3 |1.1-3 | | +|Rcpp |1.0.12 |1.0.12 | | +|rlang |1.1.3 |1.1.3 | | +|s2 |1.1.6 |1.1.6 | | +|scales |1.3.0 |1.3.0 | | +|sf |1.0-15 |1.0-15 | | +|stringi |1.8.3 |1.8.3 | | +|stringr |1.5.1 |1.5.1 | | +|terra |1.7-65 |1.7-65 | | +|tibble |3.2.1 |3.2.1 | | +|tidyr |1.3.0 |1.3.0 | | +|tidyselect |1.2.0 |1.2.0 | | +|units |0.8-5 |0.8-5 | | +|utf8 |1.2.4 |1.2.4 | | +|vctrs |0.6.5 |0.6.5 | | +|viridisLite |0.4.2 |0.4.2 | | +|withr |3.0.0 |3.0.0 | | +|wk |0.9.1 |0.9.1 | | # Revdeps -## Failed to check (1) - -|package |version |error |warning |note | -|:------------|:-------|:-----|:-------|:----| -|malariaAtlas |1.5.1 |1 | | | - diff --git a/revdep/cran.md b/revdep/cran.md index 5ef3826e..05094c1b 100644 --- a/revdep/cran.md +++ b/revdep/cran.md @@ -1,6 +1,6 @@ ## revdepcheck results -We checked 16 reverse dependencies (0 from CRAN + 16 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package. +We checked 16 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. * We saw 0 new problems * We failed to check 0 packages diff --git a/revdep/failures.md b/revdep/failures.md index 9bda7876..9a207363 100644 --- a/revdep/failures.md +++ b/revdep/failures.md @@ -1,19 +1 @@ -# malariaAtlas - -
- -* Version: 1.5.1 -* GitHub: https://github.com/malaria-atlas-project/malariaAtlas -* Source code: https://github.com/cran/malariaAtlas -* Date/Publication: 2023-10-27 06:40:02 UTC -* Number of recursive dependencies: 127 - -Run `revdepcheck::revdep_details(, "malariaAtlas")` for more info - -
- -## In both - -* R CMD check timed out - - +*Wow, no problems at all. :)* \ No newline at end of file diff --git a/vignettes/aggregate-1.png b/vignettes/aggregate-1.png index 29434101..50265dcd 100644 Binary files a/vignettes/aggregate-1.png and b/vignettes/aggregate-1.png differ diff --git a/vignettes/aggregate-2.png b/vignettes/aggregate-2.png index c3885285..87065f1b 100644 Binary files a/vignettes/aggregate-2.png and b/vignettes/aggregate-2.png differ diff --git a/vignettes/contourfilled-1.png b/vignettes/contourfilled-1.png index 845043be..7bf32e8b 100644 Binary files a/vignettes/contourfilled-1.png and b/vignettes/contourfilled-1.png differ diff --git a/vignettes/contourlines-1.png b/vignettes/contourlines-1.png index 3ef39f25..b28c5e89 100644 Binary files a/vignettes/contourlines-1.png and b/vignettes/contourlines-1.png differ diff --git a/vignettes/faceted-1.png b/vignettes/faceted-1.png index f00de2b0..63bb5f76 100644 Binary files a/vignettes/faceted-1.png and b/vignettes/faceted-1.png differ diff --git a/vignettes/hypso-1.png b/vignettes/hypso-1.png index ad981e20..7c318826 100644 Binary files a/vignettes/hypso-1.png and b/vignettes/hypso-1.png differ diff --git a/vignettes/lux_ggplot-1.png b/vignettes/lux_ggplot-1.png index 9c3d4a1b..35249462 100644 Binary files a/vignettes/lux_ggplot-1.png and b/vignettes/lux_ggplot-1.png differ diff --git a/vignettes/rgb-1.png b/vignettes/rgb-1.png index 362a8c0d..e4e9e1aa 100644 Binary files a/vignettes/rgb-1.png and b/vignettes/rgb-1.png differ diff --git a/vignettes/spatraster-example1-1.png b/vignettes/spatraster-example1-1.png index 8546eb4a..74650478 100644 Binary files a/vignettes/spatraster-example1-1.png and b/vignettes/spatraster-example1-1.png differ diff --git a/vignettes/spatraster-example2-1.png b/vignettes/spatraster-example2-1.png index bb2911e4..3fe6f644 100644 Binary files a/vignettes/spatraster-example2-1.png and b/vignettes/spatraster-example2-1.png differ diff --git a/vignettes/tidyterra.Rmd.orig b/vignettes/tidyterra.Rmd.orig index 6897b89a..5b103a80 100644 --- a/vignettes/tidyterra.Rmd.orig +++ b/vignettes/tidyterra.Rmd.orig @@ -37,6 +37,7 @@ knitr::opts_chunk$set( message = FALSE, dev = "ragg_png", tidy = "styler", + dpi = 90, fig.path = "./", out.width = "100%" )