diff --git a/DESCRIPTION b/DESCRIPTION index e332178b523c36fbb93e107378cadce408f2a2ae..f822328713f6003ae24a1e50cb415293ac3a009c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -57,7 +57,7 @@ Depends: Imports: zoo Suggests: - xtable + xtable, EGRET LazyLoad: yes LazyData: yes diff --git a/NEWS b/NEWS index 11cb6fde009d843077d3fa78c8451bb3587c84a2..955d4c4e2ef0c4ca08283902853f212717f3d56c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +dataRetrieval 1.2.2 +=========== + +* Added getDataAvailability function to find measured parameters and period of record information for a requested station + +* Added constructNWISURL function to get the URL that is used to retrieve the data + + dataRetrieval 1.2.1 =========== @@ -8,13 +16,3 @@ dataRetrieval 1.2.1 * Expanded the capabilities to retrieve raw data from the web services. * Added Storet data retrievals in getWQPData function - -EGRET 1.0.5 -=========== - -* Fixed several bugs - -EGRET 1.0.0 -=========== - -* Initial release. \ No newline at end of file diff --git a/R/getDailyDataFromFile.r b/R/getDailyDataFromFile.r index 36e9918103858cef57c80dfb9e3ec0d69ec361f5..2eb24e429912cbf08d89e9a3d0c55144756a3eab 100644 --- a/R/getDailyDataFromFile.r +++ b/R/getDailyDataFromFile.r @@ -15,9 +15,9 @@ #' @examples #' # Examples of how to use getDailyDataFromFile: #' # Change the file path and file name to something meaningful: -#' #filePath <- '~/RData/' # Sample format +#' filePath <- '~/RData/' # Sample format #' fileName <- 'ChoptankRiverFlow.txt' -#' #getDailyDataFromFile(filePath,fileName,separator="\t") +#' \dontrun{getDailyDataFromFile(filePath,fileName,separator="\t")} getDailyDataFromFile <- function (filePath,fileName,hasHeader=TRUE,separator=",",qUnit=1,interactive=TRUE){ data <- getDataFromFile(filePath,fileName,hasHeader=hasHeader,separator=separator) convertQ<-c(35.314667,1,0.035314667,0.001) diff --git a/R/getPreLoadedData.r b/R/getPreLoadedData.r index 3ad1fde908066fa6c694cfc07a9a1b16ac37a314..2729e97e7e24e9059482757811b7ff8cd5468d4b 100644 --- a/R/getPreLoadedData.r +++ b/R/getPreLoadedData.r @@ -9,13 +9,15 @@ #' @return retval dataframe with dateTime, value, and code columns #' @export #' @examples +#' ChoptankRiverFlow <- ChoptankRiverFlow #' rawData <- getPreLoadedData(ChoptankRiverFlow) +#' rawDataSample <- getPreLoadedData(ChoptankRiverNitrate) getPreLoadedData <- function (rawData){ retval <- as.data.frame(rawData, stringsAsFactors=FALSE) if(ncol(retval) == 2){ names(retval) <- c('dateTime', 'value') } else if (ncol(retval) == 3){ - names(retval) <- c('dateTime', 'value', 'code') + names(retval) <- c('dateTime', 'code', 'value') } retval$dateTime <- as.character(retval$dateTime) if(dateFormatCheck(retval$dateTime)){