Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
475 changes: 1 addition & 474 deletions CITATION.cff

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: getRad
Title: Download Radar Data for Biological Research
Version: 0.2.4.9000
Version: 0.3.0.9000
Authors@R: c(
person("Bart", "Kranstauber", , "b.kranstauber@uva.nl", role = c("aut", "cre"),
comment = c(ORCID = "0000-0001-8303-780X", affiliation = "University of Amsterdam")),
Expand Down
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# getRad (development version)

# getRad 0.3.0

* Implement download of `vpts` data from birdcast by Alexander Tedeschi.
* Implement reading aloft `vpts` data from a local directory (#135).
* Implement reading dark ecology `vpts` data from a local directory (#175).
Expand Down
4 changes: 2 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ for (i in names(vpts_list)) {

## Meta

- We welcome [contributions](.github/CONTRIBUTING.md) including bug reports.
- We welcome [contributions](https://aloftdata.github.io/getRad/CONTRIBUTING.html) including bug reports.
- License: MIT
- Get citation information for getRad in R with `citation("getRad")`.
- Please note that this project is released with a [Contributor Code of Conduct](.github/CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms.
- Please note that this project is released with a [Contributor Code of Conduct](https://aloftdata.github.io/getRad/CODE_OF_CONDUCT.html). By participating in this project you agree to abide by its terms.
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,11 @@ for (i in names(vpts_list)) {

## Meta

- We welcome [contributions](.github/CONTRIBUTING.md) including bug
reports.
- We welcome
[contributions](https://aloftdata.github.io/getRad/CONTRIBUTING.html)
including bug reports.
- License: MIT
- Get citation information for getRad in R with `citation("getRad")`.
- Please note that this project is released with a [Contributor Code of
Conduct](.github/CODE_OF_CONDUCT.md). By participating in this project
you agree to abide by its terms.
Conduct](https://aloftdata.github.io/getRad/CODE_OF_CONDUCT.html). By
participating in this project you agree to abide by its terms.
16 changes: 14 additions & 2 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"codeRepository": "https://github.com/aloftdata/getRad",
"issueTracker": "https://github.com/aloftdata/getRad/issues",
"license": "https://spdx.org/licenses/MIT",
"version": "0.2.4",
"version": "0.3.0",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
Expand Down Expand Up @@ -106,6 +106,18 @@
},
"sameAs": "https://CRAN.R-project.org/package=askpass"
},
{
"@type": "SoftwareApplication",
"identifier": "fs",
"name": "fs",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
"name": "Comprehensive R Archive Network (CRAN)",
"url": "https://cran.r-project.org"
},
"sameAs": "https://CRAN.R-project.org/package=fs"
},
{
"@type": "SoftwareApplication",
"identifier": "htmltools",
Expand Down Expand Up @@ -418,7 +430,7 @@
},
"SystemRequirements": null
},
"fileSize": "3693.219KB",
"fileSize": "3733.532KB",
"releaseNotes": "https://github.com/aloftdata/getRad/blob/main/NEWS.md",
"readme": "https://github.com/aloftdata/getRad/blob/main/README.md",
"contIntegration": ["https://github.com/aloftdata/getRad/actions/workflows/R-CMD-check.yaml", "https://app.codecov.io/gh/aloftdata/getRad/", "https://github.com/aloftdata/getRad/actions/workflows/regular-checks.yaml"],
Expand Down
8 changes: 4 additions & 4 deletions tests/testthat/test-get_pvol.R
Original file line number Diff line number Diff line change
Expand Up @@ -167,19 +167,19 @@ test_that("Mixed radar vector + 9 minute interval", {
})
test_that("get_pvol handles NA", {
expect_error(
get_pvol(radar = "nlhrw", datetime = NA_POSIXct_),
get_pvol(radar = "nlhrw", datetime = lubridate::NA_POSIXct_),
class = "getRad_error_time_na"
)
expect_error(
get_pvol(radar = "fianj", datetime = NA_POSIXct_),
get_pvol(radar = "fianj", datetime = lubridate::NA_POSIXct_),
class = "getRad_error_time_na"
)
expect_error(
get_pvol(
radar = "deess",
datetime = lubridate::interval(
structure(1781179785.67152, class = c("POSIXct", "POSIXt")),
NA_POSIXct_
lubridate::NA_POSIXct_
)
),
class = "getRad_error_time_na"
Expand All @@ -189,7 +189,7 @@ test_that("get_pvol handles NA", {
radar = "czska",
datetime = c(
structure(1781179785, class = c("POSIXct", "POSIXt")),
NA_POSIXct_
lubridate::NA_POSIXct_
)
),
class = "getRad_error_time_na"
Expand Down
1 change: 1 addition & 0 deletions tests/testthat/test-get_pvol_at.R
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ test_that("Pvol for hochficht in austria can be downloaded", {
)
})
test_that("hochficht can be combined with other radars", {
skip_if_offline("public.hub.geosphere.at")
suppressMessages(expect_type(
pvol_lst <- get_pvol(
c("depro", "hochficht", "KABX"),
Expand Down
5 changes: 4 additions & 1 deletion tests/testthat/test-get_pvol_nl.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
test_that("Pvol for the Netherlands can be downloaded", {
skip_if(Sys.which("KNMI_vol_h5_to_ODIM_h5") == "")
skip_if(
Sys.which("KNMI_vol_h5_to_ODIM_h5") == "",
message = "No local converter for Dutch data installed. As a consequence loading can't be tested."
)
skip_if_offline(host = "api.dataplatform.knmi.nl")

# First see if a key can be retrieved if not make sure env is used as a keyring backend
Expand Down
5 changes: 4 additions & 1 deletion tests/testthat/test-get_vpts_local_dark_ecology.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
dk_path <- system.file("extdata", "darkecology", package = "getRad")

skip_if(dk_path == "")
skip_if(
dk_path == "",
message = "No local data present for testing local read from dark ecology."
)
test_that("get_vpts_dark_ecology() returns error on invalid odim code", {
expect_error(
get_vpts(
Expand Down
Loading