Skip to content
Snippets Groups Projects
Commit fc627161 authored by Laura A DeCicco's avatar Laura A DeCicco
Browse files

Devtools suddently cares there's a cariage at the end of the function.

parent 59832419
No related branches found
No related tags found
No related merge requests found
Showing with 21 additions and 21 deletions
...@@ -150,4 +150,4 @@ constructNWISURL <- function(siteNumber,parameterCd,startDate,endDate,service,st ...@@ -150,4 +150,4 @@ constructNWISURL <- function(siteNumber,parameterCd,startDate,endDate,service,st
) )
return(url) return(url)
} }
\ No newline at end of file
...@@ -29,4 +29,4 @@ getDVData <- function (siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE ...@@ -29,4 +29,4 @@ getDVData <- function (siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE
qConvert<- ifelse(convert,35.314667,1) qConvert<- ifelse(convert,35.314667,1)
localDaily <- populateDaily(data,qConvert,interactive=interactive) localDaily <- populateDaily(data,qConvert,interactive=interactive)
return (localDaily) return (localDaily)
} }
\ No newline at end of file
...@@ -46,4 +46,4 @@ getDataAvailability <- function(siteNumber="",interactive=TRUE, longNames=FALSE) ...@@ -46,4 +46,4 @@ getDataAvailability <- function(siteNumber="",interactive=TRUE, longNames=FALSE)
} }
return(SiteFile) return(SiteFile)
} }
\ No newline at end of file
...@@ -29,4 +29,4 @@ getMultipleParameterNames <- function(pCodes, interactive=TRUE){ ...@@ -29,4 +29,4 @@ getMultipleParameterNames <- function(pCodes, interactive=TRUE){
} }
} }
return(pcodeINFO) return(pcodeINFO)
} }
\ No newline at end of file
...@@ -22,4 +22,4 @@ getQWData <- function(siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE) ...@@ -22,4 +22,4 @@ getQWData <- function(siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE)
rawSample <- getRawQWData(siteNumber,ParameterCd,StartDate,EndDate,interactive) rawSample <- getRawQWData(siteNumber,ParameterCd,StartDate,EndDate,interactive)
retval <- processQWData(rawSample) retval <- processQWData(rawSample)
return(retval) return(retval)
} }
\ No newline at end of file
...@@ -42,4 +42,4 @@ getRDB1Data <- function(obs_url,asDateTime=FALSE){ ...@@ -42,4 +42,4 @@ getRDB1Data <- function(obs_url,asDateTime=FALSE){
data[,which(regexpr('n$', dataType) > 0)] <- tempDF data[,which(regexpr('n$', dataType) > 0)] <- tempDF
row.names(data) <- NULL row.names(data) <- NULL
return(data) return(data)
} }
\ No newline at end of file
...@@ -82,4 +82,4 @@ getWQPData <- function(siteNumber,characteristicName,StartDate,EndDate,interacti ...@@ -82,4 +82,4 @@ getWQPData <- function(siteNumber,characteristicName,StartDate,EndDate,interacti
data$dateTime <- as.Date(data$dateTime) data$dateTime <- as.Date(data$dateTime)
return(data) return(data)
} }
\ No newline at end of file
...@@ -90,4 +90,4 @@ getWaterML1Data <- function(obs_url){ ...@@ -90,4 +90,4 @@ getWaterML1Data <- function(obs_url){
mergedDF <- mergedDF[,reorder] mergedDF <- mergedDF[,reorder]
return (mergedDF) return (mergedDF)
} }
\ No newline at end of file
...@@ -17,4 +17,4 @@ padVariable <- function(x,padTo){ ...@@ -17,4 +17,4 @@ padVariable <- function(x,padTo){
x <- paste(leadingZeros,x,sep="") x <- paste(leadingZeros,x,sep="")
} }
return(x) return(x)
} }
\ No newline at end of file
...@@ -42,4 +42,4 @@ processQWData <- function(data){ ...@@ -42,4 +42,4 @@ processQWData <- function(data){
data$dateTime <- format(data$dateTime, "%Y-%m-%d") data$dateTime <- format(data$dateTime, "%Y-%m-%d")
data$dateTime <- as.Date(data$dateTime) data$dateTime <- as.Date(data$dateTime)
return(data) return(data)
} }
\ No newline at end of file
...@@ -38,4 +38,4 @@ retrieveNWISData <- function (siteNumber,ParameterCd,StartDate,EndDate,StatCd="0 ...@@ -38,4 +38,4 @@ retrieveNWISData <- function (siteNumber,ParameterCd,StartDate,EndDate,StatCd="0
} }
return (data) return (data)
} }
\ No newline at end of file
...@@ -43,4 +43,4 @@ NULL ...@@ -43,4 +43,4 @@ NULL
#' @docType data #' @docType data
#' @author Robert M. Hirsch \email{rhirsch@@usgs.gov} #' @author Robert M. Hirsch \email{rhirsch@@usgs.gov}
#' @keywords water flow data #' @keywords water flow data
NULL NULL
\ No newline at end of file
...@@ -26,6 +26,6 @@ startDate <- '1985-01-01' ...@@ -26,6 +26,6 @@ startDate <- '1985-01-01'
endDate <- '1990-01-01' endDate <- '1990-01-01'
checkStartEndDate(startDate, endDate, interactive = FALSE) checkStartEndDate(startDate, endDate, interactive = FALSE)
} }
\keyword{flow}
\keyword{WRTDS} \keyword{WRTDS}
\keyword{flow}
...@@ -36,6 +36,6 @@ value3 <- c(3,4,5) ...@@ -36,6 +36,6 @@ value3 <- c(3,4,5)
dataInput <- data.frame(dateTime, comment1, value1, comment2, value2, comment3, value3, stringsAsFactors=FALSE) dataInput <- data.frame(dateTime, comment1, value1, comment2, value2, comment3, value3, stringsAsFactors=FALSE)
compressData(dataInput, interactive=FALSE) compressData(dataInput, interactive=FALSE)
} }
\keyword{flow}
\keyword{WRTDS} \keyword{WRTDS}
\keyword{flow}
...@@ -67,9 +67,9 @@ url_qw <- constructNWISURL(siteNumber,c('01075','00029','00453'),startDate,endDa ...@@ -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_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") url_daily_tsv <- constructNWISURL(siteNumber,pCode,startDate,endDate,'dv',statCd=c("00003","00001"),format="tsv")
} }
\keyword{USGS}
\keyword{data} \keyword{data}
\keyword{import} \keyword{import}
\keyword{service} \keyword{service}
\keyword{USGS}
\keyword{web} \keyword{web}
...@@ -21,8 +21,8 @@ dataOverview(localDaily = exDaily, localSample = exSample) ...@@ -21,8 +21,8 @@ dataOverview(localDaily = exDaily, localSample = exSample)
\seealso{ \seealso{
\code{\link{mergeReport}} \code{\link{mergeReport}}
} }
\keyword{data}
\keyword{import}
\keyword{USGS} \keyword{USGS}
\keyword{WRTDS} \keyword{WRTDS}
\keyword{data}
\keyword{import}
...@@ -18,6 +18,6 @@ ...@@ -18,6 +18,6 @@
date <- '1985-01-01' date <- '1985-01-01'
dateFormatCheck(date) dateFormatCheck(date)
} }
\keyword{flow}
\keyword{WRTDS} \keyword{WRTDS}
\keyword{flow}
...@@ -27,6 +27,6 @@ Date <- '1985-01-01' ...@@ -27,6 +27,6 @@ Date <- '1985-01-01'
dateString <- 'StartDate' dateString <- 'StartDate'
formatCheckDate(Date, dateString, interactive = FALSE) formatCheckDate(Date, dateString, interactive = FALSE)
} }
\keyword{flow}
\keyword{WRTDS} \keyword{WRTDS}
\keyword{flow}
...@@ -23,6 +23,6 @@ ...@@ -23,6 +23,6 @@
pCode <- '01234' pCode <- '01234'
formatCheckParameterCd(pCode, interactive = FALSE) formatCheckParameterCd(pCode, interactive = FALSE)
} }
\keyword{flow}
\keyword{WRTDS} \keyword{WRTDS}
\keyword{flow}
...@@ -22,6 +22,6 @@ ...@@ -22,6 +22,6 @@
site<- '01234567' site<- '01234567'
formatCheckSiteNumber(site, interactive = FALSE) formatCheckSiteNumber(site, interactive = FALSE)
} }
\keyword{flow}
\keyword{WRTDS} \keyword{WRTDS}
\keyword{flow}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment