From fc627161e1d32b96079f89b86d4d939f1f9b613b Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Tue, 23 Apr 2013 10:15:45 -0500
Subject: [PATCH] Devtools suddently cares there's a cariage at the end of the
function.
---
R/constructNWISURL.r | 2 +-
R/getDVData.r | 2 +-
R/getDataAvailability.r | 2 +-
R/getMultipleParameterNames.r | 2 +-
R/getQWData.r | 2 +-
R/getRDB1Data.r | 2 +-
R/getWQPData.r | 2 +-
R/getWaterML1Data.r | 2 +-
R/padVariable.r | 2 +-
R/processQWData.r | 2 +-
R/retrieveNWISData.r | 2 +-
R/tabbedDataRetrievals.R | 2 +-
man/checkStartEndDate.Rd | 2 +-
man/compressData.Rd | 2 +-
man/constructNWISURL.Rd | 2 +-
man/dataOverview.Rd | 4 ++--
man/dateFormatCheck.Rd | 2 +-
man/formatCheckDate.Rd | 2 +-
man/formatCheckParameterCd.Rd | 2 +-
man/formatCheckSiteNumber.Rd | 2 +-
man/getDVData.Rd | 4 ++--
man/getDailyDataFromFile.Rd | 4 ++--
man/getDataAvailability.Rd | 2 +-
man/getMetaData.Rd | 4 ++--
man/getMultipleParameterNames.Rd | 2 +-
man/getParameterInfo.Rd | 2 +-
man/getPreLoadedDailyData.Rd | 2 +-
man/getPreLoadedSampleData.Rd | 2 +-
man/getQWData.Rd | 2 +-
man/getRawQWData.Rd | 2 +-
man/getSampleData.Rd | 4 ++--
man/getSampleDataFromFile.Rd | 4 ++--
man/getSiteFileData.Rd | 2 +-
man/getWQPData.Rd | 2 +-
man/mergeReport.Rd | 4 ++--
man/padVariable.Rd | 2 +-
man/populateDaily.Rd | 2 +-
man/processQWData.Rd | 2 +-
man/retrieveNWISData.Rd | 2 +-
man/retrieveNWISqwData.Rd | 2 +-
man/retrieveUnitNWISData.Rd | 2 +-
41 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r
index 9a42b274..40235cd9 100644
--- a/R/constructNWISURL.r
+++ b/R/constructNWISURL.r
@@ -150,4 +150,4 @@ constructNWISURL <- function(siteNumber,parameterCd,startDate,endDate,service,st
)
return(url)
-}
\ No newline at end of file
+}
diff --git a/R/getDVData.r b/R/getDVData.r
index 887362f2..a3d4ae68 100644
--- a/R/getDVData.r
+++ b/R/getDVData.r
@@ -29,4 +29,4 @@ getDVData <- function (siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE
qConvert<- ifelse(convert,35.314667,1)
localDaily <- populateDaily(data,qConvert,interactive=interactive)
return (localDaily)
-}
\ No newline at end of file
+}
diff --git a/R/getDataAvailability.r b/R/getDataAvailability.r
index a9920a18..cdb11765 100644
--- a/R/getDataAvailability.r
+++ b/R/getDataAvailability.r
@@ -46,4 +46,4 @@ getDataAvailability <- function(siteNumber="",interactive=TRUE, longNames=FALSE)
}
return(SiteFile)
-}
\ No newline at end of file
+}
diff --git a/R/getMultipleParameterNames.r b/R/getMultipleParameterNames.r
index 83afe7c0..fa8ff053 100644
--- a/R/getMultipleParameterNames.r
+++ b/R/getMultipleParameterNames.r
@@ -29,4 +29,4 @@ getMultipleParameterNames <- function(pCodes, interactive=TRUE){
}
}
return(pcodeINFO)
-}
\ No newline at end of file
+}
diff --git a/R/getQWData.r b/R/getQWData.r
index 028bc98a..8d452b3e 100644
--- a/R/getQWData.r
+++ b/R/getQWData.r
@@ -22,4 +22,4 @@ getQWData <- function(siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE)
rawSample <- getRawQWData(siteNumber,ParameterCd,StartDate,EndDate,interactive)
retval <- processQWData(rawSample)
return(retval)
-}
\ No newline at end of file
+}
diff --git a/R/getRDB1Data.r b/R/getRDB1Data.r
index 6b94831b..ded1fa2b 100644
--- a/R/getRDB1Data.r
+++ b/R/getRDB1Data.r
@@ -42,4 +42,4 @@ getRDB1Data <- function(obs_url,asDateTime=FALSE){
data[,which(regexpr('n$', dataType) > 0)] <- tempDF
row.names(data) <- NULL
return(data)
-}
\ No newline at end of file
+}
diff --git a/R/getWQPData.r b/R/getWQPData.r
index 9f8cae0e..6ef45036 100644
--- a/R/getWQPData.r
+++ b/R/getWQPData.r
@@ -82,4 +82,4 @@ getWQPData <- function(siteNumber,characteristicName,StartDate,EndDate,interacti
data$dateTime <- as.Date(data$dateTime)
return(data)
-}
\ No newline at end of file
+}
diff --git a/R/getWaterML1Data.r b/R/getWaterML1Data.r
index 9f79f295..aa9f7b5b 100644
--- a/R/getWaterML1Data.r
+++ b/R/getWaterML1Data.r
@@ -90,4 +90,4 @@ getWaterML1Data <- function(obs_url){
mergedDF <- mergedDF[,reorder]
return (mergedDF)
-}
\ No newline at end of file
+}
diff --git a/R/padVariable.r b/R/padVariable.r
index de4f6500..740fd98c 100644
--- a/R/padVariable.r
+++ b/R/padVariable.r
@@ -17,4 +17,4 @@ padVariable <- function(x,padTo){
x <- paste(leadingZeros,x,sep="")
}
return(x)
-}
\ No newline at end of file
+}
diff --git a/R/processQWData.r b/R/processQWData.r
index 10a1d50b..1bf93416 100644
--- a/R/processQWData.r
+++ b/R/processQWData.r
@@ -42,4 +42,4 @@ processQWData <- function(data){
data$dateTime <- format(data$dateTime, "%Y-%m-%d")
data$dateTime <- as.Date(data$dateTime)
return(data)
-}
\ No newline at end of file
+}
diff --git a/R/retrieveNWISData.r b/R/retrieveNWISData.r
index fb3c7d36..ca901e99 100644
--- a/R/retrieveNWISData.r
+++ b/R/retrieveNWISData.r
@@ -38,4 +38,4 @@ retrieveNWISData <- function (siteNumber,ParameterCd,StartDate,EndDate,StatCd="0
}
return (data)
-}
\ No newline at end of file
+}
diff --git a/R/tabbedDataRetrievals.R b/R/tabbedDataRetrievals.R
index 9cd5823b..bc88c537 100644
--- a/R/tabbedDataRetrievals.R
+++ b/R/tabbedDataRetrievals.R
@@ -43,4 +43,4 @@ NULL
#' @docType data
#' @author Robert M. Hirsch \email{rhirsch@@usgs.gov}
#' @keywords water flow data
-NULL
\ No newline at end of file
+NULL
diff --git a/man/checkStartEndDate.Rd b/man/checkStartEndDate.Rd
index aa1aa871..892f64cc 100644
--- a/man/checkStartEndDate.Rd
+++ b/man/checkStartEndDate.Rd
@@ -26,6 +26,6 @@ startDate <- '1985-01-01'
endDate <- '1990-01-01'
checkStartEndDate(startDate, endDate, interactive = FALSE)
}
-\keyword{flow}
\keyword{WRTDS}
+\keyword{flow}
diff --git a/man/compressData.Rd b/man/compressData.Rd
index 17d40a4d..92d9134d 100644
--- a/man/compressData.Rd
+++ b/man/compressData.Rd
@@ -36,6 +36,6 @@ value3 <- c(3,4,5)
dataInput <- data.frame(dateTime, comment1, value1, comment2, value2, comment3, value3, stringsAsFactors=FALSE)
compressData(dataInput, interactive=FALSE)
}
-\keyword{flow}
\keyword{WRTDS}
+\keyword{flow}
diff --git a/man/constructNWISURL.Rd b/man/constructNWISURL.Rd
index 33fd4f50..d27f4d78 100644
--- a/man/constructNWISURL.Rd
+++ b/man/constructNWISURL.Rd
@@ -67,9 +67,9 @@ url_qw <- constructNWISURL(siteNumber,c('01075','00029','00453'),startDate,endDa
url_wqp <- constructNWISURL(siteNumber,c('01075','00029','00453'),startDate,endDate,'wqp')
url_daily_tsv <- constructNWISURL(siteNumber,pCode,startDate,endDate,'dv',statCd=c("00003","00001"),format="tsv")
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/dataOverview.Rd b/man/dataOverview.Rd
index c99da9b5..6fe56a3a 100644
--- a/man/dataOverview.Rd
+++ b/man/dataOverview.Rd
@@ -21,8 +21,8 @@ dataOverview(localDaily = exDaily, localSample = exSample)
\seealso{
\code{\link{mergeReport}}
}
-\keyword{data}
-\keyword{import}
\keyword{USGS}
\keyword{WRTDS}
+\keyword{data}
+\keyword{import}
diff --git a/man/dateFormatCheck.Rd b/man/dateFormatCheck.Rd
index 99532817..dd75fee6 100644
--- a/man/dateFormatCheck.Rd
+++ b/man/dateFormatCheck.Rd
@@ -18,6 +18,6 @@
date <- '1985-01-01'
dateFormatCheck(date)
}
-\keyword{flow}
\keyword{WRTDS}
+\keyword{flow}
diff --git a/man/formatCheckDate.Rd b/man/formatCheckDate.Rd
index 0bf86371..64c54b65 100644
--- a/man/formatCheckDate.Rd
+++ b/man/formatCheckDate.Rd
@@ -27,6 +27,6 @@ Date <- '1985-01-01'
dateString <- 'StartDate'
formatCheckDate(Date, dateString, interactive = FALSE)
}
-\keyword{flow}
\keyword{WRTDS}
+\keyword{flow}
diff --git a/man/formatCheckParameterCd.Rd b/man/formatCheckParameterCd.Rd
index 086bea0a..d1574546 100644
--- a/man/formatCheckParameterCd.Rd
+++ b/man/formatCheckParameterCd.Rd
@@ -23,6 +23,6 @@
pCode <- '01234'
formatCheckParameterCd(pCode, interactive = FALSE)
}
-\keyword{flow}
\keyword{WRTDS}
+\keyword{flow}
diff --git a/man/formatCheckSiteNumber.Rd b/man/formatCheckSiteNumber.Rd
index 60a912a6..5d8b42cd 100644
--- a/man/formatCheckSiteNumber.Rd
+++ b/man/formatCheckSiteNumber.Rd
@@ -22,6 +22,6 @@
site<- '01234567'
formatCheckSiteNumber(site, interactive = FALSE)
}
-\keyword{flow}
\keyword{WRTDS}
+\keyword{flow}
diff --git a/man/getDVData.Rd b/man/getDVData.Rd
index 628b9259..89c721c6 100644
--- a/man/getDVData.Rd
+++ b/man/getDVData.Rd
@@ -57,8 +57,8 @@ Daily <- getDVData('01594440','00060', '1985-01-01', '1985-03-31', interactive=F
\code{\link{retrieveNWISData}},
\code{\link{populateDaily}}
}
-\keyword{data}
-\keyword{import}
\keyword{USGS}
\keyword{WRTDS}
+\keyword{data}
+\keyword{import}
diff --git a/man/getDailyDataFromFile.Rd b/man/getDailyDataFromFile.Rd
index 95f1ece4..2c8ded37 100644
--- a/man/getDailyDataFromFile.Rd
+++ b/man/getDailyDataFromFile.Rd
@@ -40,9 +40,9 @@ filePath <- '~/RData/' # Sample format
fileName <- 'ChoptankRiverFlow.txt'
\dontrun{getDailyDataFromFile(filePath,fileName,separator="\\t")}
}
+\keyword{USGS}
+\keyword{WRTDS}
\keyword{data}
\keyword{file}
\keyword{import}
-\keyword{USGS}
-\keyword{WRTDS}
diff --git a/man/getDataAvailability.Rd b/man/getDataAvailability.Rd
index fd9d4603..06dbf8e0 100644
--- a/man/getDataAvailability.Rd
+++ b/man/getDataAvailability.Rd
@@ -31,9 +31,9 @@
# These examples require an internet connection to run
availableData <- getDataAvailability('05114000',interactive=FALSE)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/getMetaData.Rd b/man/getMetaData.Rd
index 77a11bcf..fb57f7d8 100644
--- a/man/getMetaData.Rd
+++ b/man/getMetaData.Rd
@@ -39,10 +39,10 @@
# Automatically gets information about site 05114000 and temperature, no interaction with user
INFO <- getMetaData('05114000','00010',interactive=FALSE)
}
+\keyword{USGS}
+\keyword{WRTDS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
-\keyword{WRTDS}
diff --git a/man/getMultipleParameterNames.Rd b/man/getMultipleParameterNames.Rd
index 3177e1b6..dc266131 100644
--- a/man/getMultipleParameterNames.Rd
+++ b/man/getMultipleParameterNames.Rd
@@ -28,9 +28,9 @@
# These examples require an internet connection to run
availableData <- getMultipleParameterNames(c("00060", "00065", "00010"),interactive=FALSE)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/getParameterInfo.Rd b/man/getParameterInfo.Rd
index 6344c898..fb9df676 100644
--- a/man/getParameterInfo.Rd
+++ b/man/getParameterInfo.Rd
@@ -28,9 +28,9 @@
paramINFO <- getParameterInfo('01075')
paramINFO2 <- getParameterInfo('00931',interactive=FALSE)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/getPreLoadedDailyData.Rd b/man/getPreLoadedDailyData.Rd
index a39fbbe6..8be9941c 100644
--- a/man/getPreLoadedDailyData.Rd
+++ b/man/getPreLoadedDailyData.Rd
@@ -28,7 +28,7 @@
\examples{
Daily <- getPreLoadedDailyData(ChoptankRiverFlow, interactive=FALSE)
}
+\keyword{WRTDS}
\keyword{data}
\keyword{import}
-\keyword{WRTDS}
diff --git a/man/getPreLoadedSampleData.Rd b/man/getPreLoadedSampleData.Rd
index 50708517..1e8834a4 100644
--- a/man/getPreLoadedSampleData.Rd
+++ b/man/getPreLoadedSampleData.Rd
@@ -23,7 +23,7 @@
\examples{
Sample <- getPreLoadedSampleData(ChoptankRiverNitrate, interactive=FALSE)
}
+\keyword{WRTDS}
\keyword{data}
\keyword{import}
-\keyword{WRTDS}
diff --git a/man/getQWData.Rd b/man/getQWData.Rd
index f38d6a23..8348de8d 100644
--- a/man/getQWData.Rd
+++ b/man/getQWData.Rd
@@ -46,9 +46,9 @@ rawProcessedSample <- getQWData('01594440','01075', '1985-01-01', '1985-03-31')
rawProcessedSampleAll <- getQWData('05114000','', '1985-01-01', '1985-03-31')
rawProcessedSampleSelect <- getQWData('05114000','00915;00931', '1985-01-01', '1985-04-30', interactive=FALSE)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/getRawQWData.Rd b/man/getRawQWData.Rd
index a77fc37f..738023e6 100644
--- a/man/getRawQWData.Rd
+++ b/man/getRawQWData.Rd
@@ -45,9 +45,9 @@ rawSample <- getRawQWData('01594440','01075', '1985-01-01', '1985-03-31')
rawSampleAll <- getRawQWData('05114000','', '1985-01-01', '1985-03-31')
rawSampleSelect <- getRawQWData('05114000',c('00915','00931'), '1985-01-01', '1985-04-30', interactive=FALSE)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/getSampleData.Rd b/man/getSampleData.Rd
index 782b13c6..f8fc6db8 100644
--- a/man/getSampleData.Rd
+++ b/man/getSampleData.Rd
@@ -46,8 +46,8 @@ Sample_Select <- getSampleData('05114000','00915;00931', '', '', interactive=FAL
\code{\link{compressData}},
\code{\link{populateSampleColumns}}
}
-\keyword{data}
-\keyword{import}
\keyword{USGS}
\keyword{WRTDS}
+\keyword{data}
+\keyword{import}
diff --git a/man/getSampleDataFromFile.Rd b/man/getSampleDataFromFile.Rd
index 34a0e31d..f295b54c 100644
--- a/man/getSampleDataFromFile.Rd
+++ b/man/getSampleDataFromFile.Rd
@@ -35,9 +35,9 @@ filePath <- '~/RData/' # Sample format
fileName <- 'ChoptankRiverNitrate.csv'
#Sample <- getSampleDataFromFile(filePath,fileName, separator=";",interactive=FALSE)
}
+\keyword{USGS}
+\keyword{WRTDS}
\keyword{data}
\keyword{file}
\keyword{import}
-\keyword{USGS}
-\keyword{WRTDS}
diff --git a/man/getSiteFileData.Rd b/man/getSiteFileData.Rd
index 53291b62..37a7d14a 100644
--- a/man/getSiteFileData.Rd
+++ b/man/getSiteFileData.Rd
@@ -24,9 +24,9 @@
# These examples require an internet connection to run
siteINFO <- getSiteFileData('05114000',interactive=FALSE)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/getWQPData.Rd b/man/getWQPData.Rd
index 3f5c8e14..a3b275d4 100644
--- a/man/getWQPData.Rd
+++ b/man/getWQPData.Rd
@@ -43,9 +43,9 @@
getWQPData('USGS-01594440','Chloride', '', '')
getWQPData('WIDNR_WQX-10032762','Specific conductance', '', '')
}
+\keyword{WQP}
\keyword{data}
\keyword{import}
\keyword{service}
\keyword{web}
-\keyword{WQP}
diff --git a/man/mergeReport.Rd b/man/mergeReport.Rd
index 800f34ba..5efff9d3 100644
--- a/man/mergeReport.Rd
+++ b/man/mergeReport.Rd
@@ -33,8 +33,8 @@ Sample <- mergeReport(interactive=FALSE)
\code{\link{getDVData}},
\code{\link{populateSampleColumns}}
}
-\keyword{data}
-\keyword{import}
\keyword{USGS}
\keyword{WRTDS}
+\keyword{data}
+\keyword{import}
diff --git a/man/padVariable.Rd b/man/padVariable.Rd
index 90a16677..cf3aee54 100644
--- a/man/padVariable.Rd
+++ b/man/padVariable.Rd
@@ -20,9 +20,9 @@
pCode <- '10'
correctPCode <- padVariable(pCode,5)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/populateDaily.Rd b/man/populateDaily.Rd
index e59aafb2..5722f563 100644
--- a/man/populateDaily.Rd
+++ b/man/populateDaily.Rd
@@ -33,6 +33,6 @@ Daily <- populateDaily(dataInput, 2, interactive=FALSE)
\author{
Robert M. Hirsch \email{rhirsch@usgs.gov}
}
-\keyword{flow}
\keyword{WRTDS}
+\keyword{flow}
diff --git a/man/processQWData.Rd b/man/processQWData.Rd
index d5cc0757..660c8bb5 100644
--- a/man/processQWData.Rd
+++ b/man/processQWData.Rd
@@ -25,9 +25,9 @@
rawSample <- getRawQWData('01594440','01075', '1985-01-01', '1985-03-31')
rawSampleSelect <- processQWData(rawSample)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/retrieveNWISData.Rd b/man/retrieveNWISData.Rd
index b89cdc3f..8d7ce45c 100644
--- a/man/retrieveNWISData.Rd
+++ b/man/retrieveNWISData.Rd
@@ -60,9 +60,9 @@ rawDailyTemperature <- retrieveNWISData(siteNumber,'00010', startDate, endDate,
rawDailyTemperatureTSV <- retrieveNWISData(siteNumber,'00010', startDate, endDate, StatCd='00001',format="tsv",interactive=FALSE)
rawDailyQAndTempMeanMax <- retrieveNWISData(siteNumber,c('00010','00060'), startDate, endDate, StatCd=c('00001','00003'), interactive=FALSE)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/retrieveNWISqwData.Rd b/man/retrieveNWISqwData.Rd
index 4e5a169e..254045c7 100644
--- a/man/retrieveNWISqwData.Rd
+++ b/man/retrieveNWISqwData.Rd
@@ -44,9 +44,9 @@ data$dateTime <- as.Date(data$dateTime)
compressedData <- compressData(data, interactive=interactive)
Sample <- populateSampleColumns(compressedData)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
diff --git a/man/retrieveUnitNWISData.Rd b/man/retrieveUnitNWISData.Rd
index 5109fd5c..f69c1294 100644
--- a/man/retrieveUnitNWISData.Rd
+++ b/man/retrieveUnitNWISData.Rd
@@ -54,9 +54,9 @@ EndDate <- as.character(Sys.Date())
rawData <- retrieveUnitNWISData(siteNumber,ParameterCd,StartDate,EndDate,interactive=FALSE)
rawData2 <- retrieveUnitNWISData(siteNumber,ParameterCd,StartDate,EndDate,"tsv",interactive=FALSE)
}
+\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
-\keyword{USGS}
\keyword{web}
--
GitLab