Prepare for CRAN release

dieghernan · Nov 20, 2023 · 237a5f2 · 237a5f2
1 parent b81b067
commit 237a5f2
Show file tree

Hide file tree

Showing 19 changed files with 144 additions and 186 deletions.
diff --git 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.4.1.9000
+version: 0.5.0
 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
@@ -1,6 +1,6 @@
 Package: tidyterra
 Title: 'tidyverse' Methods and 'ggplot2' Helpers for 'terra' Objects
-Version: 0.4.1.9000
+Version: 0.5.0
 Authors@R: c(
     person("Diego", "Hernangómez", , "[email protected]", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0001-8457-4658")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-# tidyterra (development version)
+# tidyterra 0.5.0
 
 **tidyterra** has been accepted on JOSS. Please use the result of
 `citation("tidyterra")` or the following string:

diff --git a/R/geom_spatraster_rgb.R b/R/geom_spatraster_rgb.R
@@ -31,7 +31,7 @@
 #'   See [grDevices::rgb()].
 #'
 #' @seealso [ggplot2::geom_raster()], [ggplot2::coord_sf()], [grDevices::rgb()].
-#'  You can get also RGB tiles from the {maptiles} package,
+#'  You can get also RGB tiles from the \CRANpkg{maptiles} package,
 #'  see [maptiles::get_tiles()].
 #'
 #' @section  terra equivalent:

diff --git a/R/scales_cross_blended.R b/R/scales_cross_blended.R
@@ -237,7 +237,8 @@ scale_colour_cross_blended_d <- function(palette = "cold_humid", ...,
 #' @rdname scale_cross_blended
 scale_fill_cross_blended_c <- function(palette = "cold_humid", ...,
                                        alpha = 1, direction = 1,
-                                       na.value = "transparent", guide = "colourbar") {
+                                       na.value = "transparent",
+                                       guide = "colourbar") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -268,7 +269,8 @@ scale_fill_cross_blended_c <- function(palette = "cold_humid", ...,
 #' @rdname scale_cross_blended
 scale_colour_cross_blended_c <- function(palette = "cold_humid", ...,
                                          alpha = 1, direction = 1,
-                                         na.value = "transparent", guide = "colourbar") {
+                                         na.value = "transparent",
+                                         guide = "colourbar") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -298,7 +300,8 @@ scale_colour_cross_blended_c <- function(palette = "cold_humid", ...,
 #' @rdname scale_cross_blended
 scale_fill_cross_blended_b <- function(palette = "cold_humid", ...,
                                        alpha = 1, direction = 1,
-                                       na.value = "transparent", guide = "coloursteps") {
+                                       na.value = "transparent",
+                                       guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -327,7 +330,8 @@ scale_fill_cross_blended_b <- function(palette = "cold_humid", ...,
 #' @rdname scale_cross_blended
 scale_colour_cross_blended_b <- function(palette = "cold_humid", ...,
                                          alpha = 1, direction = 1,
-                                         na.value = "transparent", guide = "coloursteps") {
+                                         na.value = "transparent",
+                                         guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }

diff --git a/R/scales_hypso.R b/R/scales_hypso.R
@@ -254,7 +254,8 @@ scale_fill_hypso_c <- function(palette = "etopo1_hypso", ...,
 #' @rdname scale_hypso
 scale_colour_hypso_c <- function(palette = "etopo1_hypso", ...,
                                  alpha = 1, direction = 1,
-                                 na.value = "transparent", guide = "colourbar") {
+                                 na.value = "transparent",
+                                 guide = "colourbar") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -284,7 +285,8 @@ scale_colour_hypso_c <- function(palette = "etopo1_hypso", ...,
 #' @rdname scale_hypso
 scale_fill_hypso_b <- function(palette = "etopo1_hypso", ...,
                                alpha = 1, direction = 1,
-                               na.value = "transparent", guide = "coloursteps") {
+                               na.value = "transparent",
+                               guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -313,7 +315,8 @@ scale_fill_hypso_b <- function(palette = "etopo1_hypso", ...,
 #' @rdname scale_hypso
 scale_colour_hypso_b <- function(palette = "etopo1_hypso", ...,
                                  alpha = 1, direction = 1,
-                                 na.value = "transparent", guide = "coloursteps") {
+                                 na.value = "transparent",
+                                 guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -552,7 +555,8 @@ scale_fill_hypso_tint_b <- function(palette = "etopo1_hypso", ...,
                                     alpha = 1, direction = 1,
                                     values = NULL,
                                     limits = NULL,
-                                    na.value = "transparent", guide = "coloursteps") {
+                                    na.value = "transparent",
+                                    guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -596,7 +600,8 @@ scale_colour_hypso_tint_b <- function(palette = "etopo1_hypso", ...,
                                       alpha = 1, direction = 1,
                                       values = NULL,
                                       limits = NULL,
-                                      na.value = "transparent", guide = "coloursteps") {
+                                      na.value = "transparent",
+                                      guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }

diff --git a/R/scales_terrain.R b/R/scales_terrain.R
@@ -127,7 +127,8 @@ scale_colour_terrain_d <- function(..., alpha = 1, direction = 1,
 #' @export
 #' @rdname scale_terrain
 scale_fill_terrain_c <- function(..., alpha = 1, direction = 1,
-                                 na.value = "transparent", guide = "colourbar") {
+                                 na.value = "transparent",
+                                 guide = "colourbar") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -152,7 +153,8 @@ scale_fill_terrain_c <- function(..., alpha = 1, direction = 1,
 #' @export
 #' @rdname scale_terrain
 scale_colour_terrain_c <- function(..., alpha = 1, direction = 1,
-                                   na.value = "transparent", guide = "colourbar") {
+                                   na.value = "transparent",
+                                   guide = "colourbar") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -178,7 +180,8 @@ scale_colour_terrain_c <- function(..., alpha = 1, direction = 1,
 #' @export
 #' @rdname scale_terrain
 scale_fill_terrain_b <- function(..., alpha = 1, direction = 1,
-                                 na.value = "transparent", guide = "coloursteps") {
+                                 na.value = "transparent",
+                                 guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -203,7 +206,8 @@ scale_fill_terrain_b <- function(..., alpha = 1, direction = 1,
 #' @export
 #' @rdname scale_terrain
 scale_colour_terrain_b <- function(..., alpha = 1, direction = 1,
-                                   na.value = "transparent", guide = "coloursteps") {
+                                   na.value = "transparent",
+                                   guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }

diff --git a/R/scales_whitebox.R b/R/scales_whitebox.R
@@ -153,7 +153,8 @@ scale_colour_whitebox_d <- function(palette = "high_relief", ...,
 #' @rdname scale_whitebox
 scale_fill_whitebox_c <- function(palette = "high_relief", ...,
                                   alpha = 1, direction = 1,
-                                  na.value = "transparent", guide = "colourbar") {
+                                  na.value = "transparent",
+                                  guide = "colourbar") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -182,7 +183,8 @@ scale_fill_whitebox_c <- function(palette = "high_relief", ...,
 #' @rdname scale_whitebox
 scale_colour_whitebox_c <- function(palette = "high_relief", ...,
                                     alpha = 1, direction = 1,
-                                    na.value = "transparent", guide = "colourbar") {
+                                    na.value = "transparent",
+                                    guide = "colourbar") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -212,7 +214,8 @@ scale_colour_whitebox_c <- function(palette = "high_relief", ...,
 #' @rdname scale_whitebox
 scale_fill_whitebox_b <- function(palette = "high_relief", ...,
                                   alpha = 1, direction = 1,
-                                  na.value = "transparent", guide = "coloursteps") {
+                                  na.value = "transparent",
+                                  guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }
@@ -242,7 +245,8 @@ scale_fill_whitebox_b <- function(palette = "high_relief", ...,
 #' @rdname scale_whitebox
 scale_colour_whitebox_b <- function(palette = "high_relief", ...,
                                     alpha = 1, direction = 1,
-                                    na.value = "transparent", guide = "coloursteps") {
+                                    na.value = "transparent",
+                                    guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }

diff --git a/R/scales_wiki.R b/R/scales_wiki.R
@@ -226,7 +226,8 @@ scale_fill_wiki_b <- function(..., alpha = 1, direction = 1,
 #' @export
 #' @rdname scale_wiki
 scale_colour_wiki_b <- function(..., alpha = 1, direction = 1,
-                                na.value = "transparent", guide = "coloursteps") {
+                                na.value = "transparent",
+                                guide = "coloursteps") {
   if (alpha < 0 || alpha > 1) {
     cli::cli_abort("{.arg alpha} {.field {alpha}} not in {.field [0,1]}")
   }

diff --git a/README.Rmd b/README.Rmd
@@ -39,7 +39,8 @@ results](https://badges.cranchecks.info/worst/tidyterra.svg)](https://cran.r-pro
 [![Project Status: Active -- The project has reached a stable, usable state and
 is being actively
 developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
-[![Stack Exchange questions](https://img.shields.io/stackexchange/stackoverflow/t/tidyterra?logo=stackoverflow&label=stackoverflow%20q%26a)](https://stackoverflow.com/questions/tagged/tidyterra)
+[![Stack Exchange
+questions](https://img.shields.io/stackexchange/stackoverflow/t/tidyterra?logo=stackoverflow&label=stackoverflow%20q%26a)](https://stackoverflow.com/questions/tagged/tidyterra)
 
 <!-- badges: end -->
 
@@ -83,7 +84,7 @@ example, `as_tibble()` would return a tibble).
 Current methods and functions provided by {tidyterra} are:
 
 | tidyverse method                            | SpatVector                                    | SpatRaster                                                                                     |
-|--------------------|--------------------|----------------------------------------|
+|--------------------|--------------------|---------------------------------------|
 | `tibble::as_tibble()`                       | ✔️                                            | ✔️                                                                                             |
 | `dplyr::select()`                           | ✔️                                            | ✔️ Select layers                                                                               |
 | `dplyr::mutate()`                           | ✔️                                            | ✔️ Create /modify layers                                                                       |
@@ -297,9 +298,12 @@ You can also ask in [Stack Overflow](https://stackoverflow.com/) using the tag
 
 ## Citation
 
-```{r echo=FALSE, results='asis'}
-print(citation("tidyterra"), bibtex = FALSE)
-```
+If you use this software, please cite our article in the [Journal of Open Source
+Software](https://joss.theoj.org/):
+
+> Hernangómez, D., (2023). Using the tidyverse with terra objects: the tidyterra
+> package. *Journal of Open Source Software*, *8*(91), 5751,
+> <https://doi.org/10.21105/joss.05751>.
 
 A BibTeX entry for LaTeX users is
 

diff --git a/README.md b/README.md
@@ -31,9 +31,6 @@ objects with [{ggplot2}](https://ggplot2.tidyverse.org/).
 
 ## Overview
 
-You can have a look to the documentation of the dev version in
-<https://dieghernan.github.io/tidyterra/dev/>
-
 {tidyverse} methods implemented on {tidyterra} works differently
 depending on the type of Spat\* object:
 
@@ -318,14 +315,12 @@ the tag
 
 ## Citation
 
-If you use this software, please cite our article in the Journal of Open
-Source Software.
+If you use this software, please cite our article in the [Journal of
+Open Source Software](https://joss.theoj.org/):
 
-Hernangómez D (2023). “Using the tidyverse with terra objects: the
-tidyterra package.” *Journal of Open Source Software*, *8*(91), 5751.
-ISSN 2475-9066, <doi:10.21105/joss.05751>
-<https://doi.org/10.21105/joss.05751>,
-<https://doi.org/10.21105/joss.05751>.
+> Hernangómez, D., (2023). Using the tidyverse with terra objects: the
+> tidyterra package. *Journal of Open Source Software*, *8*(91), 5751,
+> <https://doi.org/10.21105/joss.05751>.
 
 A BibTeX entry for LaTeX users is
 

diff --git 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.4.1.9000",
+  "version": "0.5.0",
   "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": "3441.735KB",
+  "fileSize": "3441.235KB",
   "citation": [
     {
       "@type": "ScholarlyArticle",

diff --git 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.4.1.9000"
+  "version": "0.5.0"
 }
diff --git a/man/geom_spatraster_rgb.Rd b/man/geom_spatraster_rgb.Rd