diff --git a/DESCRIPTION b/DESCRIPTION index 23d82406..72926b7d 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.2 -Date: 2015-06-05 +Version: 2.2.3 +Date: 2015-06-29 Authors@R: c( person("Robert", "Hirsch", role = c("aut"), email = "rhirsch@usgs.gov"), person("Laura", "DeCicco", role = c("aut","cre"), @@ -27,7 +27,9 @@ Imports: RCurl, reshape2, lubridate, - plyr + plyr, + stats, + utils Suggests: xtable, knitr, diff --git a/NAMESPACE b/NAMESPACE index 4a0b9c2f..75ba4924 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -33,6 +33,8 @@ export(zeroPad) import(RCurl) import(XML) import(lubridate) +import(stats) +import(utils) importFrom(plyr,rbind.fill.matrix) importFrom(reshape2,dcast) importFrom(reshape2,melt) diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r index c5326c8d..0c5eeb1d 100644 --- a/R/constructNWISURL.r +++ b/R/constructNWISURL.r @@ -22,6 +22,7 @@ #' @return url string #' @export #' @import RCurl +#' @import utils #' @examples #' siteNumber <- '01594440' #' startDate <- '1985-01-01' diff --git a/R/importRDB1.r b/R/importRDB1.r index 5b24c6b5..57c76d7d 100644 --- a/R/importRDB1.r +++ b/R/importRDB1.r @@ -40,6 +40,8 @@ #' } #' @export #' @import RCurl +#' @import utils +#' @import stats #' @examples #' siteNumber <- "02177000" #' startDate <- "2012-09-01" diff --git a/R/importWQP.R b/R/importWQP.R index 4ccf266a..ca53853b 100644 --- a/R/importWQP.R +++ b/R/importWQP.R @@ -14,6 +14,8 @@ #' @seealso \code{\link{readWQPdata}}, \code{\link{readWQPqw}}, \code{\link{whatWQPsites}} #' @import RCurl #' @import lubridate +#' @import utils +#' @import stats #' @examples #' # These examples require an internet connection to run #' diff --git a/R/importWaterML1.r b/R/importWaterML1.r index 0931e4dc..a7db0170 100644 --- a/R/importWaterML1.r +++ b/R/importWaterML1.r @@ -40,6 +40,8 @@ #' @export #' @import XML #' @import RCurl +#' @import utils +#' @import stats #' @importFrom reshape2 melt #' @importFrom reshape2 dcast #' @examples diff --git a/R/readNWISdata.r b/R/readNWISdata.r index 1c7a8672..43fa1db8 100644 --- a/R/readNWISdata.r +++ b/R/readNWISdata.r @@ -8,7 +8,8 @@ #' (for groundwater levels), "site" (for site service), and "qw" (water-quality). Note: "qw" calls go to: #' \url{http://nwis.waterdata.usgs.gov/usa/nwis/qwdata} for data requests, and use different call requests schemes. #' @param \dots see \url{http://waterservices.usgs.gov/rest/Site-Service.html#Service} for a complete list of options -#' @keywords data import NWIS web service +#' @import utils +#' @import stats #' @return A data frame with the following columns: #' \tabular{lll}{ #' Name \tab Type \tab Description \cr diff --git a/R/whatNWISsites.R b/R/whatNWISsites.R index b271d212..49e34e84 100644 --- a/R/whatNWISsites.R +++ b/R/whatNWISsites.R @@ -5,7 +5,7 @@ #' Mapper format is used #' #' @param \dots see \url{http://waterservices.usgs.gov/rest/Site-Service.html#Service} for a complete list of options -#' @keywords data import NWIS web service +#' @import utils #' @return A data frame with at least the following columns: #' \tabular{lll}{ #' Name \tab Type \tab Description \cr diff --git a/R/whatWQPsites.R b/R/whatWQPsites.R index 7c7fbd07..5109d939 100644 --- a/R/whatWQPsites.R +++ b/R/whatWQPsites.R @@ -48,6 +48,7 @@ #' * element is only in NWIS #' #' @export +#' @import utils #' @examples #' \dontrun{ #' site1 <- whatWQPsites(siteid="USGS-01594440") diff --git a/man/readNWISdata.Rd b/man/readNWISdata.Rd index 0b848a18..14b711fc 100644 --- a/man/readNWISdata.Rd +++ b/man/readNWISdata.Rd @@ -87,9 +87,4 @@ temp <- readNWISdata(bBox=c(-83,36.5,-81,38.5), parameterCd="00010", service="si \seealso{ \code{\link{renameNWISColumns}}, \code{\link{importWaterML1}}, \code{\link{importRDB1}} } -\keyword{NWIS} -\keyword{data} -\keyword{import} -\keyword{service} -\keyword{web} diff --git a/man/whatNWISsites.Rd b/man/whatNWISsites.Rd index 84560490..f5f02f4f 100644 --- a/man/whatNWISsites.Rd +++ b/man/whatNWISsites.Rd @@ -39,9 +39,4 @@ Mapper format is used siteListPhos <- whatNWISsites(stateCd="OH",parameterCd="00665") } } -\keyword{NWIS} -\keyword{data} -\keyword{import} -\keyword{service} -\keyword{web} diff --git a/vignettes/dataRetrieval.Rnw b/vignettes/dataRetrieval.Rnw index bcc1d859..02b20a62 100644 --- a/vignettes/dataRetrieval.Rnw +++ b/vignettes/dataRetrieval.Rnw @@ -2,7 +2,7 @@ %\VignetteEngine{knitr::knitr} %\VignetteDepends{} %\VignetteSuggests{xtable, testthat} -%\VignetteImports{XML, RCurl, reshape2,lubridate,plyr} +%\VignetteImports{XML, RCurl, reshape2,lubridate,plyr,utils,stats} %\VignettePackage{dataRetrieval} \documentclass[a4paper,11pt]{article}