Skip to content

Commit 65a3736

Browse files
committed
feat+test+docs+build: fetch by default
1 parent 3db0081 commit 65a3736

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+775
-384
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ env
1616
/doc/
1717
/Meta/
1818
.secrets
19+
epidatr.Rproj

NAMESPACE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export(dengue_nowcast)
1717
export(ecdc_ili)
1818
export(epirange)
1919
export(fetch)
20+
export(fetch_args_list)
2021
export(flusurv)
2122
export(fluview)
2223
export(fluview_clinical)
@@ -38,11 +39,12 @@ export(pvt_quidel)
3839
export(pvt_sensors)
3940
export(pvt_twitter)
4041
export(wiki)
41-
export(with_base_url)
4242
importFrom(MMWRweek,MMWRweek2Date)
4343
importFrom(checkmate,assert)
4444
importFrom(checkmate,assert_character)
4545
importFrom(checkmate,assert_integerish)
46+
importFrom(checkmate,assert_logical)
47+
importFrom(checkmate,assert_numeric)
4648
importFrom(checkmate,check_character)
4749
importFrom(checkmate,check_class)
4850
importFrom(checkmate,check_date)

R/covidcast.R

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ parse_signal <- function(signal, base_url) {
66
#'
77
#' @param data_source data source to fetch
88
#' @param signals data source to fetch
9-
#' @param time_type data source to fetch
10-
#' @param time_values data source to fetch
119
#' @param geo_type geo_type to fetch
10+
#' @param time_type data source to fetch
1211
#' @param geo_values data source to fetch
12+
#' @param time_values data source to fetch
1313
#' @param as_of data source to fetch
1414
#' @param issues data source to fetch
1515
#' @param lag data source to fetch
@@ -18,13 +18,24 @@ parse_signal <- function(signal, base_url) {
1818
signal$call <- function(geo_type,
1919
geo_values,
2020
time_values,
21-
...) {
22-
epicall <- covidcast(
23-
signal$source, signal$signal, geo_type, signal$time_type,
24-
geo_values, time_values, ...
21+
as_of = NULL,
22+
issues = NULL,
23+
lag = NULL,
24+
fetch_args = fetch_args_list()) {
25+
stopifnot(is.character(geo_type) & length(geo_type) == 1)
26+
27+
covidcast(
28+
source = signal$source,
29+
signals = signal$signal,
30+
geo_type = geo_type,
31+
time_type = signal$time_type,
32+
geo_values = geo_values,
33+
time_values = time_values,
34+
as_of = as_of,
35+
issues = issues,
36+
lag = lag,
37+
fetch_args = fetch_args
2538
)
26-
epicall$base_url <- base_url
27-
epicall
2839
}
2940
r <- list()
3041
r[[signal$signal]] <- signal

0 commit comments

Comments
 (0)