Merge pull request #128 from ldecicco-USGS/master

Getting new CRAN checks to pass.

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 = "[email protected]"),
     person("Laura", "DeCicco", role = c("aut","cre"),
@@ -27,7 +27,9 @@ Imports:
     RCurl,
     reshape2,
     lubridate,
-    plyr
+    plyr,
+    stats,
+    utils
 Suggests:
     xtable,
     knitr,

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)

R/constructNWISURL.r

@@ -22,6 +22,7 @@
 #' @return url string
 #' @export
 #' @import RCurl
+#' @import utils
 #' @examples
 #' siteNumber <- '01594440'
 #' startDate <- '1985-01-01'

R/importRDB1.r

@@ -40,6 +40,8 @@
 #' }
 #' @export
 #' @import RCurl
+#' @import utils
+#' @import stats
 #' @examples
 #' siteNumber <- "02177000"
 #' startDate <- "2012-09-01"

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
 #' 

R/importWaterML1.r

@@ -40,6 +40,8 @@
 #' @export
 #' @import XML
 #' @import RCurl
+#' @import utils
+#' @import stats
 #' @importFrom  reshape2 melt
 #' @importFrom reshape2 dcast
 #' @examples

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

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

R/whatWQPsites.R

@@ -48,6 +48,7 @@
 #' * element is only in NWIS
 #' 
 #' @export
+#' @import utils
 #' @examples
 #' \dontrun{
 #' site1 <- whatWQPsites(siteid="USGS-01594440")

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}
 

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}
 

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}