From 25e144f40afe60af3b7c648eebcd8ef57783a827 Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Thu, 14 Mar 2013 11:19:19 -0500
Subject: [PATCH] Added some examples.
---
DESCRIPTION | 2 +-
NEWS | 18 ++++++++----------
R/getDailyDataFromFile.r | 4 ++--
R/getPreLoadedData.r | 4 +++-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index e332178b..f8223287 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 11cb6fde..955d4c4e 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 36e99181..2eb24e42 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 3ad1fde9..2729e97e 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)){
--
GitLab