Realized if a NA gets in a "comma parameter", it was removing that query altogether, causing WAY more data to be returned than intended.

Author: ldecicco-USGS

R/construct_api_requests.R

@@ -64,15 +64,20 @@ construct_api_requests <- function(service,
     warning("No filtering arguments specified.")
   }
   # Figure out if the GET request will be > 2048 characters
-  comma_params_filtered <- Filter(Negate(anyNA), full_list[comma_params])
-
+  # and remove NA's from the comma parameters
+  comma_params_filtered <- Filter(Negate(anyNA), lapply(full_list[comma_params], function(x) x[!is.na(x)]))
+  comma_params_filtered <- comma_params_filtered[!sapply(comma_params_filtered,is.null)]
+  
+  single_params_filtered <- Filter(Negate(anyNA), full_list[single_params])
+  single_params_filtered <- single_params_filtered[!sapply(single_params_filtered,is.null)]
+  
   force_post <- nchar(paste0(unlist(comma_params_filtered), collapse = ",")) > 2048
 
   if(force_post){
-    get_list <- full_list[names(full_list) %in% c(single_params)]
+    get_list <- single_params_filtered
   } else {
     # GET list refers to arguments that will go in the URL no matter what (not POST)
-    get_list <- full_list[names(full_list) %in% c(single_params, comma_params)]    
+    get_list <- c(single_params_filtered, comma_params_filtered)    
   }
 
   get_list[["skipGeometry"]] <- skipGeometry

tests/testthat/tests_userFriendly_fxns.R

@@ -463,6 +463,10 @@ test_that("pCode Stuff", {
   expect_equal(nrow(paramINFO), 3)
   expect_true(all(paramINFO$parameter_code %in% c("00060", "01075", "00931")))
 
+  paramINFO <- read_waterdata_parameter_codes(parameter_code = c("00060", "01075", "00931", NA))
+  expect_equal(nrow(paramINFO), 3)
+  expect_true(all(paramINFO$parameter_code %in% c("00060", "01075", "00931")))
+  
   # pcode 12345 isn't a valid code:
   paramINFO <- read_waterdata_parameter_codes(c("12345"))
   expect_true(nrow(paramINFO) == 0)