diff --git a/DESCRIPTION b/DESCRIPTION index 23d8240698db46d53b77e3b20179eae6ecf6282d..72926b7d781d1935a236f525763f4e5efa5903eb 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 4a0b9c2fe2a856d1268c1e6a9eda6f68d9b7aac7..75ba4924ad2b84ad036de7ab5d78eb20ee20c585 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 c5326c8dd2926e4c22b8a6ada849f59bd643eccc..0c5eeb1d20c505cf8fb25d9749fcd83f3817a6ed 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 5b24c6b55318aa950c14cbacacd4920bed587a7c..57c76d7d9bf6b1f82bd5a0a82896b32feae9e3e1 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 4ccf266ad7911e851ae0c967be82c5b36795d2c0..ca53853bfd3f3e48d3a6dc7f0b6ef388a0736279 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 0931e4dc1d4ac2437d3e92a8d5f70f0088bff530..a7db0170598fcddf168e7de227f364b75e210606 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 1c7a8672484fb164e89e20a8c2d869e300c22b49..43fa1db837050b113ed9d3b19335ce8349980202 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 b271d21270169cfc800c9014a95c7f587728120b..49e34e845526c8eb59ed02fa619a9a1c0b159c6a 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 7c7fbd07e2caed2490eae9c0875306618e383e05..5109d939a08c0a0ae1dc20af70d981368ba8cf01 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 0b848a18214785016a292913a6444b7fefa20c3c..14b711fcda79fcdae3580ab31683c3764bc6d124 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 845604906213df661e1a63c7480a7dd5cbcc70c0..f5f02f4f1235cd99ff960b4ab07ebf7015b55044 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 bcc1d85927ac40359299be2046db1614b4d2b7ee..02b20a626851b259fa55778dbacff647e85ae0d6 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}