Allow multiple parameter/country/city/location inputs

numbats · May 29, 2024 · 3977413 · 3977413
1 parent a12ecaa
commit 3977413
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/R/client.R b/R/client.R
@@ -35,7 +35,17 @@ get_measurements_for_location <- function(
 
     attr(date_from, "tzone") <- "UTC"
     attr(date_to, "tzone") <- "UTC"
+
+    country <- restify_vector(country)
+    city <- restify_vector(city)
+    location <- restify_vector(location)
 
+    additional_args <- list(...)
+    parsed_args <- lapply(seq_along(additional_args), function(i) {
+        restify_vector(input = additional_args[[i]], name = names(additional_args)[i])
+    })
+    names(parsed_args) <- names(additional_args)
+
     query_params <- list(
         country = country,
         city = city,
@@ -46,8 +56,7 @@ get_measurements_for_location <- function(
         limit = as.character(max_observations)
     )
 
-    query_params <- modifyList(query_params, list(...))
-
+    query_params <- modifyList(query_params, parsed_args)
     api_response <- run_query(
         endpoint_name = "measurements",
         query_params = query_params

diff --git a/R/util.R b/R/util.R
@@ -0,0 +1,8 @@
+restify_vector <- function(input, name = NULL) {
+    if (is.null(name)) {
+        name <- deparse(substitute(input))
+    }
+    string <- paste0("&", name, "=")
+
+    paste0(input, collapse=string)
+}
diff --git a/example/example1.R b/example/example1.R
@@ -24,4 +24,4 @@ tb <- get_measures(qr)
 unique(tb$parameter)
 nrow(tb)
 
-a <- get_measurements_for_location(country = "AU", city = "Melbourne", location = "Footscray", max_observations = 100, date_from = lubridate::ymd("2024-05-24"), parameter = "pm10")
+a <- get_measurements_for_location(country = "AU", city = "Melbourne", location = "Footscray", max_observations = 100, date_from = lubridate::ymd("2024-05-24"), parameter = c("pm10", "pm25"))