diff --git a/vignettes/dataRetrieval-concordance.tex b/vignettes/dataRetrieval-concordance.tex
index 39d9c5f2865ebda9543ef788f203bef02f98a05a..736487217ae60d1ed15be3ce99edb7b45484af60 100644
--- a/vignettes/dataRetrieval-concordance.tex
+++ b/vignettes/dataRetrieval-concordance.tex
@@ -1,8 +1,8 @@
\Sconcordance{concordance:dataRetrieval.tex:dataRetrieval.Rnw:%
1 126 1 49 0 1 7 15 1 1 14 55 1 3 0 36 1 2 0 11 1 24 %
0 24 1 3 0 23 1 3 0 6 1 7 0 18 1 3 0 25 1 1 0 17 1 9 %
-0 6 1 7 0 21 1 8 0 16 1 4 0 11 1 13 0 21 1 30 0 20 1 %
-3 0 6 1 17 0 27 1 6 0 11 1 9 0 15 1 13 0 21 1 4 0 21 %
+0 6 1 7 0 21 1 8 0 16 1 2 0 11 1 23 0 21 1 9 0 20 1 3 %
+0 6 1 17 0 27 1 10 0 11 1 10 0 15 1 13 0 21 1 4 0 21 %
1 4 0 17 1 7 0 22 1 8 0 19 1 4 0 9 1 4 0 78 1 1 2 9 1 %
1 4 4 1 20 0 44 1 4 0 32 1 4 0 21 1 4 0 21 1 37 0 13 %
1 9 0 94 1 4 0 9 1 13 0 13 1 4 0 14 1 4 0 5 1 4 0 23 %
diff --git a/vignettes/dataRetrieval.lof b/vignettes/dataRetrieval.lof
index 03df6c5a5b321bf5b203f9b4a69995893aba153a..1d5933e2ec1907e8710ffb92fea21554da3c3123 100644
--- a/vignettes/dataRetrieval.lof
+++ b/vignettes/dataRetrieval.lof
@@ -1,6 +1,6 @@
\select@language {american}
-\contentsline {figure}{\numberline {1}{\ignorespaces Nitrate plot of Choptank River}}{13}{figure.caption.4}
+\contentsline {figure}{\numberline {1}{\ignorespaces Temperature and discharge plot of Choptank River in 2012}}{11}{figure.caption.4}
\contentsline {figure}{\numberline {2}{\ignorespaces Default multiPlotDataOverview}}{25}{figure.caption.9}
\contentsline {figure}{\numberline {3}{\ignorespaces A simple R help file\relax }}{29}{figure.caption.13}
-\contentsline {figure}{\numberline {4}{\ignorespaces A simple table produced in Microsoft Excel\relax }}{32}{figure.caption.14}
+\contentsline {figure}{\numberline {4}{\ignorespaces A simple table produced in Microsoft\textregistered \ Excel. Additional formatting will be requried, for example converting u to $\mu $ \relax }}{32}{figure.caption.14}
\contentsfinish
diff --git a/vignettes/dataRetrieval.log b/vignettes/dataRetrieval.log
index 700ce91a70f57e12d9808d95906fb52104f619ba..4e4456e65d3e76d510caa9b3cac562e21c35a0a6 100644
--- a/vignettes/dataRetrieval.log
+++ b/vignettes/dataRetrieval.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.1415926-2.5-1.40.14 (MiKTeX 2.9) (preloaded format=pdflatex 2014.8.7) 9 SEP 2014 09:13
+This is pdfTeX, Version 3.1415926-2.5-1.40.14 (MiKTeX 2.9) (preloaded format=pdflatex 2014.8.7) 9 SEP 2014 12:49
entering extended mode
**dataRetrieval.tex
(D:\LADData\RCode\dataRetrieval\vignettes\dataRetrieval.tex
@@ -632,59 +632,73 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[1
-{C:/Users/ldecicco/AppData/Local/MiKTeX/2.9/pdftex/config/pdftex.map}])
-\tf@toc=\write4
-
-(D:\LADData\RCode\dataRetrieval\vignettes\dataRetrieval.lof)
-\tf@lof=\write5
+{C:/Users/ldecicco/AppData/Local/MiKTeX/2.9/pdftex/config/pdftex.map}]
+LaTeX Font Info: Try loading font information for TS1+ptm on input line 27.
-(D:\LADData\RCode\dataRetrieval\vignettes\dataRetrieval.lot
-Overfull \hbox (1.53842pt too wide) in paragraph at lines 4--4
-[]|\OT1/phv/b/n/10.95 Table| | [][]\OT1/phv/m/n/10.95 Daily mean data avail-ab
-ile at the Chop-tank River near Greens-boro, MD. [Some columns
- []
+("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\ts1ptm.fd"
+File: ts1ptm.fd 2001/06/04 font definitions for TS1/ptm.
+)
+LaTeX Font Info: Try loading font information for TS1+phv on input line 27.
+("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\ts1phv.fd"
+File: ts1phv.fd 2001/06/04 scalable font definitions for TS1/phv.
)
-\tf@lot=\write6
+LaTeX Font Info: Font shape `TS1/phv/m/n' will be
+(Font) scaled to size 9.85492pt on input line 27.
+)
+\tf@toc=\write4
-Overfull \vbox (21.68121pt too high) has occurred while \output is active []
+(D:\LADData\RCode\dataRetrieval\vignettes\dataRetrieval.lof
+LaTeX Font Info: Try loading font information for OT1+ztmcm on input line 5.
-[2]
-LaTeX Font Info: Try loading font information for OT1+ztmcm on input line 21
-3.
- ("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\ot1ztmcm.fd"
+("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\ot1ztmcm.fd"
File: ot1ztmcm.fd 2000/01/03 Fontinst v1.801 font definitions for OT1/ztmcm.
)
-LaTeX Font Info: Try loading font information for OML+ztmcm on input line 21
-3.
+LaTeX Font Info: Try loading font information for OML+ztmcm on input line 5.
+
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\omlztmcm.fd"
File: omlztmcm.fd 2000/01/03 Fontinst v1.801 font definitions for OML/ztmcm.
)
-LaTeX Font Info: Try loading font information for OMS+ztmcm on input line 21
-3.
+LaTeX Font Info: Try loading font information for OMS+ztmcm on input line 5.
+
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\omsztmcm.fd"
File: omsztmcm.fd 2000/01/03 Fontinst v1.801 font definitions for OMS/ztmcm.
)
-LaTeX Font Info: Try loading font information for OMX+ztmcm on input line 21
-3.
+LaTeX Font Info: Try loading font information for OMX+ztmcm on input line 5.
+
("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\omxztmcm.fd"
File: omxztmcm.fd 2000/01/03 Fontinst v1.801 font definitions for OMX/ztmcm.
)
LaTeX Font Info: Font shape `OT1/ptm/bx/n' in size <10.95> not available
-(Font) Font shape `OT1/ptm/b/n' tried instead on input line 213.
+(Font) Font shape `OT1/ptm/b/n' tried instead on input line 5.
LaTeX Font Info: Font shape `OT1/ptm/bx/n' in size <8> not available
-(Font) Font shape `OT1/ptm/b/n' tried instead on input line 213.
+(Font) Font shape `OT1/ptm/b/n' tried instead on input line 5.
LaTeX Font Info: Font shape `OT1/ptm/bx/n' in size <6> not available
-(Font) Font shape `OT1/ptm/b/n' tried instead on input line 213.
+(Font) Font shape `OT1/ptm/b/n' tried instead on input line 5.
+)
+\tf@lof=\write5
+
+(D:\LADData\RCode\dataRetrieval\vignettes\dataRetrieval.lot
+Overfull \hbox (1.53842pt too wide) in paragraph at lines 4--4
+[]|\OT1/phv/b/n/10.95 Table| | [][]\OT1/phv/m/n/10.95 Daily mean data avail-ab
+ile at the Chop-tank River near Greens-boro, MD. [Some columns
+ []
+
+)
+\tf@lot=\write6
+
+Overfull \vbox (21.68121pt too high) has occurred while \output is active []
+
+
+[2]
Package color Info: Redefining color shadecolor on input line 223.
LaTeX Font Info: Try loading font information for OT1+pcr on input line 224.
-
-("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\ot1pcr.fd"
+ ("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\ot1pcr.fd"
File: ot1pcr.fd 2001/06/04 font definitions for OT1/pcr.
)
LaTeX Font Info: Font shape `OT1/pcr/bx/n' in size <10.95> not available
@@ -735,84 +749,76 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[6]
Package color Info: Redefining color shadecolor on input line 401.
+Overfull \vbox (21.68121pt too high) has occurred while \output is active []
+
+
+[7]
Overfull \hbox (36.60727pt too wide) in paragraph at lines 446--447
[]\OT1/ptm/m/n/10.95 To ob-tain all of the avail-able in-for-ma-tion con-cern-i
ng a mea-sured pa-ram-e-ter, use the \OT1/pcr/m/n/10.95 getParameterInfo
[]
Package color Info: Redefining color shadecolor on input line 449.
-
-Overfull \vbox (21.68121pt too high) has occurred while \output is active []
-
-
-[7]
Package color Info: Redefining color shadecolor on input line 467.
-Package color Info: Redefining color shadecolor on input line 487.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[8]
+Package color Info: Redefining color shadecolor on input line 487.
Package color Info: Redefining color shadecolor on input line 511.
-Package color Info: Redefining color shadecolor on input line 531.
-
-Underfull \vbox (badness 10000) detected at line 547
- []
-
+Package color Info: Redefining color shadecolor on input line 529.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[9]
+Package color Info: Redefining color shadecolor on input line 561.
-LaTeX Warning: Reference `fig:getNWIStemperaturePlot' on page 10 undefined on i
-nput line 550.
-
-Package color Info: Redefining color shadecolor on input line 553.
-Overfull \vbox (21.68121pt too high) has occurred while \output is active []
+LaTeX Warning: No positions in optional float specifier.
+ Default added (so using `tbp') on input line 580.
+<figure/getNWIStemperaturePlot.pdf, id=268, 505.89pt x 505.89pt>
+File: figure/getNWIStemperaturePlot.pdf Graphic file (type pdf)
-[10]
-Package color Info: Redefining color shadecolor on input line 613.
-Package color Info: Redefining color shadecolor on input line 627.
+<use figure/getNWIStemperaturePlot.pdf>
+Package pdftex.def Info: figure/getNWIStemperaturePlot.pdf used on input line 5
+82.
+(pdftex.def) Requested size: 448.07928pt x 448.07928pt.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
-[11]
-Package color Info: Redefining color shadecolor on input line 662.
-Package color Info: Redefining color shadecolor on input line 683.
-
-
-LaTeX Warning: No positions in optional float specifier.
- Default added (so using `tbp') on input line 692.
+[10]
+Overfull \vbox (21.68121pt too high) has occurred while \output is active []
-<figure/getQWtemperaturePlot.pdf, id=278, 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 694
-.
-(pdftex.def) Requested size: 448.07378pt x 448.07928pt.
+[11 <D:/LADData/RCode/dataRetrieval/vignettes/figure/getNWIStemperaturePlot.pdf
+>]
+Package color Info: Redefining color shadecolor on input line 600.
+Package color Info: Redefining color shadecolor on input line 614.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[12]
+Package color Info: Redefining color shadecolor on input line 649.
+Package color Info: Redefining color shadecolor on input line 674.
+
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
-[13 <D:/LADData/RCode/dataRetrieval/vignettes/figure/getQWtemperaturePlot.pdf>]
-Package color Info: Redefining color shadecolor on input line 710.
-LaTeX Font Info: Try loading font information for TS1+pcr on input line 712.
+[13]
+Package color Info: Redefining color shadecolor on input line 702.
+LaTeX Font Info: Try loading font information for TS1+pcr on input line 704.
-("C:\Program Files (x86)\MiKTeX 2.9\tex\latex\psnfss\ts1pcr.fd"
+ ("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 739.
+Package color Info: Redefining color shadecolor on input line 731.
-Overfull \hbox (5.25568pt too wide) in paragraph at lines 748--748
+Overfull \hbox (5.25568pt too wide) in paragraph at lines 740--740
[][]\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 )[][
@@ -824,20 +830,20 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[14]
-Package color Info: Redefining color shadecolor on input line 770.
+Package color Info: Redefining color shadecolor on input line 762.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[15]
-Package color Info: Redefining color shadecolor on input line 788.
+Package color Info: Redefining color shadecolor on input line 780.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[16]
-Package color Info: Redefining color shadecolor on input line 846.
-Package color Info: Redefining color shadecolor on input line 858.
+Package color Info: Redefining color shadecolor on input line 838.
+Package color Info: Redefining color shadecolor on input line 850.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
@@ -851,46 +857,42 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[19]
-Package color Info: Redefining color shadecolor on input line 958.
+Package color Info: Redefining color shadecolor on input line 950.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[20]
-Package color Info: Redefining color shadecolor on input line 1019.
-LaTeX Font Info: Try loading font information for OMS+pcr on input line 1024
+Package color Info: Redefining color shadecolor on input line 1011.
+
+Overfull \vbox (21.68121pt too high) has occurred while \output is active []
+
+
+[21]
+LaTeX Font Info: Try loading font information for OMS+pcr on input line 1016
.
("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 1024.
-
-
-Underfull \vbox (badness 10000) detected at line 1026
- []
+(Font) Font shape `OMS/cmsy/m/n' tried instead on input line 1016.
-
-Overfull \vbox (21.68121pt too high) has occurred while \output is active []
-
-
-[21]
-Package color Info: Redefining color shadecolor on input line 1055.
+Package color Info: Redefining color shadecolor on input line 1047.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[22]
-Package color Info: Redefining color shadecolor on input line 1080.
-Package color Info: Redefining color shadecolor on input line 1100.
+Package color Info: Redefining color shadecolor on input line 1072.
+Package color Info: Redefining color shadecolor on input line 1092.
-Overfull \hbox (44.67563pt too wide) in paragraph at lines 1125--1125
+Overfull \hbox (44.67563pt too wide) in paragraph at lines 1117--1117
[] \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 1125--1125
+Overfull \hbox (44.67563pt too wide) in paragraph at lines 1117--1117
[] \OT1/pcr/m/n/10.95 The first sample is from 2000-01-04 and the last sample i
s from 2012-12-18[]
[]
@@ -900,16 +902,16 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[23]
-Package color Info: Redefining color shadecolor on input line 1156.
+Package color Info: Redefining color shadecolor on input line 1148.
LaTeX Warning: No positions in optional float specifier.
- Default added (so using `tbp') on input line 1162.
+ Default added (so using `tbp') on input line 1154.
<figure/egretEx.pdf, id=355, 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 1164.
+Package pdftex.def Info: figure/egretEx.pdf used on input line 1156.
(pdftex.def) Requested size: 448.07378pt x 448.07928pt.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
@@ -930,14 +932,14 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[27]
-Package color Info: Redefining color shadecolor on input line 1261.
-Package color Info: Redefining color shadecolor on input line 1274.
+Package color Info: Redefining color shadecolor on input line 1253.
+Package color Info: Redefining color shadecolor on input line 1266.
<Rhelp.png, id=385, 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 1293.
+Package pdftex.def Info: Rhelp.png used on input line 1285.
(pdftex.def) Requested size: 433.61894pt x 395.22559pt.
-Package color Info: Redefining color shadecolor on input line 1300.
+Package color Info: Redefining color shadecolor on input line 1292.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
@@ -949,9 +951,13 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[29 <D:/LADData/RCode/dataRetrieval/vignettes/Rhelp.png>]
-Package color Info: Redefining color shadecolor on input line 1315.
-Package color Info: Redefining color shadecolor on input line 1327.
-Package color Info: Redefining color shadecolor on input line 1342.
+Package color Info: Redefining color shadecolor on input line 1307.
+Package color Info: Redefining color shadecolor on input line 1319.
+LaTeX Font Info: Font shape `TS1/phv/bx/n' in size <17.28> not available
+(Font) Font shape `TS1/phv/b/n' tried instead on input line 1328.
+LaTeX Font Info: Font shape `TS1/phv/b/n' will be
+(Font) scaled to size 15.55188pt on input line 1328.
+Package color Info: Redefining color shadecolor on input line 1334.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
@@ -959,9 +965,9 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[30
]
-Package color Info: Redefining color shadecolor on input line 1379.
+Package color Info: Redefining color shadecolor on input line 1371.
-Overfull \hbox (11.82567pt too wide) in paragraph at lines 1396--1396
+Overfull \hbox (11.82567pt too wide) in paragraph at lines 1388--1388
[]\OT1/pcr/m/n/10.95 Suspended sediment concentration (SSC) 1980-10-01 1991-09-
30 3651 mg/l[]
[]
@@ -973,36 +979,32 @@ Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[31] <table1.png, id=409, 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 1415.
+Package pdftex.def Info: table1.png used on input line 1407.
(pdftex.def) Requested size: 554.06865pt x 125.71936pt.
Overfull \vbox (21.68121pt too high) has occurred while \output is active []
[32 <D:/LADData/RCode/dataRetrieval/vignettes/table1.png>]
-Package atveryend Info: Empty hook `BeforeClearDocument' on input line 1440.
-Package atveryend Info: Empty hook `AfterLastShipout' on input line 1440.
+Package atveryend Info: Empty hook `BeforeClearDocument' on input line 1432.
+Package atveryend Info: Empty hook `AfterLastShipout' on input line 1432.
(D:\LADData\RCode\dataRetrieval\vignettes\dataRetrieval.aux)
-Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 1440.
-Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 1440.
+Package atveryend Info: Executing hook `AtVeryEndDocument' on input line 1432.
+Package atveryend Info: Executing hook `AtEndAfterFileList' on input line 1432.
Package rerunfilecheck Info: File `dataRetrieval.out' has not changed.
-(rerunfilecheck) Checksum: 0A42302DA34F8DDBBBAD8A2EC505FAF3;1805.
-
-
-LaTeX Warning: There were undefined references.
-
-Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 1440.
+(rerunfilecheck) Checksum: 09D57CF47C75A1B38FC38F889C2C3F6D;1818.
+Package atveryend Info: Empty hook `AtVeryVeryEnd' on input line 1432.
)
Here is how much of TeX's memory you used:
- 9903 strings out of 493921
- 148012 string characters out of 3144868
- 248429 words of memory out of 3000000
- 12912 multiletter control sequences out of 15000+200000
- 46787 words of font info for 92 fonts, out of 3000000 for 9000
+ 9959 strings out of 493921
+ 148884 string characters out of 3144868
+ 249540 words of memory out of 3000000
+ 12958 multiletter control sequences out of 15000+200000
+ 47347 words of font info for 96 fonts, out of 3000000 for 9000
841 hyphenation exceptions out of 8191
- 44i,15n,42p,958b,506s stack positions out of 5000i,500n,10000p,200000b,50000s
+ 44i,15n,42p,957b,506s stack positions out of 5000i,500n,10000p,200000b,50000s
{C:/Program Files (x86)/MiKTeX 2.9/fonts/enc/dvips/fontname/8r.enc}<C:/Progra
m Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmmi10.pfb><C:/Program
Files (x86)/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmsy10.pfb><C:/Program Fi
@@ -1010,10 +1012,11 @@ les (x86)/MiKTeX 2.9/fonts/type1/urw/courier/ucrb8a.pfb><C:/Program Files (x86)
/MiKTeX 2.9/fonts/type1/urw/courier/ucrr8a.pfb><C:/Program Files (x86)/MiKTeX 2
.9/fonts/type1/urw/courier/ucrro8a.pfb><C:/Program Files (x86)/MiKTeX 2.9/fonts
/type1/urw/helvetic/uhvb8a.pfb><C:/Program Files (x86)/MiKTeX 2.9/fonts/type1/u
-rw/helvetic/uhvr8a.pfb><C:/Program Files (x86)/MiKTeX 2.9/fonts/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/utmri8a.pfb>
-Output written on dataRetrieval.pdf (32 pages, 330667 bytes).
+rw/helvetic/uhvr8a.pfb><C:/Users/ldecicco/AppData/Roaming/MiKTeX/2.9/fonts/type
+1/urw/symbol/usyr.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/utmri8a.pfb
+>
+Output written on dataRetrieval.pdf (32 pages, 302823 bytes).
PDF statistics:
473 PDF objects out of 1000 (max. 8388607)
82 named destinations out of 1000 (max. 500000)
diff --git a/vignettes/dataRetrieval.lot b/vignettes/dataRetrieval.lot
index 3a5eb2da674211f4da837b4ad89661bcb5bba4e5..491563a0adeb2de6a68217e80188dcfd22454364 100644
--- a/vignettes/dataRetrieval.lot
+++ b/vignettes/dataRetrieval.lot
@@ -2,7 +2,7 @@
\contentsline {table}{\numberline {1}{\ignorespaces Common USGS Parameter Codes\relax }}{5}{table.caption.1}
\contentsline {table}{\numberline {2}{\ignorespaces Commonly used USGS Stat Codes\relax }}{6}{table.caption.2}
\contentsline {table}{\numberline {3}{\ignorespaces Daily mean data availabile at the Choptank River near Greensboro, MD. [Some columns deleted for space considerations]\relax }}{7}{table.caption.3}
-\contentsline {table}{\numberline {4}{\ignorespaces Daily dataframe\relax }}{17}{table.caption.5}
+\contentsline {table}{\numberline {4}{\ignorespaces Daily dataframe\relax }}{16}{table.caption.5}
\contentsline {table}{\numberline {5}{\ignorespaces Sample dataframe\relax }}{18}{table.caption.7}
\contentsline {table}{\numberline {6}{\ignorespaces Example data\relax }}{19}{table.caption.8}
\contentsline {table}{\numberline {7}{\ignorespaces dataRetrieval functions\relax }}{27}{table.caption.11}
diff --git a/vignettes/dataRetrieval.pdf b/vignettes/dataRetrieval.pdf
index f8e1201f4664f744b96dd07689a130470336a867..cd1118d0a36edfe818ed08d7f3eb97b4942f8a3e 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 dba108f1d2293ccc8d3466893bcb9e175008d7f9..5954facaaeb66dd69dcaccae9275f762775f2b49 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 1fbcaebcdb9ddee4157d68ab63743981fd135954..fc9a852b6e1bf6e029db44278463e04e66199104 100644
--- a/vignettes/dataRetrieval.tex
+++ b/vignettes/dataRetrieval.tex
@@ -213,9 +213,9 @@
The dataRetrieval package was created to simplify the process of loading hydrologic data into the R environment. It has been specifically designed to work seamlessly with the EGRET R package: Exploration and Graphics for RivEr Trends. See: \url{https://github.com/USGS-R/EGRET/wiki} for information on EGRET. EGRET is designed to provide analysis of water quality data sets using the Weighted Regressions on Time, Discharge and Season (WRTDS) method as well as analysis of discharge trends using robust time-series smoothing techniques. Both of these capabilities provide both tabular and graphical analyses of long-term data sets.
-The dataRetrieval package is designed to retrieve many of the major data types of United States Geological Survey (USGS) hydrologic data that are available on the Web. Users may also load data from other sources (text files, spreadsheets) using dataRetrieval. Section \ref{sec:genRetrievals} provides examples of how one can obtain raw data from USGS sources on the Web and load them into data frames within the R environment. The functionality described in section \ref{sec:genRetrievals} is for general use and is not tailored for the specific uses of the EGRET package. The functionality described in section \ref{sec:EGRETdfs} is tailored specifically to obtaining input from the Web and structuring it for use in the EGRET package. The functionality described in section \ref{sec:summary} is for converting hydrologic data from user-supplied files and structuring it specifically for use in the EGRET package.
+The dataRetrieval package is designed to retrieve many of the major data types of United States Geological Survey (USGS) hydrologic data that are available on the Web. Users may also load data from other sources (text files, spreadsheets) using dataRetrieval. Section \ref{sec:genRetrievals} provides examples of how one can obtain raw data from USGS sources on the Web and load them into dataframes within the R environment. The functionality described in section \ref{sec:genRetrievals} is for general use and is not tailored for the specific uses of the EGRET package. The functionality described in section \ref{sec:EGRETdfs} is tailored specifically to obtaining input from the Web and structuring it for use in the EGRET package. The functionality described in section \ref{sec:summary} is for converting hydrologic data from user-supplied files and structuring it specifically for use in the EGRET package.
-For information on getting started in R and installing the package, see (\ref{sec:appendix1}): Getting Started.
+For information on getting started in R and installing the package, see (\ref{sec:appendix1}): Getting Started. Any use of trade, firm, or product names is for descriptive purposes only and does not imply endorsement by the U.S. Government.
A quick workflow for major dataRetrieval functions:
@@ -223,7 +223,7 @@ A quick workflow for major dataRetrieval functions:
\definecolor{shadecolor}{rgb}{0.969, 0.969, 0.969}\color{fgcolor}\begin{kframe}
\begin{alltt}
\hlkwd{library}\hlstd{(dataRetrieval)}
-\hlcom{# Site ID for Choptank River near Greensboro, MD}
+\hlcom{# Choptank River near Greensboro, MD}
\hlstd{siteNumber} \hlkwb{<-} \hlstr{"01491000"}
\hlstd{ChoptankInfo} \hlkwb{<-} \hlkwd{getSiteFileData}\hlstd{(siteNumber)}
\hlstd{parameterCd} \hlkwb{<-} \hlstr{"00060"}
@@ -267,7 +267,7 @@ Not every station will measure all parameters. A short list of commonly measured
% latex table generated in R 3.1.1 by xtable 1.7-3 package
-% Tue Sep 09 09:12:59 2014
+% Tue Sep 09 12:48:00 2014
\begin{table}[ht]
\caption{Common USGS Parameter Codes}
\label{tab:params}
@@ -323,14 +323,14 @@ A complete list (as of September 25, 2013) is available as data attached to the
\end{knitrout}
-For unit values data (sensor data measured at regular time intervals such as 15 minutes or hourly), knowing the parameter code and site ID is enough to make a request for data. For most variables that are measured on a continuous basis, the USGS also stores the historical data as daily values. These daily values are statistical summaries of the continuous data, e.g. maximum, minimum, mean, or median. The different statistics are specified by a 5-digit statistics code. A complete list of statistic codes can be found here:
+For unit values data (sensor data measured at regular time intervals such as 15 minutes or hourly), knowing the parameter code and siteNumber is enough to make a request for data. For most variables that are measured on a continuous basis, the USGS also stores the historical data as daily values. These daily values are statistical summaries of the continuous data, e.g. maximum, minimum, mean, or median. The different statistics are specified by a 5-digit statistics code. A complete list of statistic codes can be found here:
\url{http://nwis.waterdata.usgs.gov/nwis/help/?read_file=stat&format=table}
Some common codes are shown in Table \ref{tab:stat}.
% latex table generated in R 3.1.1 by xtable 1.7-3 package
-% Tue Sep 09 09:13:00 2014
+% Tue Sep 09 12:48:01 2014
\begin{table}[ht]
\caption{Commonly used USGS Stat Codes}
\label{tab:stat}
@@ -349,7 +349,7 @@ Some common codes are shown in Table \ref{tab:stat}.
\end{table}
-Examples for using these site ID's, parameter codes, and stat codes will be presented in subsequent sections.
+Examples for using these siteNumber's, parameter codes, and stat codes will be presented in subsequent sections.
\FloatBarrier
@@ -368,7 +368,7 @@ Use the \texttt{getSiteFileData} function to obtain all of the information avail
\begin{knitrout}
\definecolor{shadecolor}{rgb}{0.969, 0.969, 0.969}\color{fgcolor}\begin{kframe}
\begin{alltt}
-\hlcom{# Site ID for Choptank River near Greensboro, MD}
+\hlcom{# Choptank River near Greensboro, MD}
\hlstd{siteNumber} \hlkwb{<-} \hlstr{"01491000"}
\hlstd{ChoptankInfo} \hlkwb{<-} \hlkwd{getSiteFileData}\hlstd{(siteNumber)}
\end{alltt}
@@ -411,7 +411,7 @@ To discover what data is available for a particular USGS site, including measure
% latex table generated in R 3.1.1 by xtable 1.7-3 package
-% Tue Sep 09 09:13:00 2014
+% Tue Sep 09 12:48:02 2014
\begin{table}[ht]
\caption{Daily mean data availabile at the Choptank River near Greensboro, MD. [Some columns deleted for space considerations]}
\label{tab:gda}
@@ -423,7 +423,7 @@ To discover what data is available for a particular USGS site, including measure
& Temperature, water & 1988-10-01 & 2012-05-09 & 894 & deg C \\
[5pt] & Temperature, water & 2010-10-01 & 2012-05-09 & 529 & deg C \\
[5pt] & Temperature, water & 2010-10-01 & 2012-05-09 & 529 & deg C \\
- [5pt] & Stream flow, mean. daily & 1948-01-01 & 2014-09-07 & 24357 & ft$^3$/s \\
+ [5pt] & Stream flow, mean. daily & 1948-01-01 & 2014-09-08 & 24358 & ft$^3$/s \\
[5pt] & Specific conductance & 2010-10-01 & 2012-05-09 & 527 & uS/cm @25C \\
[5pt] & Specific conductance & 2010-10-01 & 2012-05-09 & 527 & uS/cm @25C \\
[5pt] & Specific conductance & 2010-10-01 & 2012-05-09 & 527 & uS/cm @25C \\
@@ -435,7 +435,7 @@ To discover what data is available for a particular USGS site, including measure
\end{table}
-See Section \ref{app:createWordTable} for instructions on converting an R dataframe to a table in Microsoft Excel or Word to display a data availability table similar to Table \ref{tab:gda}.
+See Section \ref{app:createWordTable} for instructions on converting an R dataframe to a table in Microsoft\textregistered\ software Excel or Word to display a data availability table similar to Table \ref{tab:gda}. Excel, Microsoft, PowerPoint, Windows, and Word are registered trademarks of Microsoft Corporation in the United States and other countries.
\FloatBarrier
@@ -473,7 +473,7 @@ A specific example piece of information, in this case parameter name, can be obt
\end{verbatim}
\end{kframe}
\end{knitrout}
-Parameter information is obtained from \url{http://nwis.waterdata.usgs.gov/nwis/pmcodes/}
+Parameter information can obtained from \url{http://nwis.waterdata.usgs.gov/usa/nwis/pmcodes}
\FloatBarrier
%------------------------------------------------------------
\subsection{Daily Values}
@@ -504,7 +504,7 @@ The dates (start and end) must be in the format \texttt{"}YYYY-MM-DD\texttt{"} (
\end{knitrout}
The column \texttt{"}datetime\texttt{"} in the returned dataframe is automatically imported as a variable of class \texttt{"}Date\texttt{"} in R. 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}
+\url{http://nwis.waterdata.usgs.gov/usa/nwis/pmcodes}
Another example that doesn't use the defaults would be a request for mean and maximum daily temperature and discharge in early 2012:
\begin{knitrout}
@@ -518,9 +518,7 @@ Another example that doesn't use the defaults would be a request for mean and ma
\hlstd{temperatureAndFlow} \hlkwb{<-} \hlkwd{retrieveNWISdvData}\hlstd{(siteNumber, parameterCd,}
\hlstd{startDate, endDate,} \hlkwc{statCd}\hlstd{=statCd)}
\end{alltt}
-
-
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: unused argument (statCd = statCd)}}\end{kframe}
+\end{kframe}
\end{knitrout}
Daily data is pulled from \url{http://waterservices.usgs.gov/rest/DV-Test-Tool.html}.
@@ -532,19 +530,29 @@ The column names can be automatically adjusted based on the parameter and statis
\begin{alltt}
\hlkwd{names}\hlstd{(temperatureAndFlow)}
\end{alltt}
-
-
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: object 'temperatureAndFlow' not found}}\begin{alltt}
+\begin{verbatim}
+[1] "agency_cd" "site_no"
+[3] "datetime" "X01_00010_00001"
+[5] "X01_00010_00001_cd" "X01_00010_00003"
+[7] "X01_00010_00003_cd" "X02_00060_00003"
+[9] "X02_00060_00003_cd"
+\end{verbatim}
+\begin{alltt}
\hlstd{temperatureAndFlow} \hlkwb{<-} \hlkwd{renameColumns}\hlstd{(temperatureAndFlow)}
-\end{alltt}
-
-
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: object 'temperatureAndFlow' not found}}\begin{alltt}
\hlkwd{names}\hlstd{(temperatureAndFlow)}
\end{alltt}
-
-
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: object 'temperatureAndFlow' not found}}\end{kframe}
+\begin{verbatim}
+[1] "agency_cd"
+[2] "site_no"
+[3] "datetime"
+[4] "Temperature_water_degrees_Celsius_Max_01"
+[5] "Temperature_water_degrees_Celsius_Max_01_cd"
+[6] "Temperature_water_degrees_Celsius_01"
+[7] "Temperature_water_degrees_Celsius_01_cd"
+[8] "Discharge_cubic_feet_per_second"
+[9] "Discharge_cubic_feet_per_second_cd"
+\end{verbatim}
+\end{kframe}
\end{knitrout}
An example of plotting the above data (Figure \ref{fig:getNWIStemperaturePlot}):
@@ -558,48 +566,27 @@ An example of plotting the above data (Figure \ref{fig:getNWIStemperaturePlot}):
\hlstd{datetime, Temperature_water_degrees_Celsius_Max_01,}
\hlkwc{xlab}\hlstd{=}\hlstr{"Date"}\hlstd{,}\hlkwc{ylab}\hlstd{=}\hlstr{"Max Temperature [C]"}
\hlstd{))}
-\end{alltt}
-
-
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: object 'temperatureAndFlow' not found}}\begin{alltt}
\hlkwd{par}\hlstd{(}\hlkwc{new}\hlstd{=}\hlnum{TRUE}\hlstd{)}
-\end{alltt}
-
-
-{\ttfamily\noindent\color{warningcolor}{Warning: calling par(new=TRUE) with no plot}}\begin{alltt}
\hlkwd{with}\hlstd{(temperatureAndFlow,} \hlkwd{plot}\hlstd{(}
\hlstd{datetime, Discharge_cubic_feet_per_second,}
\hlkwc{col}\hlstd{=}\hlstr{"red"}\hlstd{,}\hlkwc{type}\hlstd{=}\hlstr{"l"}\hlstd{,}\hlkwc{xaxt}\hlstd{=}\hlstr{"n"}\hlstd{,}\hlkwc{yaxt}\hlstd{=}\hlstr{"n"}\hlstd{,}\hlkwc{xlab}\hlstd{=}\hlstr{""}\hlstd{,}\hlkwc{ylab}\hlstd{=}\hlstr{""}\hlstd{,}\hlkwc{axes}\hlstd{=}\hlnum{FALSE}
\hlstd{))}
-\end{alltt}
-
-
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: object 'temperatureAndFlow' not found}}\begin{alltt}
\hlkwd{axis}\hlstd{(}\hlnum{4}\hlstd{,}\hlkwc{col}\hlstd{=}\hlstr{"red"}\hlstd{,}\hlkwc{col.axis}\hlstd{=}\hlstr{"red"}\hlstd{)}
-\end{alltt}
-
-
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: plot.new has not been called yet}}\begin{alltt}
\hlkwd{mtext}\hlstd{(}\hlstr{"Mean Discharge [ft3/s]"}\hlstd{,}\hlkwc{side}\hlstd{=}\hlnum{4}\hlstd{,}\hlkwc{line}\hlstd{=}\hlnum{3}\hlstd{,}\hlkwc{col}\hlstd{=}\hlstr{"red"}\hlstd{)}
-\end{alltt}
-
-
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: plot.new has not been called yet}}\begin{alltt}
\hlkwd{title}\hlstd{(}\hlkwd{paste}\hlstd{(ChoptankInfo}\hlopt{$}\hlstd{station.nm,}\hlstr{"2012"}\hlstd{,}\hlkwc{sep}\hlstd{=}\hlstr{" "}\hlstd{))}
-\end{alltt}
-
-
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: plot.new has not been called yet}}\begin{alltt}
\hlkwd{legend}\hlstd{(}\hlstr{"topleft"}\hlstd{,} \hlkwd{c}\hlstd{(}\hlstr{"Max Temperature"}\hlstd{,} \hlstr{"Mean Discharge"}\hlstd{),}
\hlkwc{col}\hlstd{=}\hlkwd{c}\hlstd{(}\hlstr{"black"}\hlstd{,}\hlstr{"red"}\hlstd{),}\hlkwc{lty}\hlstd{=}\hlkwd{c}\hlstd{(}\hlnum{NA}\hlstd{,}\hlnum{1}\hlstd{),}\hlkwc{pch}\hlstd{=}\hlkwd{c}\hlstd{(}\hlnum{1}\hlstd{,}\hlnum{NA}\hlstd{))}
\end{alltt}
+\end{kframe}\begin{figure}[]
+
+\includegraphics[width=1\linewidth,height=1\linewidth]{figure/getNWIStemperaturePlot} \caption[Temperature and discharge plot of Choptank River in 2012]{Temperature and discharge plot of Choptank River in 2012.\label{fig:getNWIStemperaturePlot}}
+\end{figure}
-{\ttfamily\noindent\bfseries\color{errorcolor}{Error: plot.new has not been called yet}}\end{kframe}
\end{knitrout}
-There are occasions where NWIS values are not reported as numbers, instead there might be text describing a certain event such as \enquote{Ice}. Any value that cannot be converted to a number will be reported as NA in this package (not including remark code columns).
+There are occasions where NWIS values are not reported as numbers, instead there might be text describing a certain event such as \enquote{Ice.} Any value that cannot be converted to a number will be reported as NA in this package (not including remark code columns).
\FloatBarrier
@@ -607,7 +594,7 @@ There are occasions where NWIS values are not reported as numbers, instead there
\subsection{Unit Values}
\label{sec:usgsRT}
%------------------------------------------------------------
-Any data collected at regular time intervals (such as 15-minute or hourly) are known as \enquote{unit values}. Many of these are delivered on a real time basis and very recent data (even less than an hour old in many cases) are available through the function \texttt{retrieveNWISunitData}. Some of these unit values are available for many years, and some are only available for a recent time period such as 120 days. Here is an example of a retrieval of such data.
+Any data collected at regular time intervals (such as 15-minute or hourly) are known as \enquote{unit values.} Many of these are delivered on a real time basis and very recent data (even less than an hour old in many cases) are available through the function \texttt{retrieveNWISunitData}. Some of these unit values are available for many years, and some are only available for a recent time period such as 120 days. Here is an example of a retrieval of such data.
\begin{knitrout}
\definecolor{shadecolor}{rgb}{0.969, 0.969, 0.969}\color{fgcolor}\begin{kframe}
@@ -644,7 +631,7 @@ The retrieval produces the following dataframe:
\end{kframe}
\end{knitrout}
-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 retrieved 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 \enquote{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 are retrieved 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 \enquote{Ice.} Any value that cannot be converted to a number will be reported as NA in this package.
\newpage
@@ -663,18 +650,22 @@ To get USGS water quality data from water samples collected at the streamgage or
\begin{alltt}
\hlcom{# Dissolved Nitrate parameter codes:}
\hlstd{parameterCd} \hlkwb{<-} \hlkwd{c}\hlstd{(}\hlstr{"00618"}\hlstd{,}\hlstr{"71851"}\hlstd{)}
-\hlstd{startDate} \hlkwb{<-} \hlstr{"1979-10-11"}
-\hlstd{endDate} \hlkwb{<-} \hlstr{"2012-12-18"}
+\hlstd{startDate} \hlkwb{<-} \hlstr{"1985-10-01"}
+\hlstd{endDate} \hlkwb{<-} \hlstr{"2012-09-30"}
\hlstd{dissolvedNitrate} \hlkwb{<-} \hlkwd{retrieveNWISqwData}\hlstd{(siteNumber, parameterCd,}
\hlstd{startDate, endDate)}
+\end{alltt}
+
+
+{\ttfamily\noindent\color{warningcolor}{Warning: cannot open: HTTP status was '0 (nil)'}}
+
+{\ttfamily\noindent\bfseries\color{errorcolor}{Error: cannot open the connection}}\begin{alltt}
\hlkwd{names}\hlstd{(dissolvedNitrate)}
\end{alltt}
-\begin{verbatim}
-[1] "dateTime" "site" "qualifier_00618"
-[4] "value_00618" "qualifier_71851" "value_71851"
-\end{verbatim}
-\end{kframe}
+
+
+{\ttfamily\noindent\bfseries\color{errorcolor}{Error: object 'dissolvedNitrate' not found}}\end{kframe}
\end{knitrout}
% Note that in this \enquote{simple} dataframe, datetime is imported as Dates (no times are included), and the qualifier is either blank or \verb@"<"@ signifying a censored value. A plotting example is shown in Figure \ref{fig:getQWtemperaturePlot}.
@@ -687,14 +678,15 @@ To get USGS water quality data from water samples collected at the streamgage or
\hlkwc{xlab}\hlstd{=}\hlstr{"Date"}\hlstd{,}\hlkwc{ylab} \hlstd{=} \hlkwd{paste}\hlstd{(parameterINFO}\hlopt{$}\hlstd{srsname,}
\hlstr{"["}\hlstd{,parameterINFO}\hlopt{$}\hlstd{parameter_units,}\hlstr{"]"}\hlstd{)}
\hlstd{))}
-\hlkwd{title}\hlstd{(ChoptankInfo}\hlopt{$}\hlstd{station.nm)}
\end{alltt}
-\end{kframe}\begin{figure}[]
-\includegraphics[width=\maxwidth]{figure/getQWtemperaturePlot} \caption[Nitrate plot of Choptank River]{Nitrate plot of Choptank River.\label{fig:getQWtemperaturePlot}}
-\end{figure}
+
+{\ttfamily\noindent\bfseries\color{errorcolor}{Error: object 'dissolvedNitrate' not found}}\begin{alltt}
+\hlkwd{title}\hlstd{(ChoptankInfo}\hlopt{$}\hlstd{station.nm)}
+\end{alltt}
+{\ttfamily\noindent\bfseries\color{errorcolor}{Error: plot.new has not been called yet}}\end{kframe}
\end{knitrout}
\FloatBarrier
@@ -703,7 +695,7 @@ To get USGS water quality data from water samples collected at the streamgage or
\subsection{STORET Water Quality Retrievals}
\label{sec:usgsSTORET}
%------------------------------------------------------------
-There are additional water quality data sets available from the Water Quality Data Portal (\url{http://www.waterqualitydata.us/}). These data sets can be housed in either the STORET (data from EPA) or NWIS database. Since STORET does not use USGS parameter codes, a \texttt{"}characteristic name\texttt{"} must be supplied. The \texttt{getWQPData} function can retrieve either STORET or NWIS, but requires a characteristic name rather than parameter code. The Water Quality Data Portal includes data discovery tools, and information on characteristic names. The following example retrieves specific conductance from a DNR site in Wisconsin.
+There are additional water quality data sets available from the Water Quality Data Portal (\url{http://www.waterqualitydata.us/}). These data sets can be housed in either the STORET (data from EPA) or NWIS database. Because STORET does not use USGS parameter codes, a \texttt{"}characteristic name\texttt{"} must be supplied. The \texttt{getWQPData} function can retrieve either STORET or NWIS, but requires a characteristic name rather than parameter code. The Water Quality Data Portal includes data discovery tools and information on characteristic names. The following example retrieves specific conductance from a DNR site in Wisconsin.
\begin{knitrout}
@@ -758,7 +750,7 @@ There may be times when you might be interested in seeing the URL (Web address)
%------------------------------------------------------------
Rather than using the raw data as retrieved by the Web, the dataRetrieval package also includes functions that return the data in a structure that has been designed to work with the EGRET R package (\url{https://github.com/USGS-R/EGRET/wiki}). In general, these dataframes may be much more 'R-friendly' than the raw data, and will contain additional date information that allows for efficient data analysis.
-In this section, we use 3 dataRetrieval functions to get sufficient data to perform an EGRET analysis. We will continue analyzing the Choptank River. We will be retrieving essentially the same data that were retrieved in section \ref{sec:genRetrievals}, but in this case it will be structured into three EGRET-specific dataframes. The daily discharge data will be placed in a dataframe called Daily. The nitrate sample data will be placed in a dataframe called Sample. The data about the site and the parameter will be placed in a dataframe called INFO. Although these dataframes were designed to work with the EGRET R package, they can be very useful for a wide range of hydrology studies that don't use EGRET.
+In this section, we use 3 dataRetrieval functions to get sufficient data to perform an EGRET analysis. We will continue analyzing the Choptank River. We retrieve essentially the same data that were retrieved in section \ref{sec:genRetrievals}, but in this case the data are structured into three EGRET-specific dataframes. The daily discharge data are placed in a dataframe called Daily. The nitrate sample data are placed in a dataframe called Sample. The data about the site and the parameter are placed in a dataframe called INFO. Although these dataframes were designed to work with the EGRET R package, they can be very useful for a wide range of hydrology studies that don't use EGRET.
%------------------------------------------------------------
\subsection{INFO Data}
@@ -802,7 +794,7 @@ There are 4750 data points, and 4750 days.
% latex table generated in R 3.1.1 by xtable 1.7-3 package
-% Tue Sep 09 09:13:21 2014
+% Tue Sep 09 12:49:17 2014
\begin{table}[ht]
\caption{Daily dataframe}
\label{tab:DailyDF1}
@@ -812,13 +804,13 @@ There are 4750 data points, and 4750 days.
& \multicolumn{1}{c}{\textbf{\textsf{ColumnName}}} & \multicolumn{1}{c}{\textbf{\textsf{Type}}} & \multicolumn{1}{c}{\textbf{\textsf{Description}}} & \multicolumn{1}{c}{\textbf{\textsf{Units}}} \\
\hline
& Date & Date & Date & date \\
- [5pt] & Q & number & Discharge in m3/s & m$^3$/s \\
+ [5pt] & Q & number & Discharge in m$^3$/s & m$^3$/s \\
[5pt] & Julian & number & Number of days since January 1, 1850 & days \\
[5pt] & Month & integer & Month of the year [1-12] & months \\
[5pt] & Day & integer & Day of the year [1-366] & days \\
[5pt] & DecYear & number & Decimal year & years \\
[5pt] & MonthSeq & integer & Number of months since January 1, 1850 & months \\
- [5pt] & Qualifier & string & Qualifing code & character \\
+ [5pt] & Qualifier & string & Qualifying code & character \\
[5pt] & i & integer & Index of days, starting with 1 & days \\
[5pt] & LogQ & number & Natural logarithm of Q & numeric \\
[5pt] & Q7 & number & 7 day running average of Q & m$^3$/s \\
@@ -907,7 +899,7 @@ The \texttt{getSTORETSampleData} function retrieves STORET sample data (or other
Notice that the \enquote{Day of the year} column can span from 1 to 366. The 366 accounts for leap years. Every day has a consistent day of the year. This means, February 28\textsuperscript{th} is always the 59\textsuperscript{th} day of the year, Feb. 29\textsuperscript{th} is always the 60\textsuperscript{th} day of the year, and March 1\textsuperscript{st} is always the 61\textsuperscript{st} day of the year whether or not it is a leap year.
-Section \ref{sec:cenValues} will talk about summing multiple constituents, including how interval censoring is used. Since the Sample data frame is structured to only contain one constituent, when more than one parameter codes are requested, the \texttt{getSampleData} function will sum the values of each constituent as described below.
+Section \ref{sec:cenValues} is about summing multiple constituents, including how interval censoring is used. Since the Sample data frame is structured to only contain one constituent, when more than one parameter codes are requested, the \texttt{getSampleData} function will sum the values of each constituent as described below.
\FloatBarrier
@@ -916,14 +908,14 @@ Section \ref{sec:cenValues} will talk about summing multiple constituents, inclu
\subsection{Censored Values: Summation Explanation}
\label{sec:cenValues}
%------------------------------------------------------------
-In the typical case where none of the data are censored (that is, no values are reported as \enquote{less-than} values) the ConcLow = ConcHigh = ConcAve and Uncen = 1 are equal to the reported value. For the most common type of censoring, where a value is reported as less than the reporting limit, then ConcLow = NA, ConcHigh = reporting limit, ConcAve = 0.5 * reporting limit, and Uncen = 0.
+In the typical case where none of the data are censored (that is, no values are reported as \enquote{less-than} values), the ConcLow = ConcHigh = ConcAve and Uncen = 1 are equal to the reported value. For the most common type of censoring, where a value is reported as less than the reporting limit, then ConcLow = NA, ConcHigh = reporting limit, ConcAve = 0.5 * reporting limit, and Uncen = 0.
To illustrate how the dataRetrieval package handles a more complex censoring problem, let us say that in 2004 and earlier, we computed total phosphorus (tp) as the sum of dissolved phosphorus (dp) and particulate phosphorus (pp). From 2005 and onward, we have direct measurements of total phosphorus (tp). A small subset of this fictional data looks like Table \ref{tab:exampleComplexQW}.
% latex table generated in R 3.1.1 by xtable 1.7-3 package
-% Tue Sep 09 09:13:22 2014
+% Tue Sep 09 12:49:44 2014
\begin{table}[ht]
\caption{Example data}
\label{tab:exampleComplexQW}
@@ -998,7 +990,7 @@ Text files that contain this sort of data require some sort of a separator, for
Finally, qUnit is a numeric argument that defines the discharge units used in the input file. The default is qUnit = 1 which assumes discharge is in cubic feet per second. If the discharge in the file is already in cubic meters per second then set qUnit = 2. If it is in some other units (like liters per second or acre-feet per day), the user must pre-process the data with a unit conversion that changes it to either cubic feet per second or cubic meters per second.
-So, if you have a file called \enquote{ChoptankRiverFlow.txt} located in a folder called \enquote{RData} on the C drive (this is a Windows example), and the file is structured as follows (tab-separated):
+So, if you have a file called \enquote{ChoptankRiverFlow.txt} located in a folder called \enquote{RData} on the C drive (this example is for the Windows\textregistered\ operating systems), and the file is structured as follows (tab-separated):
\singlespacing
@@ -1026,7 +1018,7 @@ The call to open this file, convert the discharge to cubic meters per second, an
\end{kframe}
\end{knitrout}
-Microsoft Excel files can be a bit tricky to import into R directly. The simplest way to get Excel data into R is to open the Excel file in Excel, then save it as a .csv file (comma-separated values).
+Microsoft\textregistered\ Excel files can be a bit tricky to import into R directly. The simplest way to get Excel data into R is to open the Excel file in Excel, then save it as a .csv file (comma-separated values).
\FloatBarrier
@@ -1036,7 +1028,7 @@ Microsoft Excel files can be a bit tricky to import into R directly. The simples
%------------------------------------------------------------
\doublespacing
-The \texttt{getSampleDataFromFile} function will import a user-generated file and populate the Sample dataframe. The difference between sample data and discharge data is that the code requires a third column that contains a remark code, either blank or \verb@"<"@, which will tell the program that the data was \enquote{left-censored} (or, below the detection limit of the sensor). Therefore, the data must be in the form: date, remark, value. An example of a comma-delimited file is:
+The \texttt{getSampleDataFromFile} function will import a user-generated file and populate the Sample dataframe. The difference between sample data and discharge data is that the code requires a third column that contains a remark code, either blank or \verb@"<"@, which will tell the program that the data were \enquote{left-censored} (or, below the detection limit of the sensor). Therefore, the data must be in the form: date, remark, value. An example of a comma-delimited file is:
\singlespacing
\begin{verbatim}
@@ -1150,7 +1142,7 @@ There are 4750 data points, and 4750 days.
%------------------------------------------------------------
\subsection{EGRET Plots}
%------------------------------------------------------------
-The Daily, Sample, and INFO data frames (described in Secs. \ref{INFOsubsection} - \ref{Samplesubsection}) are specifically formatted to be used with the EGRET package. The EGRET package has powerful modeling capabilities that use WRTDS, but EGRET also has graphing and tabular tools for exploring the data without using the WRTDS algorithm. See the EGRET vignette, user guide, and/or wiki (\url{https://github.com/USGS-R/EGRET/wiki}) for detailed information. Figure \ref{fig:egretEx} shows one of the plotting functions that can be used directly from the dataRetrieval dataframes.
+The Daily, Sample, and INFO dataframes (described in Secs. \ref{INFOsubsection} - \ref{Samplesubsection}) are specifically formatted to be used with the EGRET package. The EGRET package has powerful modeling capabilities that use WRTDS, but EGRET also has graphing and tabular tools for exploring the data without using the WRTDS algorithm. See the EGRET vignette, user guide, and/or wiki (\url{https://github.com/USGS-R/EGRET/wiki}) for detailed information. Figure \ref{fig:egretEx} shows one of the plotting functions that can be used directly from the dataRetrieval dataframes.
\begin{knitrout}
\definecolor{shadecolor}{rgb}{0.969, 0.969, 0.969}\color{fgcolor}\begin{kframe}
@@ -1333,10 +1325,10 @@ After installing the package, you need to open the library each time you re-star
%------------------------------------------------------------
-\section{Creating tables in Microsoft from R}
+\section{Creating tables in Microsoft\textregistered\ software from R}
\label{app:createWordTable}
%------------------------------------------------------------
-There are a few steps that are required in order to create a table in a Microsoft product (Excel, Word, Powerpoint, etc.) from an R dataframe. There are certainly a variety of good methods, one of which is detailed here. The example we will step through here will be to create a table in Microsoft Excel based on the dataframe tableData:
+There are a few steps that are required in order to create a table in Microsoft\textregistered\ software (Excel, Word, PowerPoint, etc.) from an R dataframe. There are certainly a variety of good methods, one of which is detailed here. The example we will step through here will be to create a table in Microsoft Excel based on the dataframe tableData:
\begin{knitrout}
\definecolor{shadecolor}{rgb}{0.969, 0.969, 0.969}\color{fgcolor}\begin{kframe}
@@ -1364,7 +1356,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-09-07 24357 ft3/s
+2 2014-09-08 24358 ft3/s
3 2012-05-09 527 uS/cm @25C
4 1991-09-30 3651 mg/l
5 1991-09-30 3652 tons/day
@@ -1400,7 +1392,7 @@ Next, follow the steps below to open this file in Excel:
\item Open Excel
\item Click on the File tab
\item Click on the Open option
-\item Navigate to the working directory (as shown in the results of getwd())
+\item Navigate to the working directory (as shown in the results of \texttt{getwd()})
\item Next to the File name text box, change the dropdown type to All Files (*.*)
\item Double click tableData.tsv
\item A text import wizard will open up, in the first window, choose the Delimited radio button if it is not automatically picked, then click on Next.
@@ -1408,12 +1400,12 @@ Next, follow the steps below to open this file in Excel:
\item Use the many formatting tools within Excel to customize the table
\end{enumerate}
-From Excel, it is simple to copy and paste the tables in other Microsoft products. An example using one of the default Excel table formats is here.
+From Excel, it is simple to copy and paste the tables in other Microsoft\textregistered\ software. An example using one of the default Excel table formats is here.
\begin{figure}[ht!]
\centering
\resizebox{0.9\textwidth}{!}{\includegraphics{table1.png}}
-\caption{A simple table produced in Microsoft Excel}
+\caption{A simple table produced in Microsoft\textregistered\ Excel. Additional formatting will be requried, for example converting u to $\mu$ }
\label{overflow}
\end{figure}
diff --git a/vignettes/dataRetrieval.toc b/vignettes/dataRetrieval.toc
index 0a3c50b555aecb5c19b8835987d2079db0304ee3..92d62142883ddf708dd4e64ac133b8529dc9e89c 100644
--- a/vignettes/dataRetrieval.toc
+++ b/vignettes/dataRetrieval.toc
@@ -6,13 +6,13 @@
\contentsline {subsubsection}{\numberline {2.1.2}getDataAvailability}{7}{subsubsection.2.1.2}
\contentsline {subsection}{\numberline {2.2}Parameter Information}{8}{subsection.2.2}
\contentsline {subsection}{\numberline {2.3}Daily Values}{8}{subsection.2.3}
-\contentsline {subsection}{\numberline {2.4}Unit Values}{11}{subsection.2.4}
-\contentsline {subsection}{\numberline {2.5}Water Quality Values}{12}{subsection.2.5}
-\contentsline {subsection}{\numberline {2.6}STORET Water Quality Retrievals}{14}{subsection.2.6}
+\contentsline {subsection}{\numberline {2.4}Unit Values}{12}{subsection.2.4}
+\contentsline {subsection}{\numberline {2.5}Water Quality Values}{13}{subsection.2.5}
+\contentsline {subsection}{\numberline {2.6}STORET Water Quality Retrievals}{13}{subsection.2.6}
\contentsline {subsection}{\numberline {2.7}URL Construction}{14}{subsection.2.7}
\contentsline {section}{\numberline {3}Data Retrievals Structured For Use In The EGRET Package}{15}{section.3}
\contentsline {subsection}{\numberline {3.1}INFO Data}{15}{subsection.3.1}
-\contentsline {subsection}{\numberline {3.2}Daily Data}{16}{subsection.3.2}
+\contentsline {subsection}{\numberline {3.2}Daily Data}{15}{subsection.3.2}
\contentsline {subsection}{\numberline {3.3}Sample Data}{17}{subsection.3.3}
\contentsline {subsection}{\numberline {3.4}Censored Values: Summation Explanation}{18}{subsection.3.4}
\contentsline {subsection}{\numberline {3.5}User-Generated Data Files}{20}{subsection.3.5}
@@ -24,5 +24,5 @@
\contentsline {section}{\numberline {5}Getting Started in R}{28}{section.5}
\contentsline {subsection}{\numberline {5.1}New to R?}{28}{subsection.5.1}
\contentsline {subsection}{\numberline {5.2}R User: Installing dataRetrieval}{30}{subsection.5.2}
-\contentsline {section}{\numberline {6}Creating tables in Microsoft from R}{30}{section.6}
+\contentsline {section}{\numberline {6}Creating tables in Microsoft\textregistered \ software from R}{30}{section.6}
\contentsfinish
diff --git a/vignettes/figure/egretEx.pdf b/vignettes/figure/egretEx.pdf
index 98e57feedafaf4e713aa8fbe5bdb7391eba5860f..a06015d8e264ca3b58306f198bf8778e98cd0ddd 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 ded4c3763ffe60f33af918249272a55cb3896870..543a6678089fd3eb304d3c9307cdffe40fc35d30 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 693a85b68dac678130d48bec9ea228665aca0e15..c58903c939ff755fb487efaa3c393dd21230220d 100644
Binary files a/vignettes/figure/getQWtemperaturePlot.pdf and b/vignettes/figure/getQWtemperaturePlot.pdf differ