diff --git a/R/readWQPqw.R b/R/readWQPqw.R index 51b3de37..073e53e6 100644 --- a/R/readWQPqw.R +++ b/R/readWQPqw.R @@ -53,10 +53,9 @@ #' \donttest{ #' rawPcode <- readWQPqw("USGS-01594440", "01075", "", "") #' -#' attr(rawPcode, "url") #' attr(rawPcode, "siteInfo") #' attr(rawPcode, "queryTime") -#' attr(rawPcode, "headerInfo")[["dataProviders"]] +#' #' #' rawCharacteristicName <- readWQPqw("WIDNR_WQX-10032762", "Specific conductance", "", "") #' rawPHsites <- readWQPqw(c("USGS-05406450", "USGS-05427949", "WIDNR_WQX-133040"), "pH", "", "") @@ -69,7 +68,7 @@ readWQPqw <- function(siteNumbers, startDate = "", endDate = "", tz = "UTC", - legacy = FALSE, + legacy = TRUE, querySummary = FALSE, ignore_attributes = FALSE, convertType = TRUE) { diff --git a/man/readWQPqw.Rd b/man/readWQPqw.Rd index 79db2f7e..7b421474 100644 --- a/man/readWQPqw.Rd +++ b/man/readWQPqw.Rd @@ -10,7 +10,7 @@ readWQPqw( startDate = "", endDate = "", tz = "UTC", - legacy = FALSE, + legacy = TRUE, querySummary = FALSE, ignore_attributes = FALSE, convertType = TRUE @@ -79,10 +79,9 @@ site name, such as 'USGS-01234567'. \donttest{ rawPcode <- readWQPqw("USGS-01594440", "01075", "", "") -attr(rawPcode, "url") attr(rawPcode, "siteInfo") attr(rawPcode, "queryTime") -attr(rawPcode, "headerInfo")[["dataProviders"]] + rawCharacteristicName <- readWQPqw("WIDNR_WQX-10032762", "Specific conductance", "", "") rawPHsites <- readWQPqw(c("USGS-05406450", "USGS-05427949", "WIDNR_WQX-133040"), "pH", "", "") diff --git a/pkgdown/templates/header.html b/pkgdown/templates/header.html index 77706e0b..39090d2f 100644 --- a/pkgdown/templates/header.html +++ b/pkgdown/templates/header.html @@ -1,45 +1,82 @@ - - -Untitled Document - - - - - - - - - - - - - - - -
\ No newline at end of file + + + + +{{{pagetitle}}} • {{#site}}{{title}}{{/site}} + +{{#has_favicons}} + + + + + + + +{{/has_favicons}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{{#yaml}}{{#docsearch}} + + + + + +{{/docsearch}}{{/yaml}} + + +{{#opengraph}} +{{#description}} + +{{/description}} +{{#image}} + +{{/image}} + +{{/opengraph}} + +{{#yaml}}{{#noindex}}{{/noindex}}{{/yaml}} +{{#development}}{{#in_dev}}{{/in_dev}}{{/development}} + + + + + + + + + + diff --git a/tests/testthat/tests_imports.R b/tests/testthat/tests_imports.R index d8c69ac4..89d26949 100644 --- a/tests/testthat/tests_imports.R +++ b/tests/testthat/tests_imports.R @@ -241,15 +241,15 @@ context("importWQP_noCRAN") test_that("External WQP tests", { testthat::skip_on_cran() - rawSampleURL <- constructWQPURL("USGS-01594440", "01075", "", "") + rawSampleURL <- constructWQPURL("USGS-01594440", "01075", "", "", legacy = FALSE) rawSample <- importWQP(rawSampleURL) expect_is(rawSample$Activity_StartDateTime, "POSIXct") - url2 <- constructWQPURL("USGS-01594440", "01075", "", "") + url2 <- constructWQPURL("USGS-01594440", "01075", "", "", legacy = TRUE) rawSample2 <- suppressWarnings(importWQP(url2)) - expect_is(rawSample2$Activity_StartDateTime, "POSIXct") + expect_is(rawSample2$ActivityStartDateTime, "POSIXct") - STORETex <- constructWQPURL("WIDNR_WQX-10032762", "Specific conductance", "", "") + STORETex <- constructWQPURL("WIDNR_WQX-10032762", "Specific conductance", "", "", legacy = FALSE) STORETdata <- importWQP(STORETex) expect_is(STORETdata$Activity_StartDateTime, "POSIXct") }) diff --git a/tests/testthat/tests_userFriendly_fxns.R b/tests/testthat/tests_userFriendly_fxns.R index 32de728f..991216a4 100644 --- a/tests/testthat/tests_userFriendly_fxns.R +++ b/tests/testthat/tests_userFriendly_fxns.R @@ -141,13 +141,15 @@ test_that("WQP qw tests", { nameToUse <- "Specific conductance" pcodeToUse <- "00095" - INFO_WQP <- readWQPqw("USGS-04024315", pcodeToUse, startDate = "", endDate = "") + INFO_WQP <- readWQPqw("USGS-04024315", pcodeToUse, + startDate = "", endDate = "", legacy = FALSE) expect_is(INFO_WQP$Activity_StartDateTime, "POSIXct") - INFO2 <- readWQPqw("WIDNR_WQX-10032762", nameToUse, startDate = "", endDate = "") + INFO2 <- readWQPqw("WIDNR_WQX-10032762", nameToUse, + startDate = "", endDate = "", legacy = FALSE) expect_is(INFO2$Activity_StartDateTime, "POSIXct") - df <- readWQPqw("USGS-04193500", parameterCd = "00665") + df <- readWQPqw("USGS-04193500", parameterCd = "00665", legacy = FALSE) expect_true(nrow(df) > 0) df2 <- readWQPqw("USGS-05427718", parameterCd = "all")