diff --git a/DESCRIPTION b/DESCRIPTION index d4561a216fc0ca8835e2a162ea820cc898b27aa1..e5872bcbf627576ce123607d35623f918afae3da 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -9,8 +9,8 @@ Authors@R: c( person("Robert", "Hirsch", role = c("aut"), email = "ldecicco@usgs.gov"), person("David","Lorenz", role=c("aut"), email = "lorenz@usgs.gov")) -Description: Collection of functions to help retrieve USGS data from web - services. +Description: Collection of functions to help retrieve USGS and EPA water + quality and hydrology data from web services. License: Unlimited | file LICENSE Copyright: This software is in the public domain because it contains materials that originally came from the United States Geological Survey, an agency of diff --git a/R/readNWISdv.r b/R/readNWISdv.r index 256c8d7d6e1e9402b39588e1ee6a7d18770354d3..d6e0fd2b189b15e627b647a598d051ad3a2f4344 100644 --- a/R/readNWISdv.r +++ b/R/readNWISdv.r @@ -17,6 +17,7 @@ #' startDate <- '2012-01-01' #' endDate <- '2012-06-30' #' pCode <- '00060' +#' \dontrun{ #' rawDailyQ <- readNWISdv(siteNumber,pCode, startDate, endDate) #' rawDailyQAndTempMeanMax <- readNWISdv(siteNumber,c('00010','00060'), #' startDate, endDate, statCd=c('00001','00003')) @@ -28,6 +29,7 @@ #' names(attributes(x)) #' attr(x, "siteInfo") #' attr(x, "variableInfo") +#' } readNWISdv <- function (siteNumber,parameterCd,startDate="",endDate="",statCd="00003"){ url <- constructNWISURL(siteNumber,parameterCd,startDate,endDate,"dv",statCd=statCd) diff --git a/R/tabbedDataRetrievals.R b/R/tabbedDataRetrievals.R index c626c89ff14ca5a897f7d8aa1d2786149c410be6..0cdd965e4e4c62e0d905ab6ac8874043138e676a 100644 --- a/R/tabbedDataRetrievals.R +++ b/R/tabbedDataRetrievals.R @@ -1,10 +1,10 @@ -#' Retrieval functions for USGS data +#' Retrieval functions for USGS and EPA data #' #' \tabular{ll}{ #' Package: \tab dataRetrieval\cr #' Type: \tab Package\cr -#' Version: \tab 1.5.0\cr -#' Date: \tab 2014-11-16\cr +#' Version: \tab 2.0.0\cr +#' Date: \tab 2014-11-13\cr #' License: \tab Unlimited for this package, dependencies have more restrictive licensing.\cr #' Copyright: \tab This software is in the public domain because it contains materials #' that originally came from the United States Geological Survey, an agency of @@ -14,12 +14,11 @@ #' LazyLoad: \tab yes\cr #' } #' -#' Collection of functions to help retrieve USGS data from either web services or user provided data files. +#' Retrieval functions for USGS and EPA hydrologic and water quality data #' #' @name dataRetrieval-package #' @docType package #' @author Robert M. Hirsch \email{rhirsch@@usgs.gov}, Laura De Cicco \email{ldecicco@@usgs.gov} -#' @references Hirsch, R. M., Moyer, D. L. and Archfield, S. A. (2010), Weighted Regressions on Time, Discharge, and Season (WRTDS), with an Application to Chesapeake Bay River Inputs. JAWRA Journal of the American Water Resources Association, 46: 857-880. doi: 10.1111/j.1752-1688.2010.00482.x #' @keywords data, retrieval NULL diff --git a/R/whatNWISData.r b/R/whatNWISData.r index eb15e93ed3abdded98143f57155790b9729ae59f..17a72cce3fca9979b2d2f381b15d90935a0bd8f6 100644 --- a/R/whatNWISData.r +++ b/R/whatNWISData.r @@ -17,12 +17,14 @@ #' @import RCurl #' @import lubridate #' @examples +#' \dontrun{ #' availableData <- whatNWISdata('05114000') #' # To find just unit value ('instantaneous') data: #' uvData <- whatNWISdata('05114000',service="uv") #' uvDataMulti <- whatNWISdata(c('05114000','09423350'),service=c("uv","dv")) #' siteNumbers <- c("01491000","01645000") #' flowAndTemp <- whatNWISdata(siteNumbers, parameterCd=c("00060","00010")) +#' } whatNWISdata <- function(siteNumbers,service="all",parameterCd="all",statCd="all"){ siteNumber <- paste(siteNumbers,collapse=",") diff --git a/man/dataRetrieval-package.Rd b/man/dataRetrieval-package.Rd index 58cb8dc86251d3d1585d48ed6447c768abd8920d..cb89c066fc36aa91f8b168a0207efaaa8bc2b618 100644 --- a/man/dataRetrieval-package.Rd +++ b/man/dataRetrieval-package.Rd @@ -2,13 +2,13 @@ \docType{package} \name{dataRetrieval-package} \alias{dataRetrieval-package} -\title{Retrieval functions for USGS data} +\title{Retrieval functions for USGS and EPA data} \description{ \tabular{ll}{ Package: \tab dataRetrieval\cr Type: \tab Package\cr -Version: \tab 1.5.0\cr -Date: \tab 2014-11-16\cr +Version: \tab 2.0.0\cr +Date: \tab 2014-11-13\cr License: \tab Unlimited for this package, dependencies have more restrictive licensing.\cr Copyright: \tab This software is in the public domain because it contains materials that originally came from the United States Geological Survey, an agency of @@ -19,14 +19,11 @@ LazyLoad: \tab yes\cr } } \details{ -Collection of functions to help retrieve USGS data from either web services or user provided data files. +Retrieval functions for USGS and EPA hydrologic and water quality data } \author{ Robert M. Hirsch \email{rhirsch@usgs.gov}, Laura De Cicco \email{ldecicco@usgs.gov} } -\references{ -Hirsch, R. M., Moyer, D. L. and Archfield, S. A. (2010), Weighted Regressions on Time, Discharge, and Season (WRTDS), with an Application to Chesapeake Bay River Inputs. JAWRA Journal of the American Water Resources Association, 46: 857-880. doi: 10.1111/j.1752-1688.2010.00482.x -} \keyword{data,} \keyword{retrieval} diff --git a/man/readNWISdv.Rd b/man/readNWISdv.Rd index 507b71d8615d06996ea6b17d72c7087f3db5fc6a..0028fa9200acceca798bf5a7ca6e98a7c2255e78 100644 --- a/man/readNWISdv.Rd +++ b/man/readNWISdv.Rd @@ -34,6 +34,7 @@ siteNumber <- '04085427' startDate <- '2012-01-01' endDate <- '2012-06-30' pCode <- '00060' +\dontrun{ rawDailyQ <- readNWISdv(siteNumber,pCode, startDate, endDate) rawDailyQAndTempMeanMax <- readNWISdv(siteNumber,c('00010','00060'), startDate, endDate, statCd=c('00001','00003')) @@ -46,6 +47,7 @@ names(attributes(x)) attr(x, "siteInfo") attr(x, "variableInfo") } +} \keyword{USGS} \keyword{data} \keyword{import} diff --git a/man/whatNWISData.Rd b/man/whatNWISData.Rd index 2ca8c1ca887c82a189dcfb5d902561586e1e8972..171a9f27324c7ce323c2ff5ffbcec7796049e42d 100644 --- a/man/whatNWISData.Rd +++ b/man/whatNWISData.Rd @@ -30,6 +30,7 @@ Imports a table of available parameters, period of record, and count. See \url{h for more information. } \examples{ +\dontrun{ availableData <- whatNWISdata('05114000') # To find just unit value ('instantaneous') data: uvData <- whatNWISdata('05114000',service="uv") @@ -37,6 +38,7 @@ uvDataMulti <- whatNWISdata(c('05114000','09423350'),service=c("uv","dv")) siteNumbers <- c("01491000","01645000") flowAndTemp <- whatNWISdata(siteNumbers, parameterCd=c("00060","00010")) } +} \keyword{USGS} \keyword{data} \keyword{import}