diff --git a/R/retrieveNWISData.r b/R/retrieveNWISData.r index b003fd98fb385c6a14c3095a577b60027f14738a..fe1288743015113045733a966901c57f9b7ca35b 100644 --- a/R/retrieveNWISData.r +++ b/R/retrieveNWISData.r @@ -5,10 +5,10 @@ #' A list of statistic codes can be found here: \url{http://help.waterdata.usgs.gov/code/stat_code_query?fmt=html} #' #' @param siteNumber string USGS site number. This is usually an 8 digit number -#' @param ParameterCd string or vector of USGS parameter code. This is usually an 5 digit number.. -#' @param StartDate string starting date for data retrieval in the form YYYY-MM-DD. -#' @param EndDate string ending date for data retrieval in the form YYYY-MM-DD. -#' @param StatCd string USGS statistic code. This is usually 5 digits. Daily mean (00003) is the default. +#' @param parameterCd string or vector of USGS parameter code. This is usually an 5 digit number.. +#' @param startDate string starting date for data retrieval in the form YYYY-MM-DD. +#' @param endDate string ending date for data retrieval in the form YYYY-MM-DD. +#' @param statCd string USGS statistic code. This is usually 5 digits. Daily mean (00003) is the default. #' @param format string, can be 'tsv' or 'xml', and is only applicable for daily and unit value requests. 'tsv' returns results faster, but there is a possiblitiy that an incomplete file is returned without warning. XML is slower, #' but will offer a warning if the file was incomplete (for example, if there was a momentary problem with the internet connection). It is possible to safely use the 'tsv' option, #' but the user must carefully check the results to see if the data returns matches what is expected. The default is 'tsv'. @@ -23,12 +23,12 @@ #' endDate <- '2012-06-30' #' pCode <- '00060' #' rawDailyQ <- retrieveNWISdvData(siteNumber,pCode, startDate, endDate) -#' rawDailyTemperature <- retrieveNWISdvData(siteNumber,'00010', startDate, endDate, StatCd='00001') -#' rawDailyTemperatureTSV <- retrieveNWISdvData(siteNumber,'00010', startDate, endDate, StatCd='00001',format='tsv') -#' rawDailyQAndTempMeanMax <- retrieveNWISdvData(siteNumber,c('00010','00060'), startDate, endDate, StatCd=c('00001','00003')) -retrieveNWISdvData <- function (siteNumber,ParameterCd,StartDate,EndDate,StatCd="00003",format="tsv",interactive=TRUE){ +#' rawDailyTemperature <- retrieveNWISdvData(siteNumber,'00010', startDate, endDate, statCd='00001') +#' rawDailyTemperatureTSV <- retrieveNWISdvData(siteNumber,'00010', startDate, endDate, statCd='00001',format='tsv') +#' rawDailyQAndTempMeanMax <- retrieveNWISdvData(siteNumber,c('00010','00060'), startDate, endDate, statCd=c('00001','00003')) +retrieveNWISdvData <- function (siteNumber,parameterCd,startDate,endDate,statCd="00003",format="tsv",interactive=TRUE){ - url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"dv",statCd=StatCd,format=format,interactive=interactive) + url <- constructNWISURL(siteNumber,parameterCd,startDate,endDate,"dv",statCd=statCd,format=format,interactive=interactive) if (format == "xml") { data <- getWaterML1Data(url)