Merge pull request #146 from ldecicco-USGS/master

Remove long running WQP test

R/importRDB1.r

@@ -24,6 +24,7 @@
 #' tz_cd \tab character \tab The time zone code for datetime \cr
 #' code \tab character \tab Any codes that qualify the corresponding value\cr
 #' value \tab numeric \tab The numeric value for the parameter \cr
+#' tz_cd_reported \tab The originally reported time zone \cr
 #' }
 #' Note that code and value are repeated for the parameters requested. The names are of the form 
 #' XD_P_S, where X is literal, 
@@ -178,6 +179,8 @@ importRDB1 <- function(obs_url, asDateTime=FALSE, qw=FALSE, convertType = TRUE,
         data[,regexpr('d$', dataType) > 0] <- data[,regexpr('d$', dataType) > 0] + offset*60*60
         data[,regexpr('d$', dataType) > 0] <- as.POSIXct(data[,regexpr('d$', dataType) > 0])
                 
+        data$tz_cd_reported <- data$tz_cd
+        
         if(tz != ""){
           attr(data[,regexpr('d$', dataType) > 0], "tzone") <- tz
           data$tz_cd <- rep(tz, nrow(data))

R/readNWISunit.r

@@ -255,6 +255,7 @@ readNWISrating <- function (siteNumber,type="base"){
 #' queryTime \tab POSIXct \tab The time the data was returned \cr
 #' comment \tab character \tab Header comments from the RDB file \cr
 #' siteInfo \tab data.frame \tab A data frame containing information on the requested sites \cr
+#' tz_cd_reported \tab The originally reported time zone \cr
 #' }
 #' @seealso \code{\link{constructNWISURL}}, \code{\link{importRDB1}}
 #' @export

man/importRDB1.Rd

@@ -33,6 +33,7 @@ datetime \tab POSIXct \tab The date and time of the value converted to UTC (if a
 tz_cd \tab character \tab The time zone code for datetime \cr
 code \tab character \tab Any codes that qualify the corresponding value\cr
 value \tab numeric \tab The numeric value for the parameter \cr
+tz_cd_reported \tab The originally reported time zone \cr
 }
 Note that code and value are repeated for the parameters requested. The names are of the form
 XD_P_S, where X is literal,

man/readNWISmeas.Rd

@@ -43,6 +43,7 @@ url \tab character \tab The url used to generate the data \cr
 queryTime \tab POSIXct \tab The time the data was returned \cr
 comment \tab character \tab Header comments from the RDB file \cr
 siteInfo \tab data.frame \tab A data frame containing information on the requested sites \cr
+tz_cd_reported \tab The originally reported time zone \cr
 }
 }
 \description{

tests/testthat/tests_general.R

@@ -37,9 +37,10 @@ test_that("General WQP retrievals working", {
   pHData <- readWQPdata(siteid="USGS-04024315",characteristicName=nameToUse)
   expect_is(pHData$ActivityStartDateTime, 'POSIXct')
   
-  pHDataExpanded2 <- readWQPdata(bBox=c(-90.1,42.9,-89.9,43.1),
-                                 characteristicName=nameToUse)
-  expect_is(pHDataExpanded2$ActivityStartDateTime, 'POSIXct')
+  # Known slow query for WQP:
+#   pHDataExpanded2 <- readWQPdata(bBox=c(-90.1,42.9,-89.9,43.1),
+#                                  characteristicName=nameToUse)
+#   expect_is(pHDataExpanded2$ActivityStartDateTime, 'POSIXct')
   
   startDate <- as.Date("2013-01-01")
   nutrientDaneCounty <- readWQPdata(countycode="US:55:025",startDate=startDate,