diff --git a/vignettes/dataRetrieval.Rnw b/vignettes/dataRetrieval.Rnw
index febc5ba7ba3c76756c608006860d033403d35652..a9d44b13cc031783957b7f48f94f4bc084c92380 100644
--- a/vignettes/dataRetrieval.Rnw
+++ b/vignettes/dataRetrieval.Rnw
@@ -402,8 +402,7 @@ There are additional data sets available on the Water Quality Data Portal (\url{
<<label=getQWData, echo=TRUE>>=
-specificCond <- getWQPData('WIDNR_WQX-10032762',
- 'Specific conductance', '', '')
+specificCond <- getWQPData('WIDNR_WQX-10032762','Specific conductance','','')
head(specificCond)
@
diff --git a/vignettes/dataRetrieval.log b/vignettes/dataRetrieval.log
index f2690704018008510acbf8eb8221106d005311c1..d4d43b83c5b1908d2414c9fd441b302a9f4a2c34 100644
--- a/vignettes/dataRetrieval.log
+++ b/vignettes/dataRetrieval.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.1415926-2.3-1.40.12 (MiKTeX 2.9) (preloaded format=pdflatex 2012.12.19) 11 APR 2014 13:46
+This is pdfTeX, Version 3.1415926-2.3-1.40.12 (MiKTeX 2.9) (preloaded format=pdflatex 2012.12.19) 18 APR 2014 13:37
entering extended mode
**dataRetrieval.tex
(C:\Users\jlthomps\Desktop\git\dataRetrieval\vignettes\dataRetrieval.tex
@@ -627,17 +627,17 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[10]
Package color Info: Redefining color shadecolor on input line 567.
-Package color Info: Redefining color shadecolor on input line 592.
+Package color Info: Redefining color shadecolor on input line 595.
LaTeX Warning: No positions in optional float specifier.
- Default added (so using `tbp') on input line 601.
+ Default added (so using `tbp') on input line 604.
<figure/getQWtemperaturePlot.pdf, id=229, 505.89pt x 505.89pt>
File: figure/getQWtemperaturePlot.pdf Graphic file (type pdf)
<use figure/getQWtemperaturePlot.pdf>
-Package pdftex.def Info: figure/getQWtemperaturePlot.pdf used on input line 603
+Package pdftex.def Info: figure/getQWtemperaturePlot.pdf used on input line 606
.
(pdftex.def) Requested size: 448.07378pt x 448.07928pt.
@@ -650,21 +650,30 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[12 <C:/Users/jlthomps/Desktop/git/dataRetrieval/vignettes/figure/getQWtemperat
urePlot.pdf>]
-Overfull \hbox (50.793pt too wide) in paragraph at lines 616--617
+Overfull \hbox (50.793pt too wide) in paragraph at lines 619--620
\OT1/ptm/m/n/10.95 There are ad-di-tional data sets avail-able on the Wa-ter Qu
al-ity Data Por-tal ([]$\OT1/pcr/m/n/10.95 http : / / www . waterqualitydata .$
[]
-Package color Info: Redefining color shadecolor on input line 620.
-LaTeX Font Info: Try loading font information for TS1+pcr on input line 622.
+Package color Info: Redefining color shadecolor on input line 623.
+LaTeX Font Info: Try loading font information for TS1+pcr on input line 625.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\ts1pcr.fd"
File: ts1pcr.fd 2001/06/04 font definitions for TS1/pcr.
)
-Package color Info: Redefining color shadecolor on input line 646.
+Overfull \hbox (57.81561pt too wide) in paragraph at lines 625--625
+[][]\OT1/pcr/m/n/10.95 specificCond[] []<-[] []\OT1/pcr/b/n/10.95 getWQPData[][
+]\OT1/pcr/m/n/10.95 ([][]\TS1/pcr/m/n/10.95 '\OT1/pcr/m/n/10.95 WIDNR_WQX-10032
+762\TS1/pcr/m/n/10.95 '[][]\OT1/pcr/m/n/10.95 ,[][]\TS1/pcr/m/n/10.95 '\OT1/pcr
+/m/n/10.95 Specific conductance\TS1/pcr/m/n/10.95 '[][]\OT1/pcr/m/n/10.95 ,[][]
+\TS1/pcr/m/n/10.95 ''[][]\OT1/pcr/m/n/10.95 ,[][]\TS1/pcr/m/n/10.95 ''[][]\OT1/
+pcr/m/n/10.95 )[][]
+ []
+
+Package color Info: Redefining color shadecolor on input line 648.
-Overfull \hbox (5.25568pt too wide) in paragraph at lines 655--655
+Overfull \hbox (5.25568pt too wide) in paragraph at lines 657--657
[][]\OT1/pcr/m/n/10.95 url_uv[] []<-[] []\OT1/pcr/b/n/10.95 constructNWISURL[][
]\OT1/pcr/m/n/10.95 (siteNumber,[][]"00060"[][],startDate,endDate,[][]\TS1/pcr/
m/n/10.95 '\OT1/pcr/m/n/10.95 uv\TS1/pcr/m/n/10.95 '[][]\OT1/pcr/m/n/10.95 )[][
@@ -676,15 +685,15 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[13]
-Package color Info: Redefining color shadecolor on input line 678.
-Package color Info: Redefining color shadecolor on input line 697.
+Package color Info: Redefining color shadecolor on input line 680.
+Package color Info: Redefining color shadecolor on input line 699.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[14]
-Package color Info: Redefining color shadecolor on input line 753.
-Package color Info: Redefining color shadecolor on input line 766.
+Package color Info: Redefining color shadecolor on input line 755.
+Package color Info: Redefining color shadecolor on input line 768.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
@@ -694,41 +703,41 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[16]
-Package color Info: Redefining color shadecolor on input line 892.
+Package color Info: Redefining color shadecolor on input line 894.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[17]
-Package color Info: Redefining color shadecolor on input line 948.
-LaTeX Font Info: Try loading font information for OMS+pcr on input line 953.
+Package color Info: Redefining color shadecolor on input line 950.
+LaTeX Font Info: Try loading font information for OMS+pcr on input line 955.
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\omspcr.fd"
File: omspcr.fd
)
LaTeX Font Info: Font shape `OMS/pcr/m/n' in size <10.95> not available
-(Font) Font shape `OMS/cmsy/m/n' tried instead on input line 953.
+(Font) Font shape `OMS/cmsy/m/n' tried instead on input line 955.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[18]
-Package color Info: Redefining color shadecolor on input line 979.
-Package color Info: Redefining color shadecolor on input line 1004.
+Package color Info: Redefining color shadecolor on input line 981.
+Package color Info: Redefining color shadecolor on input line 1006.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[19]
-Package color Info: Redefining color shadecolor on input line 1025.
+Package color Info: Redefining color shadecolor on input line 1027.
-Overfull \hbox (44.67563pt too wide) in paragraph at lines 1050--1050
+Overfull \hbox (44.67563pt too wide) in paragraph at lines 1052--1052
[] \OT1/pcr/m/n/10.95 First day of the discharge record is 2000-01-01 and last
day is 2013-01-01[]
[]
-Overfull \hbox (44.67563pt too wide) in paragraph at lines 1050--1050
+Overfull \hbox (44.67563pt too wide) in paragraph at lines 1052--1052
[] \OT1/pcr/m/n/10.95 The first sample is from 2000-01-04 and the last sample i
s from 2012-12-18[]
[]
@@ -738,16 +747,16 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[20]
-Package color Info: Redefining color shadecolor on input line 1082.
+Package color Info: Redefining color shadecolor on input line 1084.
LaTeX Warning: No positions in optional float specifier.
- Default added (so using `tbp') on input line 1088.
+ Default added (so using `tbp') on input line 1090.
<figure/egretEx.pdf, id=293, 505.89pt x 505.89pt>
File: figure/egretEx.pdf Graphic file (type pdf)
<use figure/egretEx.pdf>
-Package pdftex.def Info: figure/egretEx.pdf used on input line 1090.
+Package pdftex.def Info: figure/egretEx.pdf used on input line 1092.
(pdftex.def) Requested size: 448.07378pt x 448.07928pt.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
@@ -769,14 +778,20 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[24]
-Package color Info: Redefining color shadecolor on input line 1218.
-Package color Info: Redefining color shadecolor on input line 1232.
- <Rhelp.png, id=325, 433.62pt x 395.22656pt>
+Package color Info: Redefining color shadecolor on input line 1220.
+Package color Info: Redefining color shadecolor on input line 1234.
+
+Overfull \hbox (51.24562pt too wide) in paragraph at lines 1245--1245
+[] \OT1/pcr/m/n/10.95 Sample1 <- localSample[!duplicated(localSample[c("DecYea
+r","ConcHigh")]),][]
+ []
+
+<Rhelp.png, id=325, 433.62pt x 395.22656pt>
File: Rhelp.png Graphic file (type png)
<use Rhelp.png>
-Package pdftex.def Info: Rhelp.png used on input line 1253.
+Package pdftex.def Info: Rhelp.png used on input line 1254.
(pdftex.def) Requested size: 433.61894pt x 395.22559pt.
-Package color Info: Redefining color shadecolor on input line 1260.
+Package color Info: Redefining color shadecolor on input line 1261.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
@@ -788,9 +803,9 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[26 <C:/Users/jlthomps/Desktop/git/dataRetrieval/vignettes/Rhelp.png>]
-Package color Info: Redefining color shadecolor on input line 1276.
-Package color Info: Redefining color shadecolor on input line 1297.
-Package color Info: Redefining color shadecolor on input line 1313.
+Package color Info: Redefining color shadecolor on input line 1277.
+Package color Info: Redefining color shadecolor on input line 1298.
+Package color Info: Redefining color shadecolor on input line 1314.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
@@ -798,9 +813,9 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[27
]
-Package color Info: Redefining color shadecolor on input line 1351.
+Package color Info: Redefining color shadecolor on input line 1352.
-Overfull \hbox (11.82567pt too wide) in paragraph at lines 1369--1369
+Overfull \hbox (11.82567pt too wide) in paragraph at lines 1370--1370
[]\OT1/pcr/m/n/10.95 Suspended sediment concentration (SSC) 1980-10-01 1991-09-
30 3651 mg/l[]
[]
@@ -812,37 +827,37 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[28] <table1.png, id=354, 554.07pt x 125.71968pt>
File: table1.png Graphic file (type png)
<use table1.png>
-Package pdftex.def Info: table1.png used on input line 1388.
+Package pdftex.def Info: table1.png used on input line 1389.
(pdftex.def) Requested size: 554.06865pt x 125.71936pt.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[29 <C:/Users/jlthomps/Desktop/git/dataRetrieval/vignettes/table1.png>]
-Underfull \hbox (badness 1983) in paragraph at lines 1404--1405
+Underfull \hbox (badness 1983) in paragraph at lines 1405--1406
[]\OT1/ptm/m/n/10.95 Hirsch, R. M., Moyer, D. L. and Arch-field, S. A. (2010),
Weighted Re-gres-sions on
[]
-Underfull \hbox (badness 1221) in paragraph at lines 1404--1405
+Underfull \hbox (badness 1221) in paragraph at lines 1405--1406
\OT1/ptm/m/n/10.95 Time, Dis-charge, and Sea-son (WRTDS), with an Ap-pli-ca-tio
n to Chesa-peake Bay River
[]
-Underfull \hbox (badness 2443) in paragraph at lines 1404--1405
+Underfull \hbox (badness 2443) in paragraph at lines 1405--1406
\OT1/ptm/m/n/10.95 In-puts. JAWRA Jour-nal of the Amer-i-can Wa-ter Re-sources
As-so-ci-a-tion, 46: 857-880.
[]
-Underfull \hbox (badness 3690) in paragraph at lines 1404--1405
+Underfull \hbox (badness 3690) in paragraph at lines 1405--1406
\OT1/ptm/m/n/10.95 doi: 10.1111/j.1752-1688.2010.00482.x []$\OT1/pcr/m/n/10.95
http : / / onlinelibrary . wiley . com / doi /$
[]
-Package atveryend Info: Empty hook `BeforeClearDocument' on input line 1411.
+Package atveryend Info: Empty hook `BeforeClearDocument' on input line 1412.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
@@ -850,14 +865,14 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[30
]
-Package atveryend Info: Empty hook `AfterLastShipout' on input line 1411.
+Package atveryend Info: Empty hook `AfterLastShipout' on input line 1412.
(C:\Users\jlthomps\Desktop\git\dataRetrieval\vignettes\dataRetrieval.aux)
-Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 1411.
-Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 1411.
+Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 1412.
+Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 1412.
Package rerunfilecheck Info: File `dataRetrieval.out' has not changed.
(rerunfilecheck) Checksum: FA68DD2EA4402D1A5C9FB76C153FCB7A;1868.
-Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 1411.
+Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 1412.
)
Here is how much of TeX's memory you used:
8353 strings out of 494045
@@ -876,7 +891,7 @@ les (x86)/MiKTeX 2.9/fonts/type1/urw/courier/ucrb8a.pfb><C:/Program Files (x86)
/type1/urw/times/utmb8a.pfb><C:/Program Files (x86)/MiKTeX 2.9/fonts/type1/urw/
times/utmr8a.pfb><C:/Program Files (x86)/MiKTeX 2.9/fonts/type1/urw/times/utmri
8a.pfb>
-Output written on dataRetrieval.pdf (30 pages, 302922 bytes).
+Output written on dataRetrieval.pdf (30 pages, 314331 bytes).
PDF statistics:
424 PDF objects out of 1000 (max. 8388607)
87 named destinations out of 1000 (max. 500000)
diff --git a/vignettes/dataRetrieval.pdf b/vignettes/dataRetrieval.pdf
index 37ca8c56860f3e7315ecd0d86cd73070ed1a9ac8..65f039e47f26628648313ae86f949bbc4a7546d0 100644
Binary files a/vignettes/dataRetrieval.pdf and b/vignettes/dataRetrieval.pdf differ
diff --git a/vignettes/dataRetrieval.synctex.gz b/vignettes/dataRetrieval.synctex.gz
index 71f008a586ced46ad31ba1cbc7ec2a99d1e3f3a7..75445cfb4efe307826f4e3b231bd63017ad7ca7c 100644
Binary files a/vignettes/dataRetrieval.synctex.gz and b/vignettes/dataRetrieval.synctex.gz differ
diff --git a/vignettes/dataRetrieval.tex b/vignettes/dataRetrieval.tex
index 7f2deed8c6153aa29bfa736cfb54e8760ee2acbd..a0be0202f1517795cf5079e7abbf691bded5a31e 100644
--- a/vignettes/dataRetrieval.tex
+++ b/vignettes/dataRetrieval.tex
@@ -177,7 +177,7 @@ Not every station will measure all parameters. A short list of commonly measured
% latex table generated in R 3.0.2 by xtable 1.7-1 package
-% Fri Apr 11 13:45:43 2014
+% Fri Apr 18 13:37:18 2014
\begin{table}[ht]
\centering
\begin{tabular}{rll}
@@ -240,7 +240,7 @@ For unit values data (sensor data measured at regular time intervals such as 15
Some common codes are shown in Table \ref{tab:stat}.
% latex table generated in R 3.0.2 by xtable 1.7-1 package
-% Fri Apr 11 13:45:43 2014
+% Fri Apr 18 13:37:19 2014
\begin{table}[ht]
\centering
\begin{tabular}{rll}
@@ -329,7 +329,7 @@ To discover what data is available for a particular USGS site, including measure
% latex table generated in R 3.0.2 by xtable 1.7-1 package
-% Fri Apr 11 13:45:44 2014
+% Fri Apr 18 13:37:19 2014
\begin{table}[ht]
\centering
\begin{tabular}{rlllll}
@@ -337,7 +337,7 @@ To discover what data is available for a particular USGS site, including measure
& srsname & startDate & endDate & count & units \\
\hline
1 & Temperature, water & 2010-10-01 & 2012-05-09 & 529 & deg C \\
- 2 & Stream flow, mean. daily & 1948-01-01 & 2014-04-10 & 24207 & ft3/s \\
+ 2 & Stream flow, mean. daily & 1948-01-01 & 2014-04-17 & 24214 & ft3/s \\
3 & Specific conductance & 2010-10-01 & 2012-05-09 & 527 & uS/cm @25C \\
4 & Suspended sediment concentration (SSC) & 1980-10-01 & 1991-09-30 & 3651 & mg/l \\
5 & Suspended sediment discharge & 1980-10-01 & 1991-09-30 & 3652 & tons/day \\
@@ -573,7 +573,10 @@ To get USGS water quality data from water samples collected at the streamgage or
\hlstd{dissolvedNitrate} \hlkwb{<-} \hlkwd{getRawQWData}\hlstd{(siteNumber, parameterCd,}
\hlstd{startDate, endDate)}
+\end{alltt}
+
+{\ttfamily\noindent\bfseries\color{errorcolor}{Error: missing value where TRUE/FALSE needed}}\begin{alltt}
\hlstd{dissolvedNitrateSimple} \hlkwb{<-} \hlkwd{getQWData}\hlstd{(siteNumber, parameterCd,}
\hlstd{startDate, endDate)}
\hlkwd{names}\hlstd{(dissolvedNitrateSimple)}
@@ -619,8 +622,7 @@ There are additional data sets available on the Water Quality Data Portal (\url{
\begin{knitrout}
\definecolor{shadecolor}{rgb}{0.969, 0.969, 0.969}\color{fgcolor}\begin{kframe}
\begin{alltt}
-\hlstd{specificCond} \hlkwb{<-} \hlkwd{getWQPData}\hlstd{(}\hlstr{'WIDNR_WQX-10032762'}\hlstd{,}
- \hlstr{'Specific conductance'}\hlstd{,} \hlstr{''}\hlstd{,} \hlstr{''}\hlstd{)}
+\hlstd{specificCond} \hlkwb{<-} \hlkwd{getWQPData}\hlstd{(}\hlstr{'WIDNR_WQX-10032762'}\hlstd{,}\hlstr{'Specific conductance'}\hlstd{,}\hlstr{''}\hlstd{,}\hlstr{''}\hlstd{)}
\end{alltt}
@@ -712,7 +714,7 @@ There are 4750 data points, and 4750 days.
Details of the Daily dataframe are listed below:
% latex table generated in R 3.0.2 by xtable 1.7-1 package
-% Fri Apr 11 13:46:09 2014
+% Fri Apr 18 13:37:34 2014
\begin{table}[ht]
\centering
\begin{tabular}{rllll}
@@ -856,7 +858,7 @@ As an example to understand how the dataRetrieval package handles a more complex
% latex table generated in R 3.0.2 by xtable 1.7-1 package
-% Fri Apr 11 13:46:12 2014
+% Fri Apr 18 13:37:35 2014
\begin{table}[ht]
\centering
\begin{tabular}{rllrlrlr}
@@ -1234,11 +1236,10 @@ To see the raw code for a particular code, type the name of the function, withou
\hlstd{removeDuplicates}
\end{alltt}
\begin{verbatim}
-function (localSample = Sample)
-{
- Sample1 <- localSample[!duplicated(localSample[c("DecYear",
- "ConcHigh")]), ]
- return(Sample1)
+function(localSample=Sample) {
+ Sample1 <- localSample[!duplicated(localSample[c("DecYear","ConcHigh")]),]
+
+ return(Sample1)
}
<environment: namespace:dataRetrieval>
\end{verbatim}
@@ -1335,7 +1336,7 @@ There are a few steps that are required in order to create a table in a Microsof
5 Suspended sediment discharge 1980-10-01
End Count Units
1 2012-05-09 529 deg C
-2 2014-04-10 24207 ft3/s
+2 2014-04-17 24214 ft3/s
3 2012-05-09 527 uS/cm @25C
4 1991-09-30 3651 mg/l
5 1991-09-30 3652 tons/day
diff --git a/vignettes/figure/egretEx.pdf b/vignettes/figure/egretEx.pdf
index a27aeb612b8caa3b238b6aa7bc581018faad0496..18f9006a4a9e367311f7d31b52d3b23cf2c77d9d 100644
Binary files a/vignettes/figure/egretEx.pdf and b/vignettes/figure/egretEx.pdf differ
diff --git a/vignettes/figure/getNWIStemperaturePlot.pdf b/vignettes/figure/getNWIStemperaturePlot.pdf
index d6e09f79349f6080e033a4e451e4904c04a86df7..b19ce4a86f09e5eb0d62cd2d40e8c3bce9eb89fd 100644
Binary files a/vignettes/figure/getNWIStemperaturePlot.pdf and b/vignettes/figure/getNWIStemperaturePlot.pdf differ
diff --git a/vignettes/figure/getQWtemperaturePlot.pdf b/vignettes/figure/getQWtemperaturePlot.pdf
index fee0f5cae1024c264a399331a44e3fe5ca315153..674bdb23df6ce0d14e5fc14bef14bd96a40a6170 100644
Binary files a/vignettes/figure/getQWtemperaturePlot.pdf and b/vignettes/figure/getQWtemperaturePlot.pdf differ