Skip to content

Commit

Permalink
fix #15, remove ssl_cipher_list option from httr::config in aqs funct…
Browse files Browse the repository at this point in the history
…ion, add note to aqs_sampledurations documentation~
  • Loading branch information
mccroweyclinton-EPA committed Oct 27, 2023
1 parent 121abe6 commit d73fe0a
Show file tree
Hide file tree
Showing 7 changed files with 1,268 additions and 18 deletions.
1,258 changes: 1,251 additions & 7 deletions MD5

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions R/AQSAPI_helperfunctions.R
Original file line number Diff line number Diff line change
Expand Up @@ -429,10 +429,7 @@ aqs <- function(service, filter = NA, user = NA,
query = query
)

AQSresult <- httr::GET(url,
user_agent,
httr::config(ssl_cipher_list = 'DEFAULT@SECLEVEL=1')
)
AQSresult <- httr::GET(url, user_agent)
aqs_ratelimit()
if (httr::http_type(AQSresult) != "application/json") {
stop("API did not return json", call. = TRUE)
Expand Down Expand Up @@ -1136,6 +1133,7 @@ aqsmultiyearparams <- function(parameter, bdate, edate, service, ...)
stateFIPS = ellipsis_args$stateFIPS,
countycode = ellipsis_args$countycode,
sitenum = ellipsis_args$sitenum,
duration = ellipsis_args$duration,
service = service,
cbdate = ellipsis_args$cbdate,
cedate = ellipsis_args$cedate,
Expand Down
4 changes: 4 additions & 0 deletions R/RAQSAPIlistfunctions.R
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,10 @@ aqs_fields_by_service <- function(service, return_header = FALSE)
#' item list that contains header information returned
#' from the API server mostly used for debugging
#' purposes in addition to the data requested.
#' @note Not all sample durations that are available through AQS are available
#' through the AQS DataMart API, including certain calculated sample
#' durations. Only sample durations that are available through the
#' AQS DataMart API are returned.
#' @return a tibble or an AQS_Data Mart_APIv2 S3 object of sample durations and
#' their associated duration codes
#' (groups of parameters, i.e. "criteria" or "all").
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or
downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI)
[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing)
[![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/)
[![Last-changedate](https://img.shields.io/badge/last%20change-%202023--07--26-yellowgreen.svg)](/commits/master)
[![Last-changedate](https://img.shields.io/badge/last%20change-%202023--10--27-yellowgreen.svg)](/commits/master)
<!-- badges: end -->

# EPA Disclaimer
Expand Down
5 changes: 2 additions & 3 deletions cran-comments.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ output: md_document
# cran-comments for RAQSAPI
## RAQSAPI 2.0.5
*RAQSAPI 2.0.4 was not published on CRAN.
- There is an issue with curl connecting to the AQS Datamart API, on
windows platforms, as a temporary fix, RAQSAPI will default to using
the Schannel curl backend.
- fixed an issue where the duration parameter was being ignored in
aqs_sampledata_by_* functions.
- modify QA Collocated Assessments by County and by Site unit tests and
example code to reflect modified data.
- update CITATION file to the new style citation.
Expand Down
5 changes: 2 additions & 3 deletions cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ output: md_document
# cran-comments for RAQSAPI
## RAQSAPI 2.0.5
*RAQSAPI 2.0.4 was not published on CRAN.
- There is an issue with curl connecting to the AQS Datamart API, on
windows platforms, as a temporary fix, RAQSAPI will default to using
the Schannel curl backend.
- fixed an issue where the duration parameter was being ignored in
aqs_sampledata_by_* functions.
- modify QA Collocated Assessments by County and by Site unit tests and
example code to reflect modified data.
- update CITATION file to the new style citation.
Expand Down
6 changes: 6 additions & 0 deletions man/aqs_sampledurations.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d73fe0a

Please sign in to comment.