diff --git a/DESCRIPTION b/DESCRIPTION index 2a9a32221c2c3031b9b694456501db1a82000097..f3790bce00973774fcea9320651dd31d167babac 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: dataRetrieval Type: Package Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data Version: 2.4.0 -Date: 2015-10-14 +Date: 2015-11-25 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 f5888a0b325a5bdf0e92e0af15a94446af366091..ea565e36b3c48c4ea867ab4aef21ba302adb2436 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -45,5 +45,6 @@ importFrom(plyr,rbind.fill.matrix) importFrom(readr,col_character) importFrom(readr,cols) importFrom(readr,read_delim) +importFrom(readr,read_lines) importFrom(reshape2,dcast) importFrom(reshape2,melt) diff --git a/R/importRDB1.r b/R/importRDB1.r index 0d00de16420915d2515b93f131b2a670d695e9e8..6b990931976393178c1b71cc6bb1268cb5ba9f9f 100644 --- a/R/importRDB1.r +++ b/R/importRDB1.r @@ -45,6 +45,8 @@ #' @import utils #' @import stats #' @importFrom dplyr left_join +#' @importFrom readr read_lines +#' @importFrom readr read_delim #' @examples #' siteNumber <- "02177000" #' startDate <- "2012-09-01" diff --git a/R/readNWISdata.r b/R/readNWISdata.r index aadee1f43538bc142aaf7ffa61f08c002ecc7a66..995fef0bb309d47116779813102d5eb72bfd99aa 100644 --- a/R/readNWISdata.r +++ b/R/readNWISdata.r @@ -202,11 +202,6 @@ readNWISdata <- function(service="dv", ...){ retval$tz_cd <- rep(tz, nrow(retval)) } } - - if("qwdata" == service){ - retval <- convertQWdates(retval) - } - } return(retval)