diff --git a/.github/workflows/check-dplyr-readr.yaml b/.github/workflows/check-dplyr-readr.yaml index 7ff874df..186bbea2 100644 --- a/.github/workflows/check-dplyr-readr.yaml +++ b/.github/workflows/check-dplyr-readr.yaml @@ -9,7 +9,7 @@ on: - cron: '00 14 * * 1,4' workflow_dispatch: -name: Works with dplyr and readr-devel +name: dev-version dplyr and readr jobs: R-CMD-check-dplyr-readr-devel: @@ -54,8 +54,8 @@ jobs: install.packages(c('dplyr', 'readr'), repos = c('https://tidyverse.r-universe.dev', 'https://cloud.r-project.org')) # Display version - cat("dplyr ", as.character(packageVersion("dplyr"))) - cat("readr ", as.character(packageVersion("dplyr"))) + cat("\ndplyr ", as.character(packageVersion("dplyr"))) + cat("\nreadr ", as.character(packageVersion("readr"))) shell: Rscript {0} - uses: r-lib/actions/check-r-package@v2 diff --git a/.github/workflows/check-ggplot2-devel.yaml b/.github/workflows/check-ggplot2-devel.yaml index 662f788b..bc0d60e6 100644 --- a/.github/workflows/check-ggplot2-devel.yaml +++ b/.github/workflows/check-ggplot2-devel.yaml @@ -9,7 +9,7 @@ on: - cron: '00 18 * * 1,4' workflow_dispatch: -name: Works with ggplot2-devel +name: dev-version ggplot2 jobs: R-CMD-check-ggplot2-devel: @@ -54,7 +54,7 @@ jobs: install.packages('ggplot2', repos = c('https://tidyverse.r-universe.dev', 'https://cloud.r-project.org')) # Display version - cat(as.character(packageVersion("ggplot2"))) + cat("ggplot2 ", as.character(packageVersion("ggplot2"))) shell: Rscript {0} - uses: r-lib/actions/check-r-package@v2 diff --git a/.github/workflows/check-sf-devel.yaml b/.github/workflows/check-sf-devel.yaml index 849795a4..13ed0ef0 100644 --- a/.github/workflows/check-sf-devel.yaml +++ b/.github/workflows/check-sf-devel.yaml @@ -9,7 +9,7 @@ on: - cron: '00 12 * * 2,5' workflow_dispatch: -name: Works with sf-devel +name: dev-version sf jobs: R-CMD-check-sf-devel: @@ -54,7 +54,7 @@ jobs: install.packages('sf', repos = c('https://r-spatial.r-universe.dev', 'https://cloud.r-project.org')) # Display version - cat(as.character(packageVersion("sf"))) + cat("sf ", as.character(packageVersion("sf"))) shell: Rscript {0} - uses: r-lib/actions/check-r-package@v2 diff --git a/.github/workflows/check-terra-devel.yaml b/.github/workflows/check-terra-devel.yaml index 4fdb3f61..32b2bb93 100644 --- a/.github/workflows/check-terra-devel.yaml +++ b/.github/workflows/check-terra-devel.yaml @@ -9,7 +9,7 @@ on: - cron: '00 11 * * 2,5' workflow_dispatch: -name: Works with terra-devel +name: dev-version terra jobs: R-CMD-check-terra-devel: @@ -56,7 +56,7 @@ jobs: install.packages("terra", dependencies = TRUE) # Display version - cat(as.character(packageVersion("terra"))) + cat("terra ", as.character(packageVersion("terra"))) shell: Rscript {0} - uses: r-lib/actions/check-r-package@v2 diff --git a/CITATION.cff b/CITATION.cff index ce01de78..422a43cb 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -156,9 +156,6 @@ references: - family-names: Dunnington given-names: Dewey orcid: https://orcid.org/0000-0002-9415-4582 - - family-names: van den Brand - given-names: Teun - orcid: https://orcid.org/0000-0002-9335-7468 year: '2024' version: '>= 3.1.0' - type: software diff --git a/README.Rmd b/README.Rmd index a4980ae8..cc97c4fd 100644 --- a/README.Rmd +++ b/README.Rmd @@ -41,6 +41,14 @@ 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) +[![Works with +terra-devel](https://github.com/dieghernan/tidyterra/actions/workflows/check-terra-devel.yaml/badge.svg)](https://github.com/dieghernan/tidyterra/actions/workflows/check-terra-devel.yaml) +[![Works with +sf-devel](https://github.com/dieghernan/tidyterra/actions/workflows/check-sf-devel.yaml/badge.svg)](https://github.com/dieghernan/tidyterra/actions/workflows/check-sd-devel.yaml) +[![Works with +ggplot2-devel](https://github.com/dieghernan/tidyterra/actions/workflows/check-ggplot2-devel.yaml/badge.svg)](https://github.com/dieghernan/tidyterra/actions/workflows/check-ggplot2-devel.yaml) +[![Works with dplyr and +readr-devel](https://github.com/dieghernan/tidyterra/actions/workflows/check-dplyr-readr.yaml/badge.svg)](https://github.com/dieghernan/tidyterra/actions/workflows/check-dplyr-readr.yaml) @@ -84,7 +92,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 | diff --git a/README.md b/README.md index e3940227..3b8b8a75 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,14 @@ 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) +[![Works with +terra-devel](https://github.com/dieghernan/tidyterra/actions/workflows/check-terra-devel.yaml/badge.svg)](https://github.com/dieghernan/tidyterra/actions/workflows/check-terra-devel.yaml) +[![Works with +sf-devel](https://github.com/dieghernan/tidyterra/actions/workflows/check-sf-devel.yaml/badge.svg)](https://github.com/dieghernan/tidyterra/actions/workflows/check-sd-devel.yaml) +[![Works with +ggplot2-devel](https://github.com/dieghernan/tidyterra/actions/workflows/check-ggplot2-devel.yaml/badge.svg)](https://github.com/dieghernan/tidyterra/actions/workflows/check-ggplot2-devel.yaml) +[![Works with dplyr and +readr-devel](https://github.com/dieghernan/tidyterra/actions/workflows/check-dplyr-readr.yaml/badge.svg)](https://github.com/dieghernan/tidyterra/actions/workflows/check-dplyr-readr.yaml) diff --git a/codemeta.json b/codemeta.json index c714ddb2..671ccb9d 100644 --- a/codemeta.json +++ b/codemeta.json @@ -308,7 +308,7 @@ "SystemRequirements": null }, "keywords": ["r", "terra", "ggplot-extension", "r-spatial", "rspatial", "r-package", "rstats", "rstats-package", "cran", "cran-r"], - "fileSize": "2732.419KB", + "fileSize": "2732.516KB", "citation": [ { "@type": "ScholarlyArticle", @@ -340,6 +340,6 @@ ], "releaseNotes": "https://github.com/dieghernan/tidyterra/blob/master/NEWS.md", "readme": "https://github.com/dieghernan/tidyterra/blob/main/README.md", - "contIntegration": ["https://github.com/dieghernan/tidyterra/actions/workflows/check-full.yaml", "https://app.codecov.io/gh/dieghernan/tidyterra"], + "contIntegration": ["https://github.com/dieghernan/tidyterra/actions/workflows/check-full.yaml", "https://app.codecov.io/gh/dieghernan/tidyterra", "https://github.com/dieghernan/tidyterra/actions/workflows/check-terra-devel.yaml", "https://github.com/dieghernan/tidyterra/actions/workflows/check-sd-devel.yaml", "https://github.com/dieghernan/tidyterra/actions/workflows/check-ggplot2-devel.yaml", "https://github.com/dieghernan/tidyterra/actions/workflows/check-dplyr-readr.yaml"], "developmentStatus": "https://www.repostatus.org/#active" } diff --git a/img/README-example-temp-1.png b/img/README-example-temp-1.png index c0304572..62073e56 100644 Binary files a/img/README-example-temp-1.png and b/img/README-example-temp-1.png differ diff --git a/man/scale_cross_blended.Rd b/man/scale_cross_blended.Rd index 5d39f332..7bfac8f9 100644 --- a/man/scale_cross_blended.Rd +++ b/man/scale_cross_blended.Rd @@ -195,9 +195,7 @@ expand the scale by 5\% on each side for continuous variables, and by each major break) \item A numeric vector of positions \item A function that given the limits returns a vector of minor breaks. Also -accepts rlang \link[rlang:as_function]{lambda} function notation. When -the function has two arguments, it will be given the limits and major -breaks. +accepts rlang \link[rlang:as_function]{lambda} function notation. }} \item{\code{n.breaks}}{An integer guiding the number of major breaks. The algorithm may choose a slightly different number to ensure nice break labels. Will diff --git a/man/scale_hypso.Rd b/man/scale_hypso.Rd index 5a2e5c1e..758428ac 100644 --- a/man/scale_hypso.Rd +++ b/man/scale_hypso.Rd @@ -189,9 +189,7 @@ expand the scale by 5\% on each side for continuous variables, and by each major break) \item A numeric vector of positions \item A function that given the limits returns a vector of minor breaks. Also -accepts rlang \link[rlang:as_function]{lambda} function notation. When -the function has two arguments, it will be given the limits and major -breaks. +accepts rlang \link[rlang:as_function]{lambda} function notation. }} \item{\code{n.breaks}}{An integer guiding the number of major breaks. The algorithm may choose a slightly different number to ensure nice break labels. Will diff --git a/man/scale_terrain.Rd b/man/scale_terrain.Rd index fc2da140..e0213301 100644 --- a/man/scale_terrain.Rd +++ b/man/scale_terrain.Rd @@ -107,9 +107,7 @@ expand the scale by 5\% on each side for continuous variables, and by each major break) \item A numeric vector of positions \item A function that given the limits returns a vector of minor breaks. Also -accepts rlang \link[rlang:as_function]{lambda} function notation. When -the function has two arguments, it will be given the limits and major -breaks. +accepts rlang \link[rlang:as_function]{lambda} function notation. }} \item{\code{n.breaks}}{An integer guiding the number of major breaks. The algorithm may choose a slightly different number to ensure nice break labels. Will diff --git a/man/scale_whitebox.Rd b/man/scale_whitebox.Rd index 4006fc58..60dd4035 100644 --- a/man/scale_whitebox.Rd +++ b/man/scale_whitebox.Rd @@ -124,9 +124,7 @@ expand the scale by 5\% on each side for continuous variables, and by each major break) \item A numeric vector of positions \item A function that given the limits returns a vector of minor breaks. Also -accepts rlang \link[rlang:as_function]{lambda} function notation. When -the function has two arguments, it will be given the limits and major -breaks. +accepts rlang \link[rlang:as_function]{lambda} function notation. }} \item{\code{n.breaks}}{An integer guiding the number of major breaks. The algorithm may choose a slightly different number to ensure nice break labels. Will diff --git a/man/scale_wiki.Rd b/man/scale_wiki.Rd index 0afc6e1f..e6685247 100644 --- a/man/scale_wiki.Rd +++ b/man/scale_wiki.Rd @@ -111,9 +111,7 @@ expand the scale by 5\% on each side for continuous variables, and by each major break) \item A numeric vector of positions \item A function that given the limits returns a vector of minor breaks. Also -accepts rlang \link[rlang:as_function]{lambda} function notation. When -the function has two arguments, it will be given the limits and major -breaks. +accepts rlang \link[rlang:as_function]{lambda} function notation. }} \item{\code{n.breaks}}{An integer guiding the number of major breaks. The algorithm may choose a slightly different number to ensure nice break labels. Will diff --git a/tests/testthat/_snaps/autoplot-Spat/norgb-01-regular.svg b/tests/testthat/_snaps/autoplot-Spat/norgb-01-regular.svg index 9047bc3d..2bdab43a 100644 --- a/tests/testthat/_snaps/autoplot-Spat/norgb-01-regular.svg +++ b/tests/testthat/_snaps/autoplot-Spat/norgb-01-regular.svg @@ -220,20 +220,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + norgb_01: regular diff --git a/tests/testthat/_snaps/autoplot-Spat/norgb-03-no-facets-auto.svg b/tests/testthat/_snaps/autoplot-Spat/norgb-03-no-facets-auto.svg index 86c87969..859448b7 100644 --- a/tests/testthat/_snaps/autoplot-Spat/norgb-03-no-facets-auto.svg +++ b/tests/testthat/_snaps/autoplot-Spat/norgb-03-no-facets-auto.svg @@ -93,23 +93,23 @@ ° W -value - - - - - - - - - - 2.5 5.0 7.5 10.0 12.5 +value + + + + + + + + + + norgb_03: no facets auto diff --git a/tests/testthat/_snaps/autoplot-Spat/norgb-03-no-facets-forced.svg b/tests/testthat/_snaps/autoplot-Spat/norgb-03-no-facets-forced.svg index 6cb63457..772fcdff 100644 --- a/tests/testthat/_snaps/autoplot-Spat/norgb-03-no-facets-forced.svg +++ b/tests/testthat/_snaps/autoplot-Spat/norgb-03-no-facets-forced.svg @@ -93,23 +93,23 @@ ° W -value - - - - - - - - - - 2.5 5.0 7.5 10.0 12.5 +value + + + + + + + + + + norgb_03: no facets forced diff --git a/tests/testthat/_snaps/autoplot-Spat/norgb-04-three-rows.svg b/tests/testthat/_snaps/autoplot-Spat/norgb-04-three-rows.svg index f5f145ca..efb3adfd 100644 --- a/tests/testthat/_snaps/autoplot-Spat/norgb-04-three-rows.svg +++ b/tests/testthat/_snaps/autoplot-Spat/norgb-04-three-rows.svg @@ -206,20 +206,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + norgb_04: three rows diff --git a/tests/testthat/_snaps/autoplot-Spat/norgb-05-four-cols.svg b/tests/testthat/_snaps/autoplot-Spat/norgb-05-four-cols.svg index 478cb2a5..2d66fabb 100644 --- a/tests/testthat/_snaps/autoplot-Spat/norgb-05-four-cols.svg +++ b/tests/testthat/_snaps/autoplot-Spat/norgb-05-four-cols.svg @@ -245,23 +245,23 @@ -value - - - - - - - - - - 5 10 15 20 25 +value + + + + + + + + + + norgb_05: four cols diff --git a/tests/testthat/_snaps/autoplot-Spat/norgb-06-force-no-facets.svg b/tests/testthat/_snaps/autoplot-Spat/norgb-06-force-no-facets.svg index e0afd500..b2e9e710 100644 --- a/tests/testthat/_snaps/autoplot-Spat/norgb-06-force-no-facets.svg +++ b/tests/testthat/_snaps/autoplot-Spat/norgb-06-force-no-facets.svg @@ -93,23 +93,23 @@ ° W -value - - - - - - - - - - 5 10 15 20 25 +value + + + + + + + + + + norgb_06: force no facets diff --git a/tests/testthat/_snaps/autoplot-Spat/rgb-05-forced-to-non-rgb.svg b/tests/testthat/_snaps/autoplot-Spat/rgb-05-forced-to-non-rgb.svg index 0e9c1978..bca76800 100644 --- a/tests/testthat/_snaps/autoplot-Spat/rgb-05-forced-to-non-rgb.svg +++ b/tests/testthat/_snaps/autoplot-Spat/rgb-05-forced-to-non-rgb.svg @@ -228,23 +228,23 @@ -value - - - - - - - - - - 50 100 150 200 250 +value + + + + + + + + + + rgb_05: forced to non-rgb diff --git a/tests/testthat/_snaps/autoplot-Spat/vector-01-regular.svg b/tests/testthat/_snaps/autoplot-Spat/vector-01-regular.svg index c57845a5..b040343f 100644 --- a/tests/testthat/_snaps/autoplot-Spat/vector-01-regular.svg +++ b/tests/testthat/_snaps/autoplot-Spat/vector-01-regular.svg @@ -21,11 +21,11 @@ - + - + diff --git a/tests/testthat/_snaps/autoplot-Spat/vector-02-aes.svg b/tests/testthat/_snaps/autoplot-Spat/vector-02-aes.svg index c5e56269..26cd2ecb 100644 --- a/tests/testthat/_snaps/autoplot-Spat/vector-02-aes.svg +++ b/tests/testthat/_snaps/autoplot-Spat/vector-02-aes.svg @@ -21,11 +21,11 @@ - + - + diff --git a/tests/testthat/_snaps/autoplot-Spat/vector-03-aes-inherited.svg b/tests/testthat/_snaps/autoplot-Spat/vector-03-aes-inherited.svg index 5f6550c6..bb5e6837 100644 --- a/tests/testthat/_snaps/autoplot-Spat/vector-03-aes-inherited.svg +++ b/tests/testthat/_snaps/autoplot-Spat/vector-03-aes-inherited.svg @@ -55,23 +55,23 @@ - + ES-AV - + ES-BU - + ES-LE - + ES-P - + ES-SA - + ES-SG - + ES-SO - + ES-VA - + ES-ZA diff --git a/tests/testthat/_snaps/geom_spat_contour.md b/tests/testthat/_snaps/geom_spat_contour.md index 568a2ca4..43700d9d 100644 --- a/tests/testthat/_snaps/geom_spat_contour.md +++ b/tests/testthat/_snaps/geom_spat_contour.md @@ -34,7 +34,7 @@ Warning in `max()`: no non-missing arguments to max; returning -Inf Warning: - Computation failed in `stat_terra_spat_raster_contour()`. + Computation failed in `stat_terra_spat_raster_contour()` Caused by error in `$<-.data.frame`: ! replacement has 1 row, data has 0 diff --git a/tests/testthat/_snaps/geom_spat_contour/03-faceted-with-aes.svg b/tests/testthat/_snaps/geom_spat_contour/03-faceted-with-aes.svg index df6e3258..199310d7 100644 --- a/tests/testthat/_snaps/geom_spat_contour/03-faceted-with-aes.svg +++ b/tests/testthat/_snaps/geom_spat_contour/03-faceted-with-aes.svg @@ -813,20 +813,20 @@ -level - - - - - - - - 1000 2000 3000 4000 +level + + + + + + + + 03-faceted with aes diff --git a/tests/testthat/_snaps/geom_spat_contour/04-faceted-with-aes-and-crs.svg b/tests/testthat/_snaps/geom_spat_contour/04-faceted-with-aes-and-crs.svg index fb272f0d..ef836188 100644 --- a/tests/testthat/_snaps/geom_spat_contour/04-faceted-with-aes-and-crs.svg +++ b/tests/testthat/_snaps/geom_spat_contour/04-faceted-with-aes-and-crs.svg @@ -568,20 +568,20 @@ -level - - - - - - - - 1000 2000 3000 4000 +level + + + + + + + + 04-faceted with aes and crs diff --git a/tests/testthat/_snaps/geom_spat_contour/05-aes-for-layer.svg b/tests/testthat/_snaps/geom_spat_contour/05-aes-for-layer.svg index ba7979fd..3ba79e59 100644 --- a/tests/testthat/_snaps/geom_spat_contour/05-aes-for-layer.svg +++ b/tests/testthat/_snaps/geom_spat_contour/05-aes-for-layer.svg @@ -520,20 +520,20 @@ ° W -nlevel - - - - - - - - 0.25 0.50 0.75 1.00 +nlevel + + + + + + + + 05-aes for layer diff --git a/tests/testthat/_snaps/geom_spat_contour/06-aes-for-layer-aes-and-crs.svg b/tests/testthat/_snaps/geom_spat_contour/06-aes-for-layer-aes-and-crs.svg index e814e552..13de8850 100644 --- a/tests/testthat/_snaps/geom_spat_contour/06-aes-for-layer-aes-and-crs.svg +++ b/tests/testthat/_snaps/geom_spat_contour/06-aes-for-layer-aes-and-crs.svg @@ -356,20 +356,20 @@ ° W -nlevel - - - - - - - - 0.25 0.50 0.75 1.00 +nlevel + + + + + + + + 06-aes for layer aes and crs diff --git a/tests/testthat/_snaps/geom_spat_contour_fill.md b/tests/testthat/_snaps/geom_spat_contour_fill.md index d761de49..e2dc1771 100644 --- a/tests/testthat/_snaps/geom_spat_contour_fill.md +++ b/tests/testthat/_snaps/geom_spat_contour_fill.md @@ -34,11 +34,11 @@ Warning in `max()`: no non-missing arguments to max; returning -Inf Warning: - Computation failed in `stat_terra_spat_raster_contour_fill()`. + Computation failed in `stat_terra_spat_raster_contour_fill()` Caused by error in `UseMethod()`: ! no applicable method for 'left_join' applied to an object of class "list" Error in `calc_limits_bbox()`: - ! Scale limits cannot be mapped onto spatial coordinates in `coord_sf()`. + ! Scale limits cannot be mapped onto spatial coordinates in `coord_sf()` i Consider setting `lims_method = "geometry_bbox"` or `default_crs = NULL`. # Test plot diff --git a/tests/testthat/_snaps/geom_spat_contour_fill/05-aes-for-layer.svg b/tests/testthat/_snaps/geom_spat_contour_fill/05-aes-for-layer.svg index f5555986..ad7539ce 100644 --- a/tests/testthat/_snaps/geom_spat_contour_fill/05-aes-for-layer.svg +++ b/tests/testthat/_snaps/geom_spat_contour_fill/05-aes-for-layer.svg @@ -97,23 +97,23 @@ ° W -level_low - - - - - - - - - - 3 6 9 12 15 +level_low + + + + + + + + + + 05-aes for layer diff --git a/tests/testthat/_snaps/geom_spat_contour_fill/06-aes-for-layer-aes-and-crs.svg b/tests/testthat/_snaps/geom_spat_contour_fill/06-aes-for-layer-aes-and-crs.svg index c8ca3ba2..91035044 100644 --- a/tests/testthat/_snaps/geom_spat_contour_fill/06-aes-for-layer-aes-and-crs.svg +++ b/tests/testthat/_snaps/geom_spat_contour_fill/06-aes-for-layer-aes-and-crs.svg @@ -96,20 +96,20 @@ ° W -level_low - - - - - - - - 7.5 10.0 12.5 15.0 +level_low + + + + + + + + 06-aes for layer aes and crs diff --git a/tests/testthat/_snaps/geom_spat_contour_fill/07-align-binwd.svg b/tests/testthat/_snaps/geom_spat_contour_fill/07-align-binwd.svg index 8cfa039a..024c4c71 100644 --- a/tests/testthat/_snaps/geom_spat_contour_fill/07-align-binwd.svg +++ b/tests/testthat/_snaps/geom_spat_contour_fill/07-align-binwd.svg @@ -21,11 +21,11 @@ - + - + diff --git a/tests/testthat/_snaps/geom_spat_contour_fill/09-align-bins.svg b/tests/testthat/_snaps/geom_spat_contour_fill/09-align-bins.svg index 9110f367..2361dcdd 100644 --- a/tests/testthat/_snaps/geom_spat_contour_fill/09-align-bins.svg +++ b/tests/testthat/_snaps/geom_spat_contour_fill/09-align-bins.svg @@ -21,11 +21,11 @@ - + - + diff --git a/tests/testthat/_snaps/geom_spat_contour_fill/11-align-breaks.svg b/tests/testthat/_snaps/geom_spat_contour_fill/11-align-breaks.svg index c6006290..45184c05 100644 --- a/tests/testthat/_snaps/geom_spat_contour_fill/11-align-breaks.svg +++ b/tests/testthat/_snaps/geom_spat_contour_fill/11-align-breaks.svg @@ -21,11 +21,11 @@ - + - + diff --git a/tests/testthat/_snaps/geom_spat_contour_fill/crsfacet-02-color.svg b/tests/testthat/_snaps/geom_spat_contour_fill/crsfacet-02-color.svg index fdfc4d3e..d0d1ff28 100644 --- a/tests/testthat/_snaps/geom_spat_contour_fill/crsfacet-02-color.svg +++ b/tests/testthat/_snaps/geom_spat_contour_fill/crsfacet-02-color.svg @@ -210,28 +210,28 @@ - -level + +cpro - + - + - -(0, 800] -(800, 1600] -(1600, 2400] - -cpro + +05 +09 +24 + +level - + - + - -05 -09 -24 + +(0, 800] +(800, 1600] +(1600, 2400] crsfacet_02: color diff --git a/tests/testthat/_snaps/geom_spat_contour_fill/crsfacet-03-change-crs.svg b/tests/testthat/_snaps/geom_spat_contour_fill/crsfacet-03-change-crs.svg index 54f3294e..a32737ea 100644 --- a/tests/testthat/_snaps/geom_spat_contour_fill/crsfacet-03-change-crs.svg +++ b/tests/testthat/_snaps/geom_spat_contour_fill/crsfacet-03-change-crs.svg @@ -210,28 +210,28 @@ - -level + +cpro - + - + - -(0, 800] -(800, 1600] -(1600, 2400] - -cpro + +05 +09 +24 + +level - + - + - -05 -09 -24 + +(0, 800] +(800, 1600] +(1600, 2400] crsfacet_03: change crs diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-01-regular.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-01-regular.svg index 4d92735d..271cd787 100644 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-01-regular.svg +++ b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-01-regular.svg @@ -93,20 +93,20 @@ ° W -value - - - - - - - - 500 1000 1500 2000 +value + + + + + + + + crs_01: regular diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-02-w-scale-cont.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-02-w-scale-cont.svg index 7f8b09a4..ed60b6bc 100644 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-02-w-scale-cont.svg +++ b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-02-w-scale-cont.svg @@ -93,20 +93,20 @@ ° W -value - - - - - - - - 500 1000 1500 2000 +value + + + + + + + + crs_02: w/scale cont diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-03-w-scale-breaks.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-03-w-scale-breaks.svg index 4b02875e..51487ab1 100644 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-03-w-scale-breaks.svg +++ b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-03-w-scale-breaks.svg @@ -36,7 +36,7 @@ - + @@ -93,16 +93,16 @@ ° W -value - - - - - + + + + + 500 1000 1500 2000 +value crs_03: w/scale breaks diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-04-w-facets.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-04-w-facets.svg index 7688a141..097408a4 100644 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-04-w-facets.svg +++ b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-04-w-facets.svg @@ -104,20 +104,20 @@ -value - - - - - - - - 500 1000 1500 2000 +value + + + + + + + + crs_04: w/facets diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-05-w-aes.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-05-w-aes.svg index 545a880f..dfb439c1 100644 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-05-w-aes.svg +++ b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-05-w-aes.svg @@ -93,20 +93,20 @@ ° W -value - - - - - - - - 500 1000 1500 2000 +value + + + + + + + + crs_05: w/aes diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-07-resampled.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-07-resampled.svg index cdb25bba..1a03fff9 100644 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-07-resampled.svg +++ b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-07-resampled.svg @@ -93,17 +93,17 @@ ° W -value - - - - - - 900 1200 1500 +value + + + + + + crs_07: resampled diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-08-resampled-interpolated.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-08-resampled-interpolated.svg index 523250e6..a5ec5ffa 100644 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-08-resampled-interpolated.svg +++ b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-08-resampled-interpolated.svg @@ -93,17 +93,17 @@ ° W -value - - - - - - 900 1200 1500 +value + + + + + + crs_08: resampled interpolated diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-09-change-crs.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-09-change-crs.svg index 438c13a9..7a87572b 100644 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-09-change-crs.svg +++ b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-09-change-crs.svg @@ -85,20 +85,20 @@ ° W -value - - - - - - - - 500 1000 1500 2000 +value + + + + + + + + crs_09: change crs diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-10-with-sf.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-10-with-sf.svg index 83e7c507..7ed05472 100644 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-10-with-sf.svg +++ b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-10-with-sf.svg @@ -112,20 +112,20 @@ ° W -value - - - - - - - - 500 1000 1500 2000 +value + + + + + + + + crs_10: With sf diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-11-with-crs-and-sf.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-11-with-crs-and-sf.new.svg deleted file mode 100644 index 78c66131..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-11-with-crs-and-sf.new.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -43 -° -N -44 -° -N -45 -° -N - - - - - - 8 -° -W - 6 -° -W - -value - - - - - - - - - -500 -1000 -1500 -2000 -crs_11: With crs and sf - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-12-with-sf-first.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-12-with-sf-first.new.svg deleted file mode 100644 index 78a0efd9..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-12-with-sf-first.new.svg +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -40 -° -N -41 -° -N -42 -° -N -43 -° -N - - - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -1 -° -W - -value - - - - - - - - - -500 -1000 -1500 -2000 -crs_12: With sf first - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-13-with-sf-first-and-crs.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-13-with-sf-first-and-crs.new.svg deleted file mode 100644 index 0be7f3c2..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-13-with-sf-first-and-crs.new.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -40.0 -° -N -40.5 -° -N -41.0 -° -N -41.5 -° -N -42.0 -° -N -42.5 -° -N -43.0 -° -N - - - - - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - -value - - - - - - - - - -500 -1000 -1500 -2000 -crs_13: With sf first and crs - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-14-suppress-colors-and-overlay.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crs-14-suppress-colors-and-overlay.new.svg deleted file mode 100644 index a8c68d53..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crs-14-suppress-colors-and-overlay.new.svg +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -40.0 -° -N -40.5 -° -N -41.0 -° -N -41.5 -° -N -42.0 -° -N -42.5 -° -N -43.0 -° -N - - - - - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - -value - - - - - - - - - -500 -1000 -1500 -2000 -crs_14: suppress colors and overlay - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crsfacet-01-regular.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crsfacet-01-regular.new.svg deleted file mode 100644 index 600f9587..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crsfacet-01-regular.new.svg +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ES-AV - - - - - - - - - - -ES-BU - - - - - - - - - - -ES-LE - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -40.0 -° -N -40.5 -° -N -41.0 -° -N -41.5 -° -N -42.0 -° -N -42.5 -° -N -43.0 -° -N - - - - - - - - -value - - - - - - - - - -500 -1000 -1500 -2000 -crsfacet_01: regular - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crsfacet-02-color.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crsfacet-02-color.new.svg deleted file mode 100644 index cdb3c8e4..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crsfacet-02-color.new.svg +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ES-AV - - - - - - - - - - -ES-BU - - - - - - - - - - -ES-LE - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -40.0 -° -N -40.5 -° -N -41.0 -° -N -41.5 -° -N -42.0 -° -N -42.5 -° -N -43.0 -° -N - - - - - - - - -value - - - - - - - - - -500 -1000 -1500 -2000 - -cpro - - - - - - -05 -09 -24 -crsfacet_02: color - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/crsfacet-03-change-crs.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/crsfacet-03-change-crs.new.svg deleted file mode 100644 index 1d19bc61..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/crsfacet-03-change-crs.new.svg +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ES-AV - - - - - - - - - - -ES-BU - - - - - - - - - - -ES-LE - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -1 -° -W - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -1 -° -W - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -1 -° -W -40 -° -N -41 -° -N -42 -° -N -43 -° -N - - - - - -value - - - - - - - - - -500 -1000 -1500 -2000 - -cpro - - - - - - -05 -09 -24 -crsfacet_03: change crs - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-01a-regular.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-01a-regular.new.svg deleted file mode 100644 index 17b9f888..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-01a-regular.new.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -40 -41 -42 -43 - - - - - - - - - - --7 --6 --5 --4 --3 --2 - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_01a: regular - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-01b-regular-with-coord-equal.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-01b-regular-with-coord-equal.new.svg deleted file mode 100644 index 72f1d7f5..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-01b-regular-with-coord-equal.new.svg +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -40 -41 -42 -43 - - - - - - - - - - --7 --6 --5 --4 --3 --2 - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_01b: regular with coord_equal - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-02-w-scale-cont.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-02-w-scale-cont.new.svg deleted file mode 100644 index 80063ca6..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-02-w-scale-cont.new.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -40 -41 -42 -43 - - - - - - - - - - --7 --6 --5 --4 --3 --2 - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_02: w/scale cont - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-03-w-scale-breaks.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-03-w-scale-breaks.new.svg deleted file mode 100644 index bd46981c..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-03-w-scale-breaks.new.svg +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -40 -41 -42 -43 - - - - - - - - - - --7 --6 --5 --4 --3 --2 - -value - - - - - -500 -1000 -1500 -2000 -nocrs_03: w/scale breaks - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-04-w-facets.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-04-w-facets.new.svg deleted file mode 100644 index 2c38050d..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-04-w-facets.new.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -elevation_m - - - - - - - - --7 --6 --5 --4 --3 --2 -40 -41 -42 -43 - - - - - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_04: w/facets - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-05-w-aes.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-05-w-aes.new.svg deleted file mode 100644 index 0aae824f..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-05-w-aes.new.svg +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -40 -41 -42 -43 - - - - - - - - - - --7 --6 --5 --4 --3 --2 - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_05: w/aes - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-07-resampled.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-07-resampled.new.svg deleted file mode 100644 index 82e27ca3..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-07-resampled.new.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -40 -41 -42 -43 - - - - - - - - - - --7 --6 --5 --4 --3 --2 - -value - - - - - - - -900 -1200 -1500 -nocrs_07: resampled - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-08-resampled-interpolated.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-08-resampled-interpolated.new.svg deleted file mode 100644 index 2e8bb0f2..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-08-resampled-interpolated.new.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -40 -41 -42 -43 - - - - - - - - - - --7 --6 --5 --4 --3 --2 - -value - - - - - - - -900 -1200 -1500 -nocrs_08: resampled interpolated - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-09-change-crs.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-09-change-crs.new.svg deleted file mode 100644 index e76c3004..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-09-change-crs.new.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -40.0 -° -N -40.5 -° -N -41.0 -° -N -41.5 -° -N -42.0 -° -N -42.5 -° -N -43.0 -° -N - - - - - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_09: change crs - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-10-with-sf.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-10-with-sf.new.svg deleted file mode 100644 index 6d43c347..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-10-with-sf.new.svg +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -15 -° -N -20 -° -N -25 -° -N -30 -° -N - - - - - - - - -30 -° -W -20 -° -W -10 -° -W - 0 -° - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_10: With sf - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-11-with-crs-and-sf.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-11-with-crs-and-sf.new.svg deleted file mode 100644 index 111714c3..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-11-with-crs-and-sf.new.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -40.0 -° -N -40.5 -° -N -41.0 -° -N -41.5 -° -N -42.0 -° -N -42.5 -° -N -43.0 -° -N - - - - - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_11: With crs and sf - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-12-with-sf-reprojected.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-12-with-sf-reprojected.new.svg deleted file mode 100644 index 7b9b9cb4..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-12-with-sf-reprojected.new.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -40.0 -° -N -40.5 -° -N -41.0 -° -N -41.5 -° -N -42.0 -° -N -42.5 -° -N -43.0 -° -N - - - - - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_12: With sf reprojected - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-14-suppress-colors-and-overlay.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-14-suppress-colors-and-overlay.new.svg deleted file mode 100644 index 6a440a71..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr/nocrs-14-suppress-colors-and-overlay.new.svg +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -40 -41 -42 -43 - - - - - - - - - - --7 --6 --5 --4 --3 --2 - -value - - - - - - - - - -500 -1000 -1500 -2000 -nocrs_14: suppress colors and overlay - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crs-08-change-crs.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crs-08-change-crs.new.svg deleted file mode 100644 index 710ac42b..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crs-08-change-crs.new.svg +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -40 -° -N -41 -° -N -42 -° -N -43 -° -N - - - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -1 -° -W - -value - - - - - - - - - - - - - - -Precambric-Paleozoic -Paleozoic -Paleozoic-Mesozoic -Mesozoic -Mesozoic-Cenozoic -Cenozoic -Undetermined -crs_08: change crs - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crs-11-with-sf-first.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crs-11-with-sf-first.new.svg deleted file mode 100644 index b38d46ea..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crs-11-with-sf-first.new.svg +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -40 -° -N -41 -° -N -42 -° -N -43 -° -N - - - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -1 -° -W - -value - - - - - - - - - - - - - - -Precambric-Paleozoic -Paleozoic -Paleozoic-Mesozoic -Mesozoic -Mesozoic-Cenozoic -Cenozoic -Undetermined -crs_11: With sf first - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crsfacet-02-color.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crsfacet-02-color.new.svg deleted file mode 100644 index 2b1d7da3..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crsfacet-02-color.new.svg +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ES-AV - - - - - - - - - - -ES-BU - - - - - - - - - - -ES-LE - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -40.0 -° -N -40.5 -° -N -41.0 -° -N -41.5 -° -N -42.0 -° -N -42.5 -° -N -43.0 -° -N - - - - - - - - -value - - - - - - - - - - - - - - -Precambric-Paleozoic -Paleozoic -Paleozoic-Mesozoic -Mesozoic -Mesozoic-Cenozoic -Cenozoic -Undetermined - -cpro - - - - - - -05 -09 -24 -crsfacet_02: color - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crsfacet-03-change-crs.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crsfacet-03-change-crs.new.svg deleted file mode 100644 index 5efc0622..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/crsfacet-03-change-crs.new.svg +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ES-AV - - - - - - - - - - -ES-BU - - - - - - - - - - -ES-LE - - - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -1 -° -W - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -1 -° -W - - - - - - - -7 -° -W -6 -° -W -5 -° -W -4 -° -W -3 -° -W -2 -° -W -1 -° -W -40 -° -N -41 -° -N -42 -° -N -43 -° -N - - - - - -value - - - - - - - - - - - - - - -Precambric-Paleozoic -Paleozoic -Paleozoic-Mesozoic -Mesozoic -Mesozoic-Cenozoic -Cenozoic -Undetermined - -cpro - - - - - - -05 -09 -24 -crsfacet_03: change crs - - diff --git a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/nocrs-10-with-sf.new.svg b/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/nocrs-10-with-sf.new.svg deleted file mode 100644 index bf618ae2..00000000 --- a/tests/testthat/_snaps/geom_spatraster_1lyr_coltab/nocrs-10-with-sf.new.svg +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -30 -° -N -40 -° -N - - - - - - - -40 -° -W -30 -° -W -20 -° -W -10 -° -W - 0 -° - -value - - - - - - - - - - - - - - -Precambric-Paleozoic -Paleozoic -Paleozoic-Mesozoic -Mesozoic -Mesozoic-Cenozoic -Cenozoic -Undetermined -nocrs_10: With sf - - diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr.md b/tests/testthat/_snaps/geom_spatraster_3lyr.md index 9279def4..37528b4c 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr.md +++ b/tests/testthat/_snaps/geom_spatraster_3lyr.md @@ -24,7 +24,7 @@ Use `aes(fill = )` for displaying single layers Condition Warning: - Computation failed in `stat_terra_spat_raster()`. + Computation failed in `stat_terra_spat_raster()` Caused by error in `reproject_raster_on_stat()`: ! `geom_spatraster_*()` on s with crs must be used with `ggplot2::coord_sf()`. @@ -47,9 +47,6 @@ Mixed layer classes found in `tidyterra::geom_spat*()`. Message ! Plotting only layer "tavg_04", "tavg_05", and "tavg_06" of class - Condition - Warning: - The `scale_name` argument of `continuous_scale()` is deprecated as of ggplot2 3.5.0. --- @@ -61,9 +58,6 @@ Mixed layer classes found in `tidyterra::geom_spat*()`. Message ! Plotting only layer "char" and "char2" of class - Condition - Warning: - The `scale_name` argument of `discrete_scale()` is deprecated as of ggplot2 3.5.0. --- @@ -98,9 +92,6 @@ Mixed layer classes found in `tidyterra::geom_spat*()`. Message ! Plotting only layer "tavg_04", "tavg_05", and "tavg_06" of class - Condition - Warning: - The `scale_name` argument of `continuous_scale()` is deprecated as of ggplot2 3.5.0. --- @@ -112,9 +103,6 @@ Mixed layer classes found in `tidyterra::geom_spat*()`. Message ! Plotting only layer "char" and "char2" of class - Condition - Warning: - The `scale_name` argument of `discrete_scale()` is deprecated as of ggplot2 3.5.0. --- diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-01a-regular-no-facet.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-01a-regular-no-facet.svg index 6b74d66b..893bf863 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-01a-regular-no-facet.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-01a-regular-no-facet.svg @@ -93,20 +93,20 @@ ° W -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_01a: regular no facet diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-01b-regular-facet.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-01b-regular-facet.svg index 8138d99d..d5b185bb 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-01b-regular-facet.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-01b-regular-facet.svg @@ -198,20 +198,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_01b: regular facet diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-02-w-scale-cont.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-02-w-scale-cont.svg index cfef3948..918cfc4a 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-02-w-scale-cont.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-02-w-scale-cont.svg @@ -198,20 +198,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_02: w/scale cont diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-03-w-scale-breaks.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-03-w-scale-breaks.svg index eb71e295..29154322 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-03-w-scale-breaks.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-03-w-scale-breaks.svg @@ -36,7 +36,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -198,16 +198,16 @@ -value - - - - - + + + + + 5 10 15 20 +value crs_03: w/scale breaks diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-04-w-facets.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-04-w-facets.svg index cb7488ed..cfe4414d 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-04-w-facets.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-04-w-facets.svg @@ -198,20 +198,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_04: w/facets diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-05-w-aes.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-05-w-aes.svg index ee124ab9..9f14fd10 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-05-w-aes.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-05-w-aes.svg @@ -104,26 +104,26 @@ -value - - - - - - - - - - - - 6 8 10 12 14 16 +value + + + + + + + + + + + + crs_05: w/aes diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-06b-mixed-with-nums.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-06b-mixed-with-nums.svg index cf9765cb..96cdc00b 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-06b-mixed-with-nums.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-06b-mixed-with-nums.svg @@ -198,20 +198,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_06b: Mixed with nums diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-07-resampled.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-07-resampled.svg index 67395567..e97c2826 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-07-resampled.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-07-resampled.svg @@ -198,17 +198,17 @@ -value - - - - - - 5 10 15 +value + + + + + + crs_07: resampled diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-08-resampled-interpolated.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-08-resampled-interpolated.svg index 264e0fe7..62313df5 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-08-resampled-interpolated.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-08-resampled-interpolated.svg @@ -198,17 +198,17 @@ -value - - - - - - 5 10 15 +value + + + + + + crs_08: resampled interpolated diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-09-change-crs.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-09-change-crs.svg index dda9e0cd..d0118400 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-09-change-crs.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-09-change-crs.svg @@ -134,20 +134,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_09: change crs diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-10-with-sf.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-10-with-sf.svg index 98191496..62ffe388 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-10-with-sf.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-10-with-sf.svg @@ -255,20 +255,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_10: With sf diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-11-with-crs-and-sf.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-11-with-crs-and-sf.svg index d335ea59..2558d823 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-11-with-crs-and-sf.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-11-with-crs-and-sf.svg @@ -191,20 +191,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_11: With crs and sf diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-12-with-sf-first.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-12-with-sf-first.svg index db301983..a22427ea 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-12-with-sf-first.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-12-with-sf-first.svg @@ -255,20 +255,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_12: With sf first diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-13-with-sf-first-and-crs.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-13-with-sf-first-and-crs.svg index 0cf5147d..25c59459 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-13-with-sf-first-and-crs.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-13-with-sf-first-and-crs.svg @@ -191,20 +191,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_13: With sf first and crs diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-14-suppress-colors-and-overlay.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-14-suppress-colors-and-overlay.svg index 1b020e24..9e7cd371 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/crs-14-suppress-colors-and-overlay.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/crs-14-suppress-colors-and-overlay.svg @@ -201,20 +201,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + crs_14: suppress colors and overlay diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01a-regular-no-facet.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01a-regular-no-facet.svg index faa0ef8e..00ce60d0 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01a-regular-no-facet.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01a-regular-no-facet.svg @@ -50,20 +50,20 @@ -3e+05 -2e+05 -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_01a: regular no facet diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01b-regular-facet.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01b-regular-facet.svg index f07e4472..4f3772fa 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01b-regular-facet.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01b-regular-facet.svg @@ -18,7 +18,7 @@ - + @@ -127,20 +127,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_01b: regular facet diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01c-regular-facet-with-coords.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01c-regular-facet-with-coords.svg index 10616829..41292712 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01c-regular-facet-with-coords.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-01c-regular-facet-with-coords.svg @@ -136,20 +136,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_01c: regular facet with coords diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-02-w-scale-cont.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-02-w-scale-cont.svg index a6df9779..3206bcda 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-02-w-scale-cont.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-02-w-scale-cont.svg @@ -18,7 +18,7 @@ - + @@ -127,20 +127,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_02: w/scale cont diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-03-w-scale-breaks.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-03-w-scale-breaks.svg index 10a11cac..ba0770e7 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-03-w-scale-breaks.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-03-w-scale-breaks.svg @@ -18,7 +18,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -127,16 +127,16 @@ -value - - - - - + + + + + 5 10 15 20 +value nocrs_03: w/scale breaks diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-04-w-facets.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-04-w-facets.svg index e97eb96c..5370e6ca 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-04-w-facets.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-04-w-facets.svg @@ -18,7 +18,7 @@ - + @@ -127,20 +127,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_04: w/facets diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-05-w-aes.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-05-w-aes.svg index 284ffae6..97a3fba1 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-05-w-aes.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-05-w-aes.svg @@ -61,26 +61,26 @@ -value - - - - - - - - - - - - 6 8 10 12 14 16 +value + + + + + + + + + + + + nocrs_05: w/aes diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-06a-categ-w-scale-disc.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-06a-categ-w-scale-disc.svg index 87f9e6b8..24cff945 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-06a-categ-w-scale-disc.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-06a-categ-w-scale-disc.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-06b-mixed-with-nums.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-06b-mixed-with-nums.svg index 10edb73d..a634a144 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-06b-mixed-with-nums.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-06b-mixed-with-nums.svg @@ -18,7 +18,7 @@ - + @@ -127,20 +127,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_06b: Mixed with nums diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-07-resampled.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-07-resampled.svg index 9b0072db..85c73945 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-07-resampled.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-07-resampled.svg @@ -18,7 +18,7 @@ - + @@ -127,17 +127,17 @@ -value - - - - - - 5 10 15 +value + + + + + + nocrs_07: resampled diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-08-resampled-interpolated.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-08-resampled-interpolated.svg index 4af8de70..4cebd428 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-08-resampled-interpolated.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-08-resampled-interpolated.svg @@ -18,7 +18,7 @@ - + @@ -127,17 +127,17 @@ -value - - - - - - 5 10 15 +value + + + + + + nocrs_08: resampled interpolated diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-09-change-crs.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-09-change-crs.svg index 271e3983..65d8bb8a 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-09-change-crs.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-09-change-crs.svg @@ -198,20 +198,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_09: change crs diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-10-with-sf.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-10-with-sf.svg index 82c58ec8..fa988144 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-10-with-sf.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-10-with-sf.svg @@ -259,20 +259,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_10: With sf diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-11-with-crs-and-sf.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-11-with-crs-and-sf.svg index 2083afab..7a55c5b6 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-11-with-crs-and-sf.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-11-with-crs-and-sf.svg @@ -255,20 +255,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_11: With crs and sf diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-12-with-sf-reprojected.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-12-with-sf-reprojected.svg index 01dd02f6..c341642d 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-12-with-sf-reprojected.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-12-with-sf-reprojected.svg @@ -255,20 +255,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_12: With sf reprojected diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-14-suppress-colors-and-overlay.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-14-suppress-colors-and-overlay.svg index f551a24e..fd0870d0 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-14-suppress-colors-and-overlay.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-14-suppress-colors-and-overlay.svg @@ -18,7 +18,7 @@ - + @@ -130,20 +130,20 @@ -value - - - - - - - - 5 10 15 20 +value + + + + + + + + nocrs_14: suppress colors and overlay diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-14-suppress-colors.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-14-suppress-colors.svg index e3636271..4ac1431c 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-14-suppress-colors.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-14-suppress-colors.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-15-stat-works.svg b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-15-stat-works.svg index 12c89815..c34c42ac 100644 --- a/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-15-stat-works.svg +++ b/tests/testthat/_snaps/geom_spatraster_3lyr/nocrs-15-stat-works.svg @@ -18,7 +18,7 @@ - + diff --git a/tests/testthat/_snaps/geom_spatraster_3lyr_coltab.new.md b/tests/testthat/_snaps/geom_spatraster_3lyr_coltab.new.md deleted file mode 100644 index 5ea6e6cd..00000000 --- a/tests/testthat/_snaps/geom_spatraster_3lyr_coltab.new.md +++ /dev/null @@ -1,38 +0,0 @@ -# geom_spatraster several layer with CRS - - Code - pp <- ggplot2::ggplot_build(p) - Message - ! `tidyterra::geom_spatraster()`: Plotting 3 overlapping layers: cut1, cut2, and cut3. Either: - Use `facet_wrap(~lyr)` for faceting or - Use `aes(fill = )` for displaying single layers - ---- - - Code - p_cats <- ggplot() + geom_spatraster(data = r) + facet_wrap(~lyr) + - scale_fill_terrain_d() - Condition - Warning: - The `scale_name` argument of `discrete_scale()` is deprecated as of ggplot2 3.5.0. - Message - Scale for fill is already present. - Adding another scale for fill, which will replace the existing scale. - ---- - - Code - pmix1 <- ggplot() + geom_spatraster(data = r_mix1) + facet_wrap(~lyr) - Condition - Warning: - Mixed layer classes found in `tidyterra::geom_spat*()`. - Message - ! Plotting only layer "cut1", "cut2", and "cut3" of class - ---- - - Code - p_res <- ggplot() + geom_spatraster(data = r, maxcell = 20) + facet_wrap(~lyr) - Message - resampled to 24 cells for plotting - diff --git a/tests/testthat/test-as_sf.R b/tests/testthat/test-as_sf.R index f1a2a01b..809190e3 100644 --- a/tests/testthat/test-as_sf.R +++ b/tests/testthat/test-as_sf.R @@ -67,7 +67,8 @@ test_that("Coercion to rowwise sf works", { test_that("Coercion to rowwise sf works with names creating groups", { - skip("See issue #124") + skip_on_cran() + f <- system.file("extdata/cyl.gpkg", package = "tidyterra") v <- terra::vect(f) v$gr <- c("C", "A", "A", "B", "A", "B", "B", "C", "A") @@ -83,9 +84,19 @@ test_that("Coercion to rowwise sf works with names creating groups", { # Should be the same as sf2 <- sf::read_sf(f) sf2$gr <- c("C", "A", "A", "B", "A", "B", "B", "C", "A") - rwise <- dplyr::rowwise(sf2, gr) %>% summarise(a = dplyr::n()) + rwise <- dplyr::rowwise(sf2, gr) %>% + summarise( + a = dplyr::n(), + dplyr::across(geom, sf::st_union) + ) + expect_s3_class(rwise, "sf") expect_s3_class(rwise, "grouped_df") - expect_identical(dplyr::group_indices(as_sf), dplyr::group_indices(rwise)) - expect_identical(dplyr::group_vars(as_sf), dplyr::group_vars(rwise)) + expect_identical( + dplyr::group_indices(as_sf), + dplyr::group_indices(rwise) + ) + expect_identical( + dplyr::group_vars(as_sf), dplyr::group_vars(rwise) + ) }) diff --git a/tests/testthat/test-as_spatvector.R b/tests/testthat/test-as_spatvector.R index 077a3db4..4308c3e8 100644 --- a/tests/testthat/test-as_spatvector.R +++ b/tests/testthat/test-as_spatvector.R @@ -204,7 +204,8 @@ test_that("Works with unnamed rowwise_df", { expect_identical(gr, tbl_regen) }) test_that("Works with sf", { - skip("Review in > 0.5.1") + skip_on_cran() + sfobj <- sf::read_sf(system.file("extdata/cyl.gpkg", package = "tidyterra")) expect_s3_class(sfobj, "sf") diff --git a/vignettes/aggregate-1.png b/vignettes/aggregate-1.png index d16547ef..29434101 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 eac49798..c3885285 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 3870ac0d..845043be 100644 Binary files a/vignettes/contourfilled-1.png and b/vignettes/contourfilled-1.png differ diff --git a/vignettes/lux_ggplot-1.png b/vignettes/lux_ggplot-1.png index fa73e0de..9c3d4a1b 100644 Binary files a/vignettes/lux_ggplot-1.png and b/vignettes/lux_ggplot-1.png differ diff --git a/vignettes/spatraster-example1-1.png b/vignettes/spatraster-example1-1.png index 28680c7c..8546eb4a 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 8c8f848f..bb2911e4 100644 Binary files a/vignettes/spatraster-example2-1.png and b/vignettes/spatraster-example2-1.png differ diff --git a/vignettes/tidyterra.Rmd b/vignettes/tidyterra.Rmd index ec40c0e3..d5a17cd3 100644 --- a/vignettes/tidyterra.Rmd +++ b/vignettes/tidyterra.Rmd @@ -26,6 +26,9 @@ vignette: > %\VignetteEncoding{UTF-8} --- + + + [![DOI](https://joss.theoj.org/papers/10.21105/joss.05751/status.svg)](https://doi.org/10.21105/joss.05751) diff --git a/vignettes/tidyterra.Rmd.orig b/vignettes/tidyterra.Rmd.orig index d4cff2e2..6897b89a 100644 --- a/vignettes/tidyterra.Rmd.orig +++ b/vignettes/tidyterra.Rmd.orig @@ -26,6 +26,9 @@ vignette: > %\VignetteEncoding{UTF-8} --- + + + ```{r setup, include = FALSE} knitr::opts_chunk$set( collapse = TRUE,