Skip to content

Commit d73fe0a

Browse files
fix #15, remove ssl_cipher_list option from httr::config in aqs function, add note to aqs_sampledurations documentation~
1 parent 121abe6 commit d73fe0a

File tree

7 files changed

+1268
-18
lines changed

7 files changed

+1268
-18
lines changed

MD5

Lines changed: 1251 additions & 7 deletions
Large diffs are not rendered by default.

R/AQSAPI_helperfunctions.R

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,7 @@ aqs <- function(service, filter = NA, user = NA,
429429
query = query
430430
)
431431

432-
AQSresult <- httr::GET(url,
433-
user_agent,
434-
httr::config(ssl_cipher_list = 'DEFAULT@SECLEVEL=1')
435-
)
432+
AQSresult <- httr::GET(url, user_agent)
436433
aqs_ratelimit()
437434
if (httr::http_type(AQSresult) != "application/json") {
438435
stop("API did not return json", call. = TRUE)
@@ -1136,6 +1133,7 @@ aqsmultiyearparams <- function(parameter, bdate, edate, service, ...)
11361133
stateFIPS = ellipsis_args$stateFIPS,
11371134
countycode = ellipsis_args$countycode,
11381135
sitenum = ellipsis_args$sitenum,
1136+
duration = ellipsis_args$duration,
11391137
service = service,
11401138
cbdate = ellipsis_args$cbdate,
11411139
cedate = ellipsis_args$cedate,

R/RAQSAPIlistfunctions.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,10 @@ aqs_fields_by_service <- function(service, return_header = FALSE)
440440
#' item list that contains header information returned
441441
#' from the API server mostly used for debugging
442442
#' purposes in addition to the data requested.
443+
#' @note Not all sample durations that are available through AQS are available
444+
#' through the AQS DataMart API, including certain calculated sample
445+
#' durations. Only sample durations that are available through the
446+
#' AQS DataMart API are returned.
443447
#' @return a tibble or an AQS_Data Mart_APIv2 S3 object of sample durations and
444448
#' their associated duration codes
445449
#' (groups of parameters, i.e. "criteria" or "all").

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or
3737
downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI)
3838
[![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing)
3939
[![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/)
40-
[![Last-changedate](https://img.shields.io/badge/last%20change-%202023--07--26-yellowgreen.svg)](/commits/master)
40+
[![Last-changedate](https://img.shields.io/badge/last%20change-%202023--10--27-yellowgreen.svg)](/commits/master)
4141
<!-- badges: end -->
4242

4343
# EPA Disclaimer

cran-comments.Rmd

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ output: md_document
88
# cran-comments for RAQSAPI
99
## RAQSAPI 2.0.5
1010
*RAQSAPI 2.0.4 was not published on CRAN.
11-
- There is an issue with curl connecting to the AQS Datamart API, on
12-
windows platforms, as a temporary fix, RAQSAPI will default to using
13-
the Schannel curl backend.
11+
- fixed an issue where the duration parameter was being ignored in
12+
aqs_sampledata_by_* functions.
1413
- modify QA Collocated Assessments by County and by Site unit tests and
1514
example code to reflect modified data.
1615
- update CITATION file to the new style citation.

cran-comments.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ output: md_document
88
# cran-comments for RAQSAPI
99
## RAQSAPI 2.0.5
1010
*RAQSAPI 2.0.4 was not published on CRAN.
11-
- There is an issue with curl connecting to the AQS Datamart API, on
12-
windows platforms, as a temporary fix, RAQSAPI will default to using
13-
the Schannel curl backend.
11+
- fixed an issue where the duration parameter was being ignored in
12+
aqs_sampledata_by_* functions.
1413
- modify QA Collocated Assessments by County and by Site unit tests and
1514
example code to reflect modified data.
1615
- update CITATION file to the new style citation.

man/aqs_sampledurations.Rd

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)