From d193261f6bff3a9021663737bfc3225f5d5894ee Mon Sep 17 00:00:00 2001 From: hillarymarler <152432687+hillarymarler@users.noreply.github.com> Date: Tue, 18 Aug 2026 17:47:25 -0400 Subject: [PATCH 1/3] Bug fix for use_class in domain values --- R/EQ_DomainValues.R | 4 ++-- inst/extdata/EQParamsCrosswalk.csv | 2 +- man/EQ_DomainValues.Rd | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/R/EQ_DomainValues.R b/R/EQ_DomainValues.R index ab4c2c6..e37cdcf 100644 --- a/R/EQ_DomainValues.R +++ b/R/EQ_DomainValues.R @@ -19,8 +19,8 @@ #' param_attain (Parameter Attainment), param_group (Parameter Group), param_name #' (Parameter Name), param_state_ir_code (Parameter State Integrated Report Code), #' param_status (Parameter Status), source_scale (Source Scale), source_type (Source -#' Type), statecode (State), use_name (Use Name), use_support (Use Support), and -#' water_type (Water Type). +#' Type), statecode (State), use_name (Use Name), use_class (Use Class), use_support +#' (Use Support), and water_type (Water Type). #' #' Default is NULL. When param = NULL, the df returned will list all domains for #' which an allowable list of values can be returned from ATTAINS web services. diff --git a/inst/extdata/EQParamsCrosswalk.csv b/inst/extdata/EQParamsCrosswalk.csv index 872aa05..c91dad4 100644 --- a/inst/extdata/EQParamsCrosswalk.csv +++ b/inst/extdata/EQParamsCrosswalk.csv @@ -90,7 +90,7 @@ tmdl_cycle_hi,cycleScheduledForTmdlHi,,,no,no,yes,no,no,no,no,no tmdl_cycle_lo,cycleScheduledForTmdlLo,,,no,no,yes,no,no,no,no,no tmdl_date_end,tmdlDateHi,,,no,yes,no,no,no,no,no,yes tmdl_date_start,tmdlDateLo,,,no,yes,no,no,no,no,no,yes -use_class,useClassName,,,no,no,yes,yes,yes,no,no,no +use_class,useClassName,UseClassUse,name,no,no,yes,yes,yes,no,no,no use_group,useGroup,,,no,no,yes,no,no,no,no,no use_ir_cat,useIrCategory,,,no,no,yes,no,no,no,no,no use_name,useName,UseName,name,no,no,yes,no,no,no,no,no diff --git a/man/EQ_DomainValues.Rd b/man/EQ_DomainValues.Rd index e80ea67..ab7892a 100644 --- a/man/EQ_DomainValues.Rd +++ b/man/EQ_DomainValues.Rd @@ -23,8 +23,8 @@ Status Indicator), cause (Cause Name), delist_reason (Delisting Reason), doc_typ param_attain (Parameter Attainment), param_group (Parameter Group), param_name (Parameter Name), param_state_ir_code (Parameter State Integrated Report Code), param_status (Parameter Status), source_scale (Source Scale), source_type (Source -Type), statecode (State), use_name (Use Name), use_support (Use Support), and -water_type (Water Type). +Type), statecode (State), use_name (Use Name), use_class (Use Class), use_support +(Use Support), and water_type (Water Type). Default is NULL. When param = NULL, the df returned will list all domains for which an allowable list of values can be returned from ATTAINS web services. From 1d672266c22c2ca8a940227806935e8fc97d710e Mon Sep 17 00:00:00 2001 From: hillarymarler <152432687+hillarymarler@users.noreply.github.com> Date: Wed, 19 Aug 2026 09:19:54 -0400 Subject: [PATCH 2/3] Update EQ_HelperFunctions.R fix filter bug in helper function --- R/EQ_HelperFunctions.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/R/EQ_HelperFunctions.R b/R/EQ_HelperFunctions.R index 2b7f0ad..eb3026f 100644 --- a/R/EQ_HelperFunctions.R +++ b/R/EQ_HelperFunctions.R @@ -26,8 +26,7 @@ EQ_ExtractParams <- function(extract = NULL) { params.cw <- readr::read_csv(system.file("extdata", "EQParamsCrosswalk.csv", package = "rExpertQuery" ), show_col_types = FALSE) |> - dplyr::filter(get(extract.filter) == "yes") |> - # dplyr::filter(.data[[extract.filter]] == "yes") |> + dplyr::filter(!!rlang::sym(extract.filter) == "yes") |> dplyr::select("param", "eq_name") # return the crosswalk From 3bf64fc965ae93b844c403d3e06493182e7d8769 Mon Sep 17 00:00:00 2001 From: hillarymarler <152432687+hillarymarler@users.noreply.github.com> Date: Wed, 19 Aug 2026 09:33:55 -0400 Subject: [PATCH 3/3] Update CybertownTraining.Rmd --- vignettes/CybertownTraining.Rmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vignettes/CybertownTraining.Rmd b/vignettes/CybertownTraining.Rmd index 578aba2..5cbef0e 100644 --- a/vignettes/CybertownTraining.Rmd +++ b/vignettes/CybertownTraining.Rmd @@ -90,7 +90,7 @@ if (!"remotes" %in% installed.packages()) { install.packages("remotes") } -remotes::install_github("USEPA/rExpertQuery", ref = "develop", dependencies = TRUE, force = TRUE) +remotes::install_github("USEPA/rExpertQuery", ref = "add_useclasuse_domainvals", dependencies = TRUE, force = TRUE) library(rExpertQuery) ```