Skip to content

Commit 60ed985

Browse files
committed
Merge branch 'master' into fix_download_pvolfiles
2 parents 56902fc + 0c017fe commit 60ed985

File tree

8 files changed

+21
-14
lines changed

8 files changed

+21
-14
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: bioRad
22
Title: Biological Analysis and Visualization of Weather Radar Data
3-
Version: 0.9.0.9000
3+
Version: 0.9.1.9000
44
Description: Extract, visualize and summarize aerial movements of birds and
55
insects from weather radar data. See Dokter, A. M. et al. (2018)
66
"bioRad: biological analysis and visualization of weather radar data" <doi:10.1111/ecog.04028>
@@ -26,7 +26,7 @@ URL: https://github.com/adokter/bioRad/, https://adriaandokter.com/bioRad/
2626
BugReports: https://github.com/adokter/bioRad/issues
2727
biocViews:
2828
Depends:
29-
R (>= 3.5.0)
29+
R (>= 4.0.0)
3030
Imports:
3131
assertthat,
3232
curl,

NEWS.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
# bioRad 0.9.0.9000
1+
# bioRad 0.9.1.9000
22

33
* new argument `directory_tree` in function `download_pvolfiles()` for ommitting local directory tree (#710).
44

5+
# bioRad 0.9.1
6+
7+
* new argument `cachedir` in `map()` to set the location of the cache used by dependency package `ggspatial` (#708)
8+
59
# bioRad 0.9.0
610
## new features
711

R/map.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#' @param palette Character vector. Hexadecimal color values defining the plot
2222
#' color scale, e.g. output from [viridisLite::viridis()].
2323
#' @param zoomin Numeric. Maps to [ggspatial::annotation_map_tile()]
24+
#' @param cachedir Character. Maps to [ggspatial::annotation_map_tile()], defaults to
25+
#' `tools::R_user_dir("bioRad")`
2426
#' @param ... Arguments passed to [ggplot2::ggplot()].
2527
#' @importFrom methods as
2628
#' @return A ggplot object
@@ -82,7 +84,7 @@ map <- function(x, ...) {
8284
#' @export
8385
map.ppi <- function(x, map="cartolight", param, alpha = 0.7, xlim, ylim, zlim = c(-20, 20),
8486
ratio, radar_size = 3, radar_color = "#202020", n_color = 1000,
85-
palette = NA, zoomin = -2, ...) {
87+
palette = NA, zoomin = -2, cachedir = tools::R_user_dir("bioRad"), ...) {
8688

8789
stopifnot(inherits(x, "ppi"))
8890

@@ -249,7 +251,7 @@ map.ppi <- function(x, map="cartolight", param, alpha = 0.7, xlim, ylim, zlim =
249251

250252
mymap <-
251253
ggplot2::ggplot() +
252-
ggspatial::annotation_map_tile(type = map, zoomin = zoomin, cachedir=system.file("rosm.cache", package = "ggspatial")) +
254+
ggspatial::annotation_map_tile(type = map, zoomin = zoomin, cachedir = cachedir) +
253255
ggplot2::coord_sf(xlim = projected_xlim, ylim = projected_ylim, expand=FALSE) +
254256
ggplot2::geom_raster(data = rdf, ggplot2::aes(x = x, y = y, fill = fill), na.rm = TRUE, interpolate = FALSE) +
255257
ggplot2::scale_fill_identity(na.value = "transparent") +

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Then load the package with:
102102

103103
``` r
104104
library(bioRad)
105-
#> Welcome to bioRad version 0.9.0
105+
#> Welcome to bioRad version 0.9.1
106106
#> using vol2birdR version 1.0.9 (MistNet installed)
107107
```
108108

codemeta.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"codeRepository": "https://github.com/adokter/bioRad/",
99
"issueTracker": "https://github.com/adokter/bioRad/issues",
1010
"license": "https://spdx.org/licenses/MIT",
11-
"version": "0.9.0",
11+
"version": "0.9.1",
1212
"programmingLanguage": {
1313
"@type": "ComputerLanguage",
1414
"name": "R",
@@ -247,7 +247,7 @@
247247
"@type": "SoftwareApplication",
248248
"identifier": "R",
249249
"name": "R",
250-
"version": ">= 3.5.0"
250+
"version": ">= 4.0.0"
251251
},
252252
"2": {
253253
"@type": "SoftwareApplication",
@@ -524,7 +524,7 @@
524524
},
525525
"SystemRequirements": null
526526
},
527-
"fileSize": "4943.786KB",
527+
"fileSize": "4943.736KB",
528528
"citation": [
529529
{
530530
"@type": "ScholarlyArticle",

cran-comments.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
## bioRad 0.9.0
2-
various bugfixes and introduction of three new functions:
3-
* `as.vp()` to convert data.frame to vertical profile object
4-
* `clean_mixture(`) for partitioning bird and insect mixtures
5-
* `filter_precip()` for posthoc rain filtering
1+
## bioRad 0.9.1
2+
make location of the cache used by package dependency ggspatial complient with CRAN policies.

man/figures/README-plot_ppi-1.png

-18 Bytes
Loading

man/map.Rd

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)