From 769c0ce927fa51f1d51168ba0f151ef7bca8eb58 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Fri, 20 Feb 2015 17:22:38 -0600
Subject: [PATCH] Changed back to datetime for dailys.
---
R/readNWISdata.r | 8 ++++----
tests/testthat/tests_general.R | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/R/readNWISdata.r b/R/readNWISdata.r
index c66e7f7f..9b3e5a76 100644
--- a/R/readNWISdata.r
+++ b/R/readNWISdata.r
@@ -46,11 +46,13 @@
#' #Not empty:
#' multiSite <- readNWISdata(sites=c("04025500","040263491"), service="iv", parameterCd="00060")
#' bBoxEx <- readNWISdata(bBox=c(-83,36.5,-81,38.5), parameterCd="00010")
+#'
#' startDate <- as.Date("2013-10-01")
#' endDate <- as.Date("2014-09-30")
#' waterYear <- readNWISdata(bBox=c(-83,36.5,-81,38.5), parameterCd="00010",
#' service="dv", startDate=startDate, endDate=endDate)
-#' siteInfo <- readNWISdata(stateCd="WI", parameterCd="00010",hasDataTypeCd="iv", service="site")
+#' siteInfo <- readNWISdata(stateCd="WI", parameterCd="00010",
+#' hasDataTypeCd="iv", service="site")
#' }
readNWISdata <- function(service="dv", ...){
@@ -94,9 +96,7 @@ readNWISdata <- function(service="dv", ...){
} else {
retval <- importWaterML1(urlCall, asDateTime = ("iv" == service))
if("dv" == service){
- retval$dateTime <- as.Date(retval$dateTime)
- retval$tz_cd <- NULL
- names(retval)[names(retval) == "dateTime"] <- "Date"
+ retval$dateTime <- as.POSIXct(retval$dateTime)
}
}
diff --git a/tests/testthat/tests_general.R b/tests/testthat/tests_general.R
index 979d4aea..c714f9ba 100644
--- a/tests/testthat/tests_general.R
+++ b/tests/testthat/tests_general.R
@@ -14,7 +14,7 @@ test_that("General NWIS retrievals working", {
endDate <- as.Date("2014-09-30")
waterYear <- readNWISdata(bBox=c(-83,36.5,-81,38.5), parameterCd="00010",
service="dv", startDate=startDate, endDate=endDate)
- expect_is(waterYear$Date, 'Date')
+ expect_is(waterYear$dateTime, 'POSIXct')
siteInfo <- readNWISdata(stateCd="WI", parameterCd="00010",hasDataTypeCd="iv",
service="site")
--
GitLab