diff --git a/NAMESPACE b/NAMESPACE
index da28655b01bc5179810dd2220326bf9a9fe12153..040e62c0f0a5b1ea634cdcc328aafd5409f8967e 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -6,10 +6,10 @@ export(dateFormatCheck)
export(formatCheckDate)
export(formatCheckParameterCd)
export(formatCheckSiteNumber)
-export(getDVData)
export(getDailyDataFromFile)
export(getDataAvailability)
export(getDataFromFile)
+export(getDVData)
export(getMetaData)
export(getMultipleParameterNames)
export(getParameterInfo)
diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r
index 7b07fda6310fbea9285c94aa79ed4d153919d489..0e1eeb436893b783fa2faeb14830d956eedede0a 100644
--- a/R/constructNWISURL.r
+++ b/R/constructNWISURL.r
@@ -8,7 +8,7 @@
#' @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 only used for daily value service. This is usually 5 digits. Daily mean (00003) is the default.
+#' @param statCd string or vector USGS statistic code only used for daily value service. This is usually 5 digits. Daily mean (00003) is the default.
#' @param service string USGS service to call. Possible values are "dv" (daily values), "uv" (unit/instantaneous values), "qw" (water quality data), and "wqp" (water quality portal, which can include STORET).
#' @keywords data import USGS web service
#' @return url string
@@ -18,7 +18,7 @@
#' startDate <- '2012-01-01'
#' endDate <- '2012-06-30'
#' pCode <- c("00060","00010")
-#' url_daily <- constructNWISURL(siteNumber,pCode,startDate,endDate,'dv')
+#' url_daily <- constructNWISURL(siteNumber,pCode,startDate,endDate,'dv',statCd=c("00003","00001"))
#' url_unit <- constructNWISURL(siteNumber,pCode,startDate,endDate,'iv')
#' url_qw_single <- constructNWISURL(siteNumber,"34220",startDate,endDate,'qwdata')
#' url_qw <- constructNWISURL(siteNumber,c('34247','30234','32104','34220'),startDate,endDate,'qwdata')
@@ -115,6 +115,10 @@ constructNWISURL <- function(siteNumber,parameterCd,startDate,endDate,service,st
url <- paste(baseURL,"?site=",siteNumber, "&ParameterCd=",parameterCd, "&format=rdb,1.0", sep = "")
if("dv"==service) {
+ if(length(statCd) > 1){
+ statCd <- paste(statCd, collapse=",")
+ }
+
url <- paste(url, "&StatCd=", statCd, sep = "")
}
diff --git a/R/retrieveNWISData.r b/R/retrieveNWISData.r
index db094ca761bd3bd52ed3ff193e64f1f46e679b76..92934106096a0a5cdfa95f79d92c112af30f12f8 100644
--- a/R/retrieveNWISData.r
+++ b/R/retrieveNWISData.r
@@ -21,7 +21,7 @@
#' pCode <- "00060"
#' rawDailyQ <- retrieveNWISData(siteNumber,pCode, startDate, endDate)
#' rawDailyTemperature <- retrieveNWISData(siteNumber,'00010', startDate, endDate, StatCd='00001',interactive=FALSE)
-#' rawDailyQAndTempMeanMax <- retrieveNWISData(siteNumber,'00010,00060', startDate, endDate, StatCd='00001,00003', interactive=FALSE)
+#' rawDailyQAndTempMeanMax <- retrieveNWISData(siteNumber,c('00010','00060'), startDate, endDate, StatCd=c('00001','00003'), interactive=FALSE)
retrieveNWISData <- function (siteNumber,ParameterCd,StartDate,EndDate,StatCd="00003",interactive=TRUE){
url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"dv",StatCd)
diff --git a/R/retrieveUnitNWISData.r b/R/retrieveUnitNWISData.r
index d4eda05d5b6b72a149dca8677e887eb037eb5f41..d2254a451bf1cd9d806b58a4823e4f853e02ad80 100644
--- a/R/retrieveUnitNWISData.r
+++ b/R/retrieveUnitNWISData.r
@@ -21,7 +21,7 @@
#' rawData <- retrieveUnitNWISData(siteNumber,ParameterCd,StartDate,EndDate,interactive=FALSE)
retrieveUnitNWISData <- function (siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE){
- url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"uv",StatCd)
+ url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"uv")
tmp <- read.delim(
url,
header = TRUE,
diff --git a/inst/doc/dataRetrieval-figegretEx.pdf b/inst/doc/dataRetrieval-figegretEx.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..101b9c38bc49214aa4da0afd6dc6f43ca38408f0
Binary files /dev/null and b/inst/doc/dataRetrieval-figegretEx.pdf differ
diff --git a/man/getDVData.Rd b/man/getDVData.Rd
index 7dc0a25d34cf307103f25a063e3a4f770f2910c2..00c4faca602080dadd5471d104db558a7dfccfa8 100644
--- a/man/getDVData.Rd
+++ b/man/getDVData.Rd
@@ -46,8 +46,8 @@ Daily <- getDVData('01594440','00060', '1985-01-01', '1985-03-31', interactive=F
\code{\link{retrieveNWISData}},
\code{\link{populateDaily}}
}
-\keyword{USGS}
-\keyword{WRTDS}
\keyword{data}
\keyword{import}
+\keyword{USGS}
+\keyword{WRTDS}
diff --git a/man/getDailyDataFromFile.Rd b/man/getDailyDataFromFile.Rd
index 2c8ded37b9a18f130b42c18ecc9f4d3787a3c696..95f1ece41ac37dce3485e090992a4e76fbc70cc5 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 06dbf8e02217726e0d4a9cc9e24f837a4ac1eb38..fd9d46033e9e1e6165f538fcf14a54ab1c79bf69 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/getDataAvailablilty.Rd b/man/getDataAvailablilty.Rd
deleted file mode 100644
index 750535bc0b4250112fd3b0384784063eed1461ad..0000000000000000000000000000000000000000
--- a/man/getDataAvailablilty.Rd
+++ /dev/null
@@ -1,40 +0,0 @@
-\name{getDataAvailablilty}
-\alias{getDataAvailablilty}
-\title{USGS data availability}
-\usage{
- getDataAvailablilty(siteNumber = "", interactive = TRUE,
- longNames = FALSE)
-}
-\arguments{
- \item{siteNumber}{string USGS site number. This is
- usually an 8 digit number}
-
- \item{interactive}{logical Option for interactive mode.
- If true, there is user interaction for error handling and
- data checks.}
-
- \item{longNames}{logical indicates whether or not to make
- a web call to get long names of parameters. Be aware this
- could take a very long time if the station has lots of
- data.}
-}
-\value{
- retval dataframe with all information found in the
- expanded site file
-}
-\description{
- Imports a table of available parameters, period of
- record, and count. There is also an option to load the
- long parameter names and additional information on the
- parameters with longNames=TRUE.
-}
-\examples{
-# These examples require an internet connection to run
-availableData <- getDataAvailablilty('05114000',interactive=FALSE)
-}
-\keyword{data}
-\keyword{import}
-\keyword{service}
-\keyword{USGS}
-\keyword{web}
-
diff --git a/man/getMetaData.Rd b/man/getMetaData.Rd
index fb57f7d818c177f9756645238dada84569867e04..77a11bcff1f726b0ecde6225df4d5f1b3b21a8fe 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 dc266131310a138046da77d2b30e5bf2c1c45482..3177e1b6c5b0b27172ec344fff2391cee52d5489 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 fb9df67602ba06d11c33ae51c97619337e355980..6344c8980314b462fbeb13a1be1a227e0e06a434 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 8be9941cee8a1e22b9c42a2f1e1783955a01990b..a39fbbe6d2b72f71d83137208ac0c65157e98722 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 1e8834a400df76773c56f0d66f2f281f4bffabf2..50708517441fb2c28f93936156fd4fd6c024f9c7 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 8348de8d5e2cd018928e1498e8d0ce37842488d7..f38d6a2322478fb8c29957201f772fe36d05034b 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 738023e62faec1f5e19e3f7973eb04b875e5d7d0..a77fc37ffda4adb1e1bc2c75b3a3a5b26ab57a98 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 f8fc6db8dd5b2a7f164977fe2e1c287b8eefcb84..782b13c6c3bf602196a178982319a1be56c4f766 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{USGS}
-\keyword{WRTDS}
\keyword{data}
\keyword{import}
+\keyword{USGS}
+\keyword{WRTDS}
diff --git a/man/getSampleDataFromFile.Rd b/man/getSampleDataFromFile.Rd
index f295b54c36bbffe76ecd4934edde2f67b6531f51..34a0e31df6f8ab4745627cbc5afc3f4ea08c175f 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 37a7d14a54aa31799bcb74be2ebf6e8137323eac..53291b62e542ee7599124ff7866c16c95ed96e9a 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 a3b275d477aa664bc684d798eb3b33d64ddcf9f5..3f5c8e143044f445ad8c2d9c19f888cfaba54b7e 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 5efff9d3878cddc49ca7a82527a2ece4d08a4f52..800f34ba5ab6684f1af1975045caad09cf96f825 100644
--- a/man/mergeReport.Rd
+++ b/man/mergeReport.Rd
@@ -33,8 +33,8 @@ Sample <- mergeReport(interactive=FALSE)
\code{\link{getDVData}},
\code{\link{populateSampleColumns}}
}
-\keyword{USGS}
-\keyword{WRTDS}
\keyword{data}
\keyword{import}
+\keyword{USGS}
+\keyword{WRTDS}
diff --git a/man/populateDaily.Rd b/man/populateDaily.Rd
index 5722f563c0cd546c3c1cb92f01026ffb4690c6a3..e59aafb215c75061b4ac028d2c5a414956f109af 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{WRTDS}
\keyword{flow}
+\keyword{WRTDS}
diff --git a/man/processQWData.Rd b/man/processQWData.Rd
index 660c8bb571bcef093ad463a30d4d779727da1c13..d5cc07572769a86d41ddf0ae9eb1f8082b06b5f6 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 ec7d95ceeb50d9f359e53b6cc1f172330b3a18ee..f973bd8b29a7e78e912f8c8a7ef32008d0eb5654 100644
--- a/man/retrieveNWISData.Rd
+++ b/man/retrieveNWISData.Rd
@@ -45,11 +45,11 @@ endDate <- '2012-06-30'
pCode <- "00060"
rawDailyQ <- retrieveNWISData(siteNumber,pCode, startDate, endDate)
rawDailyTemperature <- retrieveNWISData(siteNumber,'00010', startDate, endDate, StatCd='00001',interactive=FALSE)
-rawDailyQAndTempMeanMax <- retrieveNWISData(siteNumber,'00010,00060', startDate, endDate, StatCd='00001,00003', 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 254045c748b2520c03b207a717b6a2034639f995..4e5a169e402d4b4af02344a248be66f16508e587 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 4622f8dd8136872c8f58ed1f8cd1eafa15ae7f9b..5228b6abf6422ca473a5b364761c62350c086d65 100644
--- a/man/retrieveUnitNWISData.Rd
+++ b/man/retrieveUnitNWISData.Rd
@@ -42,9 +42,9 @@ EndDate <- as.character(Sys.Date())
# These examples require an internet connection to run
rawData <- retrieveUnitNWISData(siteNumber,ParameterCd,StartDate,EndDate,interactive=FALSE)
}
-\keyword{USGS}
\keyword{data}
\keyword{import}
\keyword{service}
+\keyword{USGS}
\keyword{web}