From d068380f8693dc95210be25b178667235bbe370f Mon Sep 17 00:00:00 2001 From: hillarymarler Date: Thu, 22 Feb 2024 08:14:55 -0500 Subject: [PATCH 1/2] Update DataDiscoveryRetrieval.R Added code (from TADA_BigDataRetrieval) to substitute multiple state codes --- R/DataDiscoveryRetrieval.R | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/R/DataDiscoveryRetrieval.R b/R/DataDiscoveryRetrieval.R index e75fb4bb..87de6071 100644 --- a/R/DataDiscoveryRetrieval.R +++ b/R/DataDiscoveryRetrieval.R @@ -160,12 +160,21 @@ TADA_DataRetrieval <- function(startDate = "null", project = "null", providers = "null", applyautoclean = TRUE) { - # Set query parameters + + # Set query parameters WQPquery <- list() - if (length(statecode) > 1) { - WQPquery <- c(WQPquery, statecode = list(statecode)) - } else if (statecode != "null") { - WQPquery <- c(WQPquery, statecode = statecode) + + if (!"null" %in% statecode) { + load(system.file("extdata", "statecodes_df.Rdata", package = "TADA")) + statecode <- as.character(statecode) + statecodes_sub <- statecodes_df %>% dplyr::filter(STUSAB %in% statecode) + statecd <- paste0("US:", statecodes_sub$STATE) + if (nrow(statecodes_sub) == 0) { + stop("State code is not valid. Check FIPS state/territory abbreviations.") + } + if (length(statecode) > 1) { + WQPquery <- c(WQPquery, statecode = statecd) + } } if (length(huc) > 1) { From c8b4904db5e89f68e250a9bd137498a73683e916 Mon Sep 17 00:00:00 2001 From: hillarymarler Date: Thu, 22 Feb 2024 08:43:57 -0500 Subject: [PATCH 2/2] Update DataDiscoveryRetrieval.R update state code list --- R/DataDiscoveryRetrieval.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/DataDiscoveryRetrieval.R b/R/DataDiscoveryRetrieval.R index 87de6071..3194ee0f 100644 --- a/R/DataDiscoveryRetrieval.R +++ b/R/DataDiscoveryRetrieval.R @@ -172,8 +172,8 @@ TADA_DataRetrieval <- function(startDate = "null", if (nrow(statecodes_sub) == 0) { stop("State code is not valid. Check FIPS state/territory abbreviations.") } - if (length(statecode) > 1) { - WQPquery <- c(WQPquery, statecode = statecd) + if (length(statecode) >= 1) { + WQPquery <- c(WQPquery, statecode = list(statecd)) } }