Merge pull request #842 from ldecicco-USGS/develop

Develop

Author: ldecicco-USGS

R/construct_api_requests.R

@@ -436,7 +436,8 @@ basic_request <- function(url_base, format = "json"){
     httr2::req_headers(`Accept-Encoding` = c("compress", "gzip")) |> 
     httr2::req_url_query(f = format,
                          lang = "en-US") |> 
-    httr2::req_error(body = error_body) 
+    httr2::req_error(body = error_body) |> 
+    httr2::req_timeout(seconds = 180)
 
   token <- Sys.getenv("API_USGS_PAT")
 

R/get_ogc_data.R

@@ -32,6 +32,8 @@ get_ogc_data <- function(args,
     no_paging <- FALSE
   }
 
+  message("Requesting:\n", req$url)
+  
   if(no_paging){
     return_list <- get_csv(req, limit = args[["limit"]])
   } else {

R/read_waterdata_ts_meta.R

@@ -11,15 +11,17 @@
 #' @param computation_period_identifier `r get_params("time-series-metadata")$computation_period_identifier`
 #' @param sublocation_identifier `r get_params("time-series-metadata")$sublocation_identifier`
 #' @param last_modified `r get_params("time-series-metadata")$last_modified`
-#' @param begin `r get_params("time-series-metadata")$begin`
-#' @param end `r get_params("time-series-metadata")$end`
+#' @param begin_utc `r get_params("time-series-metadata")$begin_utc`
+#' @param end_utc `r get_params("time-series-metadata")$end_utc`
 #' @param hydrologic_unit_code `r get_params("time-series-metadata")$hydrologic_unit_code`
 #' @param state_name `r get_params("time-series-metadata")$state_name`
 #' @param thresholds `r get_params("time-series-metadata")$thresholds`
 #' @param unit_of_measure `r get_params("time-series-metadata")$unit_of_measure`
 #' @param primary `r get_params("time-series-metadata")$primary`
 #' @param parent_time_series_id `r get_params("time-series-metadata")$parent_time_series_id`
 #' @param web_description `r get_params("time-series-metadata")$web_description`
+#' @param begin `r get_params("time-series-metadata")$begin`
+#' @param end `r get_params("time-series-metadata")$end`
 #' @param properties A vector of requested columns to be returned from the query.
 #' Available options are: 
 #' `r dataRetrieval:::get_properties_for_docs("time-series-metadata", "time_series_id")`.
@@ -58,8 +60,8 @@
 #'                             parameter_code = c("00060", "00010"),
 #'                             properties = c("monitoring_location_id",
 #'                                            "parameter_code",
-#'                                            "begin",
-#'                                            "end",
+#'                                            "begin_utc",
+#'                                            "end_utc",
 #'                                            "time_series_id"),
 #'                             skipGeometry = TRUE)
 #'                             
@@ -71,8 +73,8 @@ read_waterdata_ts_meta <- function(monitoring_location_id = NA_character_,
                               properties = NA_character_,
                               statistic_id = NA_character_,
                               last_modified = NA_character_,
-                              begin = NA_character_,
-                              end = NA_character_,
+                              begin_utc = NA_character_,
+                              end_utc = NA_character_,
                               hydrologic_unit_code = NA_character_,
                               state_name = NA_character_,
                               unit_of_measure = NA_character_,
@@ -88,6 +90,8 @@ read_waterdata_ts_meta <- function(monitoring_location_id = NA_character_,
                               limit = NA,
                               max_results = NA,
                               bbox = NA,
+                              begin = NA_character_,
+                              end = NA_character_,
                               convertType = TRUE,
                               no_paging = FALSE){
 

R/walk_pages.R

@@ -5,20 +5,11 @@
 #' @noRd
 #' @return data.frame with attributes
 walk_pages <- function(req){
-  
-  message("Requesting:\n", req$url)
 
   resps <- httr2::req_perform_iterative(req, 
                                         next_req = next_req_url, 
-                                        max_reqs = Inf, on_error = "return")
-  failures <- resps |>
-    httr2::resps_failures() |>
-    httr2::resps_requests()
-  
-  if(length(failures) > 0){
-    stop(resps[[1]][["message"]])
-  }
-  
+                                        max_reqs = Inf, on_error = "stop")
+
   return_list <- data.frame()
   for(resp in resps){
     df1 <- get_resp_data(resp)
@@ -105,7 +96,6 @@ next_req_url <- function(resp, req) {
 
 get_csv <- function(req, limit){
 
-  message("Requesting:\n", req$url)
   skip_geo <- grepl("skipGeometry=true", req$url, ignore.case = TRUE)
   resp <- httr2::req_perform(req)