diff --git a/.Rbuildignore b/.Rbuildignore
index bd20a11e8772462c4eb790fb74c39199b758c545..b9f08b037422c5878acc279b6248e1d9dc23b58f 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -1,3 +1,4 @@
+vignettes\figure
^.*\.Rproj$
^\.Rproj\.user$
^\.Rproj\inst\dataRetrieval.log
diff --git a/DESCRIPTION b/DESCRIPTION
index 3aec80532dc1617b53507eb333de101c1872f493..304a3273cf411913da7d8ada22b2c1a424043ff1 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: dataRetrieval
Type: Package
Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data
-Version: 2.2.0
-Date: 2015-04-07
+Version: 2.2.1
+Date: 2015-04-22
Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
email = "rhirsch@usgs.gov"),
person("Laura", "DeCicco", role = c("aut","cre"),
diff --git a/NAMESPACE b/NAMESPACE
index c3702ed61e6ea4fc5834060a5fe2d14afe839c82..8e8914259222096f97b96376f5d6522226fc4794 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.0): do not edit by hand
+# Generated by roxygen2 (4.1.1): do not edit by hand
export(checkWQPdates)
export(constructNWISURL)
diff --git a/R/importWaterML1.r b/R/importWaterML1.r
index afc12c974c319331da651f02054a5ca947d4544a..a67b988cc494f09eec557b5ffd6cbc52e61ea98e 100644
--- a/R/importWaterML1.r
+++ b/R/importWaterML1.r
@@ -87,6 +87,10 @@
#' fullPath <- file.path(filePath, fileName)
#' imporFile <- importWaterML1(fullPath,TRUE)
#'
+#'#Timezone change with specified local timezone:
+#' tzURL <- constructNWISURL("04027000", c("00300","63680"), "2011-11-05", "2011-11-07","uv")
+#' tzIssue <- importWaterML1(tzURL, TRUE, "America/Chicago")
+#'
importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
if(file.exists(obs_url)){
@@ -273,13 +277,13 @@ 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))
- }
+# 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 {
@@ -308,9 +312,6 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
}
columnsOrderd <- columnsOrdered[columnsOrdered %in% names(df)]
-
-
-
df <- df[,columnsOrderd]
if (is.null(mergedDF)){
@@ -456,6 +457,15 @@ importWaterML1 <- function(obs_url,asDateTime=FALSE, tz=""){
mergedDF <- data.frame()
}
+ if(asDateTime){
+ if(tz != ""){
+ attr(mergedDF$dateTime, "tzone") <- tz
+ mergedDF$tz_cd <- rep(tz, nrow(mergedDF))
+ } else {
+ attr(mergedDF$dateTime, "tzone") <- "UTC"
+ mergedDF$tz_cd <- rep("UTC", nrow(mergedDF))
+ }
+ }
variableInformation$noDataValue <- rep(NA, nrow(variableInformation))
row.names(mergedDF) <- NULL
diff --git a/man/checkWQPdates.Rd b/man/checkWQPdates.Rd
index f239655d3de874a1333ac4063405148d2f39f07b..eb7c847cbd4233f80ac06d0679963d0d685dca05 100644
--- a/man/checkWQPdates.Rd
+++ b/man/checkWQPdates.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/checkWQPdates.r
\name{checkWQPdates}
\alias{checkWQPdates}
diff --git a/man/constructNWISURL.Rd b/man/constructNWISURL.Rd
index e1495abee6f5286ab5ab79068218ca02cdd16350..debc94f5ccee015981ab0533db7d4350c5be6254 100644
--- a/man/constructNWISURL.Rd
+++ b/man/constructNWISURL.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/constructNWISURL.r
\name{constructNWISURL}
\alias{constructNWISURL}
diff --git a/man/constructWQPURL.Rd b/man/constructWQPURL.Rd
index 7388c13a0f16f8fcb14766f3dd06db7af26d1a3a..79d8a198ebafd825b5468f4f4c706c8947e7e874 100644
--- a/man/constructWQPURL.Rd
+++ b/man/constructWQPURL.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/constructNWISURL.r
\name{constructWQPURL}
\alias{constructWQPURL}
diff --git a/man/countyCd.Rd b/man/countyCd.Rd
index 85fff612c95980cdeffb58aca24194dc60980760..b5feec7332fa6958645c2b9c0e5eb02a32d27be3 100644
--- a/man/countyCd.Rd
+++ b/man/countyCd.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/tabbedDataRetrievals.R
\docType{data}
\name{countyCd}
diff --git a/man/dataRetrieval-package.Rd b/man/dataRetrieval-package.Rd
index ac30a455984718e4b1a7a0ea1645109878136a08..7cc6225c5952b585d211b8a124c772825346132b 100644
--- a/man/dataRetrieval-package.Rd
+++ b/man/dataRetrieval-package.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/tabbedDataRetrievals.R
\docType{package}
\name{dataRetrieval-package}
diff --git a/man/getWebServiceData.Rd b/man/getWebServiceData.Rd
index 1396433f4ee088eabf4a8ab713e5773ce32ae6b2..c1c3d2080dee28b18e8bcb63a1a4371c91b84885 100644
--- a/man/getWebServiceData.Rd
+++ b/man/getWebServiceData.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/getWebServiceData.R
\name{getWebServiceData}
\alias{getWebServiceData}
diff --git a/man/importRDB1.Rd b/man/importRDB1.Rd
index 3e5126f9f50eafb2e80f56183ce671e2ccd976c6..fc24cf8d7ff709565b19d93f8c6f8f951af5d4f6 100644
--- a/man/importRDB1.Rd
+++ b/man/importRDB1.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/importRDB1.r
\name{importRDB1}
\alias{importRDB1}
diff --git a/man/importWQP.Rd b/man/importWQP.Rd
index fa709d09bab91b677f5495fc3a58d14623d75e12..4ee889125273e3aeed465b21a4a6504eeb810688 100644
--- a/man/importWQP.Rd
+++ b/man/importWQP.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/importWQP.R
\name{importWQP}
\alias{importWQP}
diff --git a/man/importWaterML1.Rd b/man/importWaterML1.Rd
index 1e7f3b8c5e5f6520ff611ee82b9dceb88b0c507e..8c3821ca2b24997b5db3dd0fc5366fe554fe64b9 100644
--- a/man/importWaterML1.Rd
+++ b/man/importWaterML1.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/importWaterML1.r
\name{importWaterML1}
\alias{importWaterML1}
@@ -93,6 +93,10 @@ filePath <- system.file("extdata", package="dataRetrieval")
fileName <- "WaterML1Example.xml"
fullPath <- file.path(filePath, fileName)
imporFile <- importWaterML1(fullPath,TRUE)
+
+#Timezone change with specified local timezone:
+tzURL <- constructNWISURL("04027000", c("00300","63680"), "2011-11-05", "2011-11-07","uv")
+tzIssue <- importWaterML1(tzURL, TRUE, "America/Chicago")
}
\seealso{
\code{\link{renameNWISColumns}}
diff --git a/man/importWaterML2.Rd b/man/importWaterML2.Rd
index 419775eb44f8777285c24b6148f9866bd25d2e90..521f202bafef839a9089eba1b308cdd25c7c2b9b 100644
--- a/man/importWaterML2.Rd
+++ b/man/importWaterML2.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/importWaterML2.r
\name{importWaterML2}
\alias{importWaterML2}
diff --git a/man/pCodeToName.Rd b/man/pCodeToName.Rd
index 45af51e616854a9d46d831943cc6beefa80f9851..c4e1fd2d8a9c2f3b3ab895c4b464ee422ee9b6eb 100644
--- a/man/pCodeToName.Rd
+++ b/man/pCodeToName.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/tabbedDataRetrievals.R
\docType{data}
\name{pCodeToName}
diff --git a/man/parameterCdFile.Rd b/man/parameterCdFile.Rd
index 516692698af0cb7b415eeddae6f559be41184e6c..29be9129c0d02e0781e93a6df58ef5c773b81dd4 100644
--- a/man/parameterCdFile.Rd
+++ b/man/parameterCdFile.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/tabbedDataRetrievals.R
\docType{data}
\name{parameterCdFile}
diff --git a/man/readNWISdata.Rd b/man/readNWISdata.Rd
index b91230c9e06248b8627f950bb8e0aa6069dbdbe3..0b848a18214785016a292913a6444b7fefa20c3c 100644
--- a/man/readNWISdata.Rd
+++ b/man/readNWISdata.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISdata.r
\name{readNWISdata}
\alias{readNWISdata}
diff --git a/man/readNWISdv.Rd b/man/readNWISdv.Rd
index 446c09ac176cb1cd1837f239a1decce22bc103fa..52a868c5c9c4b263f1ea88d27738e165824f2d0c 100644
--- a/man/readNWISdv.Rd
+++ b/man/readNWISdv.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISdv.r
\name{readNWISdv}
\alias{readNWISdv}
diff --git a/man/readNWISgwl.Rd b/man/readNWISgwl.Rd
index 8c66ced4e13dc22b2c07a12cfe0a710e8ff5d842..5b284662c06e13448dd28b12ccb5e381ed7babcf 100644
--- a/man/readNWISgwl.Rd
+++ b/man/readNWISgwl.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISunit.r
\name{readNWISgwl}
\alias{readNWISgwl}
diff --git a/man/readNWISmeas.Rd b/man/readNWISmeas.Rd
index 2ef4900eed88f5d7e15704ddfd802e6c2fcd6f5d..62dd55a08f457a1ed4342e778fab854899faf2be 100644
--- a/man/readNWISmeas.Rd
+++ b/man/readNWISmeas.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISunit.r
\name{readNWISmeas}
\alias{readNWISmeas}
diff --git a/man/readNWISpCode.Rd b/man/readNWISpCode.Rd
index 47fca5f54bc6c20ded296366285d18efb37a9025..d5d29749ab14a3a7bde37883e4bd63c25264cda7 100644
--- a/man/readNWISpCode.Rd
+++ b/man/readNWISpCode.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISpCode.r
\name{readNWISpCode}
\alias{readNWISpCode}
diff --git a/man/readNWISpeak.Rd b/man/readNWISpeak.Rd
index 3fbc574dabd47c73cd788bb813400997f599c9bb..2c86f8b645e00f19ef22c5fc22a885b23d0c56e6 100644
--- a/man/readNWISpeak.Rd
+++ b/man/readNWISpeak.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISunit.r
\name{readNWISpeak}
\alias{readNWISpeak}
diff --git a/man/readNWISqw.Rd b/man/readNWISqw.Rd
index 050935486eb289a10bc938d3c52c3e951bede7e0..80e180fd087c736aceba4ee4afd41f0e8ef92a1c 100644
--- a/man/readNWISqw.Rd
+++ b/man/readNWISqw.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISqw.r
\name{readNWISqw}
\alias{readNWISqw}
diff --git a/man/readNWISrating.Rd b/man/readNWISrating.Rd
index e9c348c4b01f0e5ad6f950e10c61a50150c8c95b..9d182b56341bd8d03fa36d1888609edbdd76d01f 100644
--- a/man/readNWISrating.Rd
+++ b/man/readNWISrating.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISunit.r
\name{readNWISrating}
\alias{readNWISrating}
diff --git a/man/readNWISsite.Rd b/man/readNWISsite.Rd
index 84dffad4207537c8902120fbd3b78100a13ccf13..1b1ea84be2fe9714f23ac224abc83bb0ea790fc3 100644
--- a/man/readNWISsite.Rd
+++ b/man/readNWISsite.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISsite.r
\name{readNWISsite}
\alias{readNWISsite}
diff --git a/man/readNWISuv.Rd b/man/readNWISuv.Rd
index ff16c162e6312e799ab560b4ee7cb3929cc6cafa..542f4960e2ef1f9951ea92d56d328952ee4e6386 100644
--- a/man/readNWISuv.Rd
+++ b/man/readNWISuv.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISunit.r
\name{readNWISuv}
\alias{readNWISuv}
diff --git a/man/readWQPdata.Rd b/man/readWQPdata.Rd
index f898a5344918c0b1ea06f1c5add325072c71d54c..27b2064d9cfa29dfcbbf4b40520f516696207058 100644
--- a/man/readWQPdata.Rd
+++ b/man/readWQPdata.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readWQPdata.R
\name{readWQPdata}
\alias{readWQPdata}
diff --git a/man/readWQPqw.Rd b/man/readWQPqw.Rd
index 836302c1235c40a58f9985a814676f4809675a90..ca3984f1e8c1b7909b6ec7df109b2340134d66da 100644
--- a/man/readWQPqw.Rd
+++ b/man/readWQPqw.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readWQPqw.r
\name{readWQPqw}
\alias{readWQPqw}
diff --git a/man/renameNWISColumns.Rd b/man/renameNWISColumns.Rd
index aeec583a1f7121459d55937d8b75cb63dc88f1ca..56353cf2fd4d858f425e40feba70b13f38541662 100644
--- a/man/renameNWISColumns.Rd
+++ b/man/renameNWISColumns.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/renameColumns.R
\name{renameNWISColumns}
\alias{renameNWISColumns}
diff --git a/man/stateCd.Rd b/man/stateCd.Rd
index c6cdea41adf23fa16fd44892d96ad9f81edfa03e..2b5a3023fa5569e283b4e23a1907ad6856076d4f 100644
--- a/man/stateCd.Rd
+++ b/man/stateCd.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/tabbedDataRetrievals.R
\docType{data}
\name{stateCd}
diff --git a/man/stateCdLookup.Rd b/man/stateCdLookup.Rd
index 61d4f8670e7449879fa6e6c6867350cd9b415493..dc13f33867d8549cde4e80c7f286d02959045693 100644
--- a/man/stateCdLookup.Rd
+++ b/man/stateCdLookup.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/readNWISdata.r
\name{stateCdLookup}
\alias{stateCdLookup}
diff --git a/man/whatNWISData.Rd b/man/whatNWISData.Rd
index b30a7a493f237de19279f7be3d52cac1cafce326..dfda4a93182e4a97b0d0c65a77a146af1590927a 100644
--- a/man/whatNWISData.Rd
+++ b/man/whatNWISData.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/whatNWISdata.r
\name{whatNWISdata}
\alias{whatNWISdata}
diff --git a/man/whatNWISsites.Rd b/man/whatNWISsites.Rd
index 330236fc94f0f6d4f6112bd72de7df12803664b8..845604906213df661e1a63c7480a7dd5cbcc70c0 100644
--- a/man/whatNWISsites.Rd
+++ b/man/whatNWISsites.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/whatNWISsites.R
\name{whatNWISsites}
\alias{whatNWISsites}
diff --git a/man/whatWQPsites.Rd b/man/whatWQPsites.Rd
index c6ddb6fffd57e9a316f85150ef20b2609decd08b..78af09dfa181c128125c63fcde151792efde6f21 100644
--- a/man/whatWQPsites.Rd
+++ b/man/whatWQPsites.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/whatWQPsites.R
\name{whatWQPsites}
\alias{whatWQPsites}
diff --git a/man/zeroPad.Rd b/man/zeroPad.Rd
index ed87d6bde378bbc6eb1de83ab05deb57efbec592..357e3634892e824667e694012791d5623b11314d 100644
--- a/man/zeroPad.Rd
+++ b/man/zeroPad.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2 (4.1.0): do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
% Please edit documentation in R/zeroPad.r
\name{zeroPad}
\alias{zeroPad}