diff --git a/DESCRIPTION b/DESCRIPTION
index 3156758c7ad082b9f6e5b6f81c7184f2d8efe800..e332178b523c36fbb93e107378cadce408f2a2ae 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -58,5 +58,6 @@ Imports:
zoo
Suggests:
xtable
+ EGRET
LazyLoad: yes
LazyData: yes
diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r
index 8651134b86cc4863ed982d1778d4c62b00a37e84..7b07fda6310fbea9285c94aa79ed4d153919d489 100644
--- a/R/constructNWISURL.r
+++ b/R/constructNWISURL.r
@@ -9,7 +9,7 @@
#' @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 service string USGS service to call. Possible values are "dv" (daily values), "iv" (unit/instantaneous values), "qwdata" (water quality data), and "wqp" (water quality portal, which can include STORET).
+#' @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
#' @export
@@ -33,7 +33,7 @@ constructNWISURL <- function(siteNumber,parameterCd,startDate,endDate,service,st
endDate <- dateReturn[2]
switch(service,
- qwdata = {
+ qw = {
if(length(siteNumber) > 1){
siteNumber <- paste(siteNumber, collapse=",")
siteNumber <- paste("multiple_site_no",siteNumber,sep="=")
@@ -98,7 +98,7 @@ constructNWISURL <- function(siteNumber,parameterCd,startDate,endDate,service,st
endDate,
"&countrycode=US&mimeType=tsv",sep = "")
},
- { # this will be either dv or iv
+ { # this will be either dv or uv
siteNumber <- formatCheckSiteNumber(siteNumber, interactive=interactive)
# Check for 5 digit parameter code:
@@ -107,6 +107,8 @@ constructNWISURL <- function(siteNumber,parameterCd,startDate,endDate,service,st
} else {
parameterCd <- formatCheckParameterCd(parameterCd, interactive=interactive)
}
+
+ if ("uv"==service) service <- "iv"
baseURL <- paste("http://waterservices.usgs.gov/nwis/",service,sep="")
diff --git a/R/retrieveNWISqwData.r b/R/retrieveNWISqwData.r
index e053c3655b3d9b3889f15c6b408dd3cd9e0a8d40..27929d488f0b364e4ffb7233c72f8811f0086017 100644
--- a/R/retrieveNWISqwData.r
+++ b/R/retrieveNWISqwData.r
@@ -25,7 +25,7 @@
#' Sample <- populateSampleColumns(compressedData)
retrieveNWISqwData <- function (siteNumber,pCodes,startDate,endDate){
- url <- constructNWISURL(siteNumber,pCodes,startDate,endDate,"qwdata")
+ url <- constructNWISURL(siteNumber,pCodes,startDate,endDate,"qw")
tmp <- read.delim(
url,
diff --git a/R/retrieveUnitNWISData.r b/R/retrieveUnitNWISData.r
index dfe9d8bdced6a3a16b26f2b306637ef7a61f93c7..d4eda05d5b6b72a149dca8677e887eb037eb5f41 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,"iv",StatCd)
+ url <- constructNWISURL(siteNumber,ParameterCd,StartDate,EndDate,"uv",StatCd)
tmp <- read.delim(
url,
header = TRUE,
diff --git a/inst/doc/dataRetrieval.Rnw b/inst/doc/dataRetrieval.Rnw
index 733b65cd9867893e3cfdd72b61ea374d98bb5604..dd4cab97d89b214893dfc16a8ac0720c881a5b8b 100644
--- a/inst/doc/dataRetrieval.Rnw
+++ b/inst/doc/dataRetrieval.Rnw
@@ -72,9 +72,9 @@ In this section, we will run through 5 examples, documenting how to get raw data
%------------------------------------------------------------
\subsection{USGS Web Retrieval Introduction}
%------------------------------------------------------------
-The United States Geological Survey organizes their hydrological data in fairly standard structure. Gage stations are located throughout the United States, each station has a unique ID. Often (but not always), these ID's are 8 digits. The first step to finding data is discoving this 8-digit ID. One potential tool for discovering data is Environmental Data Discovery and Transformation (EnDDaT): \url{http://cida.usgs.gov/enddat/}. Follow the example in the User's Guide to learn how to discover USGS stations and available data from any location in the United States. Essentially, you can create a Project Location on the map, set a bounding box (in miles), then search for USGS Time Series and USGS Water Quality Data. Locations, ID's, available data, and available time periods will load on the map and appropriate tabs.
+The United States Geological Survey organizes their hydrological data in fairly standard structure. Streamgages are located throughout the United States, and each streamgage has a unique ID. Often (but not always), these ID's are 8 digits. The first step to finding data is discoving this 8-digit ID. One potential tool for discovering data is Environmental Data Discovery and Transformation (EnDDaT): \url{http://cida.usgs.gov/enddat/}. Follow the example on the EnDDaT web page to learn how to discover USGS stations and available data from any location in the United States.
-Once the site-ID is known, the next required input for USGS data retrievals is the 'parameter code'. This is a 5-digit code that specifies what measured paramater is being requested. A complete list of possible USGS parameter codes can be found at \href{http://nwis.waterdata.usgs.gov/usa/nwis/pmcodes?radio_pm_search=param_group&pm_group=All+--+include+all+parameter+groups&pm_search=&casrn_search=&srsname_search=&format=html_table&show=parameter_group_nm&show=parameter_nm&show=casrn&show=srsname&show=parameter_units}{nwis.waterdata.usgs.gov}. Not every station will measure all parameters. The following is a list of commonly measured parameters:
+Once the site-ID is known, the next required input for USGS data retrievals is the 'parameter code'. This is a 5-digit code that specifies what measured paramater is being requested. A complete list of possible USGS parameter codes can be found at \href{http://nwis.waterdata.usgs.gov/usa/nwis/pmcodes?radio_pm_search=param_group&pm_group=All+--+include+all+parameter+groups&pm_search=&casrn_search=&srsname_search=&format=html_table&show=parameter_group_nm&show=parameter_nm&show=casrn&show=srsname&show=parameter_units}. Not every station will measure all parameters. The following is a list of commonly measured parameters:
<<openLibrary, echo=FALSE>>=
library(xtable)
@@ -146,7 +146,7 @@ parameterINFO <- getParameterInfo(parameterCd)
colnames(parameterINFO)
@
-Pulling out a specific example piece of information, in this case station name can be done as follows:
+Pulling out a specific example piece of information, in this case parameter name can be done as follows:
<<siteNames, echo=TRUE>>=
parameterINFO$parameter_nm
@
@@ -156,9 +156,9 @@ Parameter information is obtained from \url{http://nwis.waterdata.usgs.gov/nwis/
\subsection{USGS Daily Value Retrievals}
\label{sec:usgsDaily}
%------------------------------------------------------------
-To obtain historic daily records of USGS data, use the retrieveNWISData function. The arguments for this function are siteNumber, parameterCd, startDate, endDate, statCd, and a logical (true/false) interactive. There are 2 default argument: statCd defaults to "00003" and interactive defaults to TRUE. If you want to use the default values, you do not need to list them in the function call. Setting the 'interactive' option to true will walk you through the function. It might make more sense to run large batch collections with the interactive option set to FALSE.
+To obtain historic daily records of USGS data, use the retrieveNWISData function. The arguments for this function are siteNumber, parameterCd, startDate, endDate, statCd, and a logical (true/false) interactive. There are 2 default argument: statCd defaults to \texttt{"}00003\texttt{"} and interactive defaults to TRUE. If you want to use the default values, you do not need to list them in the function call. Setting the 'interactive' option to true will walk you through the function. It might make more sense to run large batch collections with the interactive option set to FALSE.
-The dates (start and end) need to be in the format "YYYY-MM-DD". Setting the start date to "" will indicate to the program to ask for the earliest date, setting the end date to "" will ask for the latest available date.
+The dates (start and end) need to be in the format \texttt{"}YYYY-MM-DD\texttt{"}. Setting the start date to \texttt{"}\texttt{"} will indicate to the program to ask for the earliest date, setting the end date to \texttt{"}\texttt{"} will ask for the latest available date.
<<label=getNWISDaily, echo=TRUE>>=
# Using defaults:
@@ -175,7 +175,7 @@ A dataframe is returned that looks like the following:
head(discharge)
@
-The variable datetime is automatically imported as a Date. Each requested parameter has a value and remark code column. The names of these columns depend on the requested parameter and stat code combinations. USGS remark codes are often "A" (approved for publication) or "P" (provisional data subject to revision). A more complete list of remark codes can be found here:
+The variable datetime is automatically imported as a Date. Each requested parameter has a value and remark code column. The names of these columns depend on the requested parameter and stat code combinations. USGS remark codes are often \texttt{"}A\texttt{"} (approved for publication) or \texttt{"}P\texttt{"} (provisional data subject to revision). A more complete list of remark codes can be found here:
\url{http://waterdata.usgs.gov/usa/nwis/help?codes_help}
Another example that doesn't use the defaults would be a request for mean and maximum daily temperature and discharge in early 2012:
@@ -223,7 +223,7 @@ title(paste(ChoptankInfo$station.nm,"2012",sep=" "))
\end{figure}
-There are occasions where NWIS values are not reported as numbers, instead there might be text describing a certain event such as "Ice". Any value that cannot be converted to a number will be reported as NA in this package.
+There are occasions where NWIS values are not reported as numbers, instead there might be text describing a certain event such as \texttt{"}Ice\texttt{"}. Any value that cannot be converted to a number will be reported as NA in this package.
%------------------------------------------------------------
@@ -247,7 +247,7 @@ Which produces the following dataframe:
head(dischargeToday)
@
-Note that time now becomes important, so the variable datetime is a POSIXct, and the time zone is included in a separate column. Data is pulled from \url{http://waterservices.usgs.gov/rest/IV-Test-Tool.html}. There are occasions where NWIS values are not reported as numbers, instead a common example is "Ice". Any value that cannot be converted to a number will be reported as NA in this package.
+Note that time now becomes important, so the variable datetime is a POSIXct, and the time zone is included in a separate column. Data is pulled from \url{http://waterservices.usgs.gov/rest/IV-Test-Tool.html}. There are occasions where NWIS values are not reported as numbers, instead a common example is \texttt{"}Ice\texttt{"}. Any value that cannot be converted to a number will be reported as NA in this package.
A simple plotting example is shown in Figure \ref{fig:RT}:
<<label=getNWISUnit, echo=TRUE>>=
@@ -274,7 +274,7 @@ title(ChoptankInfo$station.nm)
\subsection{USGS Water Quality Retrievals}
\label{sec:usgsWQP}
%------------------------------------------------------------
-Finally, we can use the dataRetrieval package to get USGS water quality data that is available on the water quality data portal: \url{http://www.waterqualitydata.us/}. The raw data us obtained from the function getRawQWData, with the similar input arguments: siteNumber, parameterCd, startDate, endDate, and interactive. The difference is in parameterCd, in this function multiple parameters can be queried using a ";" separator, and setting parameterCd <- "" will return all of the measured observations. The raw data can be overwelming (as will be demonstrated), a simplified version of the data can be obtained using getQWData.
+Finally, we can use the dataRetrieval package to get USGS water quality data that is available on the water quality data portal: \url{http://www.waterqualitydata.us/}. The raw data us obtained from the function getRawQWData, with the similar input arguments: siteNumber, parameterCd, startDate, endDate, and interactive. The difference is in parameterCd, in this function multiple parameters can be queried using a \texttt{"};\texttt{"} separator, and setting parameterCd <- \texttt{"}\texttt{"} will return all of the measured observations. The raw data can be overwelming (as will be demonstrated), a simplified version of the data can be obtained using getQWData.
<<label=getQW, echo=TRUE>>=
@@ -297,7 +297,7 @@ dissolvedNitrateSimple <- getQWData(siteNumber, parameterCd,
startDate, endDate)
names(dissolvedNitrateSimple)
@
-Note that in this dataframe, datatime is imported as Dates (no times are included), and the qualifier is either blank or \verb@"<"@ signifying a censored value.
+Note that in this dataframe, datatime is imported as Dates (no times are included), and the qualifier is either blank or \texttt{"}\verb@<@\texttt{"} signifying a censored value.
An example of plotting the above data (Figure \ref{fig:nitrate}):
diff --git a/man/constructNWISURL.Rd b/man/constructNWISURL.Rd
index 813f2cf32b764994875122fb48b20d1cc6d82393..b62ae3135fa780f25f94b67cf6a6f4fd18108ec9 100644
--- a/man/constructNWISURL.Rd
+++ b/man/constructNWISURL.Rd
@@ -23,8 +23,8 @@
mean (00003) is the default.}
\item{service}{string USGS service to call. Possible
- values are "dv" (daily values), "iv" (unit/instantaneous
- values), "qwdata" (water quality data), and "wqp" (water
+ values are "dv" (daily values), "uv" (unit/instantaneous
+ values), "qw" (water quality data), and "wqp" (water
quality portal, which can include STORET).}
}
\value{