Merge pull request #121 from ldecicco-USGS/master

Timezone with daylight savings.
DOI-USGS · Apr 22, 2015 · 2168322 · 2168322
2 parents 91e8b2c + 684a357
commit 2168322
Show file tree

Hide file tree

Showing 35 changed files with 59 additions and 44 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,3 +1,4 @@
+vignettes\figure
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.Rproj\inst\dataRetrieval.log

diff --git 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 = "[email protected]"),
     person("Laura", "DeCicco", role = c("aut","cre"),

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}