diff --git a/R/importRDB1.r b/R/importRDB1.r
index 83b636b27912ade2bb3c3d61d791f0dbfae4e557..5b24c6b55318aa950c14cbacacd4920bed587a7c 100644
--- a/R/importRDB1.r
+++ b/R/importRDB1.r
@@ -66,7 +66,7 @@
#' start <- "2014-11-09"
#' end <- "2014-11-28"
#' urlIce <- constructNWISURL(iceSite,"00060",start, end,"uv",format="tsv")
-#' ice <- importRDB1(urlIce)
+#' ice <- importRDB1(urlIce, asDateTime=TRUE)
#' iceNoConvert <- importRDB1(urlIce, convertType=FALSE)
#' }
#' # User file:
@@ -160,9 +160,11 @@ importRDB1 <- function(obs_url, asDateTime=FALSE, qw=FALSE, convertType = TRUE,
if(tz != ""){
attr(data[,regexpr('d$', dataType) > 0], "tzone") <- tz
+ data$tz_cd <- rep(tz, nrow(data))
} else {
attr(data[,regexpr('d$', dataType) > 0], "tzone") <- "UTC"
- }
+ data$tz_cd <- rep("UTC", nrow(data))
+ }
} else if (qw){
@@ -205,9 +207,11 @@ importRDB1 <- function(obs_url, asDateTime=FALSE, qw=FALSE, convertType = TRUE,
if(tz != ""){
attr(data$startDateTime, "tzone") <- tz
+ data$tz_cd <- rep(tz, nrow(data))
} else {
attr(data$startDateTime, "tzone") <- "UTC"
- }
+ data$tz_cd <- rep("UTC", nrow(data))
+ }
if(composite){
data$endDateTime <- with(data, as.POSIXct(paste(sample_end_dt, sample_end_tm),format="%Y-%m-%d %H:%M", tz = "UTC"))
diff --git a/R/importWaterML1.r b/R/importWaterML1.r
index 4d8acc485d8b1ae1722970eec999e69c27fa609b..afc12c974c319331da651f02054a5ca947d4544a 100644
--- a/R/importWaterML1.r
+++ b/R/importWaterML1.r
@@ -49,7 +49,7 @@
#' property <- '00060'
#' obs_url <- constructNWISURL(siteNumber,property,startDate,endDate,'dv')
#' \dontrun{
-#' data <- importWaterML1(obs_url,TRUE)
+#' data <- importWaterML1(obs_url)
#'
#' groundWaterSite <- "431049071324301"
#' startGW <- "2013-10-01"
@@ -57,6 +57,7 @@
#' groundwaterExampleURL <- constructNWISURL(groundWaterSite, NA,
#' startGW,endGW, service="gwlevels")
#' groundWater <- importWaterML1(groundwaterExampleURL)
+#' groundWater2 <- importWaterML1(groundwaterExampleURL, asDateTime=TRUE)
#'
#' unitDataURL <- constructNWISURL(siteNumber,property,
#' "2013-11-03","2013-11-03",'uv')
@@ -274,10 +275,12 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
if(tz != ""){
attr(datetime, "tzone") <- tz
+ df$tz_cd <- rep(tz, nrow(df))
} else {
attr(datetime, "tzone") <- "UTC"
+ df$tz_cd <- rep("UTC", nrow(df))
}
-
+
} else {
@@ -461,9 +464,6 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
attr(mergedDF, "variableInfo") <- variableInformation
attr(mergedDF, "disclaimer") <- notes["disclaimer"]
attr(mergedDF, "statisticInfo") <- statInformation
- # Do we want this?
- # attr(mergedDF, "attributeList") <- attList
- # attr(mergedDF, "queryInfo") <- queryInfo
attr(mergedDF, "queryTime") <- Sys.time()
return (mergedDF)
}
diff --git a/R/readNWISdata.r b/R/readNWISdata.r
index b4c04d5e204fc364593e021670727de2121651f0..ae0f2cc4e3345168eae621f1b72b362e6155770c 100644
--- a/R/readNWISdata.r
+++ b/R/readNWISdata.r
@@ -44,7 +44,7 @@
#' @examples
#' \dontrun{
#' # Examples not run for time considerations
-#' dataTemp <- readNWISdata(stateCd="OH",parameterCd="00010")
+#' dataTemp <- readNWISdata(stateCd="OH",parameterCd="00010", service="dv")
#' instFlow <- readNWISdata(sites="05114000", service="iv",
#' parameterCd="00060",
#' startDate="2014-05-01T00:00Z",endDate="2014-05-01T12:00Z")
@@ -158,7 +158,7 @@ readNWISdata <- function(service="dv", ...){
stop(e, "with url:", urlCall)
})
- } else if(service != "qwdata") {
+ } else if (service != "qwdata") {
possibleError <- tryCatch({
retval <- importWaterML1(urlCall, asDateTime = ("iv" == service), tz= tz)
}, error = function(e) {
@@ -172,13 +172,13 @@ readNWISdata <- function(service="dv", ...){
"America/Denver","America/Denver",
"America/Los_Angeles","America/Los_Angeles",
"America/Anchorage","America/Anchorage",
- "America/Honolulu","America/Honolulu"),
+ "America/Honolulu","America/Honolulu","UTC"),
c("EST","EDT",
"CST","CDT",
"MST","MDT",
"PST","PDT",
"AKST","AKDT",
- "HAST","HST"))
+ "HAST","HST","UTC"))
#TODO: Think about dates that cross a time zone boundary.
retval$dateTime <- as.POSIXct(retval$dateTime, tzLib[tz=retval$tz_cd[1]])
}
diff --git a/R/readNWISunit.r b/R/readNWISunit.r
index 89865596a08b81536526537af6c5acd1f35ba1b2..f5b355bc07048571597bb53a57f011e3ca11e00e 100644
--- a/R/readNWISunit.r
+++ b/R/readNWISunit.r
@@ -72,12 +72,6 @@ readNWISuv <- function (siteNumbers,parameterCd,startDate="",endDate="", tz=""){
data <- importWaterML1(url,asDateTime=TRUE,tz=tz)
- if(tz == ""){
- data$tz_cd <- rep("UTC", nrow(data))
- } else {
- data$tz_cd <- rep(tz, nrow(data))
- }
-
return (data)
}
@@ -138,10 +132,12 @@ readNWISpeak <- function (siteNumbers,startDate="",endDate="", asDateTime=TRUE){
if(asDateTime){
badDates <- which(grepl("[0-9]*-[0-9]*-00",data$peak_dt))
- data <- data[-badDates,]
if(length(badDates) > 0){
- warning(length(badDates), " rows were thrown out due to incomplete dates")
+ data <- data[-badDates,]
+ if(length(badDates) > 0){
+ warning(length(badDates), " rows were thrown out due to incomplete dates")
+ }
}
data$peak_dt <- as.Date(data$peak_dt)
}
@@ -263,7 +259,7 @@ readNWISmeas <- function (siteNumbers,startDate="",endDate="", tz=""){
# Doesn't seem to be a WaterML1 format option
url <- constructNWISURL(siteNumbers,NA,startDate,endDate,"meas")
- data <- importRDB1(url,asDateTime=FALSE,tz=tz)
+ data <- importRDB1(url,asDateTime=TRUE,tz=tz)
if("diff_from_rating_pc" %in% names(data)){
data$diff_from_rating_pc <- as.numeric(data$diff_from_rating_pc)
diff --git a/man/importRDB1.Rd b/man/importRDB1.Rd
index 3c2764e87014c04c75ece580557c546c958b0035..3e5126f9f50eafb2e80f56183ce671e2ccd976c6 100644
--- a/man/importRDB1.Rd
+++ b/man/importRDB1.Rd
@@ -79,7 +79,7 @@ iceSite <- '04024430'
start <- "2014-11-09"
end <- "2014-11-28"
urlIce <- constructNWISURL(iceSite,"00060",start, end,"uv",format="tsv")
-ice <- importRDB1(urlIce)
+ice <- importRDB1(urlIce, asDateTime=TRUE)
iceNoConvert <- importRDB1(urlIce, convertType=FALSE)
}
# User file:
diff --git a/man/importWaterML1.Rd b/man/importWaterML1.Rd
index 7ab731bc7693427cb549bde782bce4d015b54ecf..1e7f3b8c5e5f6520ff611ee82b9dceb88b0c507e 100644
--- a/man/importWaterML1.Rd
+++ b/man/importWaterML1.Rd
@@ -56,7 +56,7 @@ offering <- '00003'
property <- '00060'
obs_url <- constructNWISURL(siteNumber,property,startDate,endDate,'dv')
\dontrun{
-data <- importWaterML1(obs_url,TRUE)
+data <- importWaterML1(obs_url)
groundWaterSite <- "431049071324301"
startGW <- "2013-10-01"
@@ -64,6 +64,7 @@ endGW <- "2014-06-30"
groundwaterExampleURL <- constructNWISURL(groundWaterSite, NA,
startGW,endGW, service="gwlevels")
groundWater <- importWaterML1(groundwaterExampleURL)
+groundWater2 <- importWaterML1(groundwaterExampleURL, asDateTime=TRUE)
unitDataURL <- constructNWISURL(siteNumber,property,
"2013-11-03","2013-11-03",'uv')
diff --git a/man/readNWISdata.Rd b/man/readNWISdata.Rd
index 027b46b288e07c9bae674e761f92b286fa1e2194..b91230c9e06248b8627f950bb8e0aa6069dbdbe3 100644
--- a/man/readNWISdata.Rd
+++ b/man/readNWISdata.Rd
@@ -52,7 +52,7 @@ See examples below for ideas of constructing queries.
\examples{
\dontrun{
# Examples not run for time considerations
-dataTemp <- readNWISdata(stateCd="OH",parameterCd="00010")
+dataTemp <- readNWISdata(stateCd="OH",parameterCd="00010", service="dv")
instFlow <- readNWISdata(sites="05114000", service="iv",
parameterCd="00060",
startDate="2014-05-01T00:00Z",endDate="2014-05-01T12:00Z")