From 6114908f7dd2c870e29ae96f5704b0c4d363b6ae Mon Sep 17 00:00:00 2001 From: unknown <ldecicco@usgs.gov> Date: Tue, 4 Nov 2014 11:42:23 -0600 Subject: [PATCH] Latest build. --- inst/doc/dataRetrieval.R | 2 +- inst/doc/dataRetrieval.Rnw | 4 +- inst/doc/dataRetrieval.pdf | Bin 229797 -> 229793 bytes man/readNWISgwl.Rd | 6 +- man/readNWISuv.Rd | 5 +- man/renameColumns.Rd | 32 ---------- man/renameNWISColumns.Rd | 76 ++++++++++++++++++++++++ vignettes/dataRetrieval-concordance.tex | 7 +++ 8 files changed, 93 insertions(+), 39 deletions(-) delete mode 100644 man/renameColumns.Rd create mode 100644 man/renameNWISColumns.Rd create mode 100644 vignettes/dataRetrieval-concordance.tex diff --git a/inst/doc/dataRetrieval.R b/inst/doc/dataRetrieval.R index 1eb78388..93d31e60 100644 --- a/inst/doc/dataRetrieval.R +++ b/inst/doc/dataRetrieval.R @@ -155,7 +155,7 @@ temperatureAndFlow <- readNWISdv(siteNumber, parameterCd, ## ----label=renameColumns, echo=TRUE----------------------- names(temperatureAndFlow) -temperatureAndFlow <- renameColumns(temperatureAndFlow) +temperatureAndFlow <- renameNWISColumns(temperatureAndFlow) names(temperatureAndFlow) ## ----getNWIStemperaturePlot, echo=TRUE, fig.cap="Temperature and discharge plot of Choptank River in 2012.",out.width='1\\linewidth',out.height='1\\linewidth',fig.show='hold'---- diff --git a/inst/doc/dataRetrieval.Rnw b/inst/doc/dataRetrieval.Rnw index 559db31e..8dea3c45 100644 --- a/inst/doc/dataRetrieval.Rnw +++ b/inst/doc/dataRetrieval.Rnw @@ -472,12 +472,12 @@ temperatureAndFlow <- readNWISdv(siteNumber, parameterCd, Daily data is pulled from \url{http://waterservices.usgs.gov/rest/DV-Test-Tool.html}. -The column names can be automatically adjusted based on the parameter and statistic codes using the \texttt{renameColumns} function. This is not necessary, but may be useful when analyzing the data. +The column names can be automatically adjusted based on the parameter and statistic codes using the \texttt{renameNWISColumns} function. This is not necessary, but may be useful when analyzing the data. <<label=renameColumns, echo=TRUE>>= names(temperatureAndFlow) -temperatureAndFlow <- renameColumns(temperatureAndFlow) +temperatureAndFlow <- renameNWISColumns(temperatureAndFlow) names(temperatureAndFlow) @ diff --git a/inst/doc/dataRetrieval.pdf b/inst/doc/dataRetrieval.pdf index e9d3db2a04bf4733066be9b610521213eeb957dc..c9af79fee51cf7b0de046e44b28bb97353c626ef 100644 GIT binary patch delta 10596 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 J3Yr&a{|}7-<YWK< delta 10619 zcmaiY1yqz@&^`@<NGYOHN-DMa?k-D6NJ&eFbSWW%w5&)92ny)ZDhLwNrF6Fl5=to{ zf~0_yp!{F-r{CwU-}&!3d-l9@=iZrl=9#(k?vubH8G%O%VYIkOw-WjwvAkf8@b*~4 zcq0~@#f-!V|8_0YvYadWJUyzx_+|^d?No-At>_l^Ez8;Q{v4<I7N7U5H*DTqT`)}@ z557MtLmv$7lU<4#t`?ka%YI~=U*Y!UeFwMygvr|dm0j%c+EKq-0un`(sb7Kwr1p^I z_5sH-8|kTc=0Y#yc=O`up2zw6`d@c`I-0?Hb-t6fPm8`n+{<6sOUv5NF+f17o+b55 zGqqRadf$}9e2e!z9}D5Fqm{E7nF(TJ>uF_bt<MI_^rp+47w?YQysxNRmPE!@>#7`* zn7ku$u+NfCVs)}FTmlG}Sd;hQZZG52u&mJ9nOa=?>X(6gu=4|69EO((x&70_Z4wQ~ zfLVd+g5%}Nw!wKE)XYvur{1e03>DtF$UM%5Dx9yNtU;{jDk<m_t5+jS>btdPSNlKP z=Uz1rk?}*_Z+xZ3JFZ<O*F0*~Do+9X_<frEAad~B17)6+{SN!*$;VF~`gTrC1)JT3 zV~Ca4I98-b4Rt;1lo5yY<JOoUmzX@Hae&x<!bX65wG_A7%?T&n(mH((n%g9w;^aUb z5R!LfKXo2yo1UhBy0ANaBe;FwnCR}LP?Ckvhl2HDdt3$l^gSk*02BJ3rhmG-uA!6H zV6S8DD8Hb5sUWmW87DQjp-@g%KBj&+uXAaNE41IDu$lVAk)P2`fv(Ru&~@5ZpFo^Q z+deayvsa@Pxe`RPdt*^*ul)Am;(Mr21~91y4*$ZrKxZLaYoVlCB<EE6tJwux*f?TG zs(0#C=tpWWmA_NcxW4}8b%JT7%Q)_9N&k!+a{QEZk<QMQ@vMxT5$ciJoBS+K*g@+D z84Q|L9D>%yt2QZBy4ZbSdvIMxKes#<lJd~-wc=Z@o_0zQ2oPH1i94Vtv$1-w`nfk6 z4VHs6gHz<ypZY-->$vE0kLS;cI=G#ZzmYvkH~3&U;cRYMgj1>RWlmf-^Tacz1RCRs z-x0uPcFf%}OA{C6bvvK)=&|k())Ze^4gILcxOVbv+JC|RjOC?J!>gEDt+@`R<<HkN zyna|GHZKp)e13WVeQp{@!gn2-%dC`42b}*e4!h=(<NcG|nJrJEj%>PrH8{#7b_Yim z_LHO_Hx4KwrEMNsQ~#r>$xCsxL=GlYUeCgH;Mr6Y3zJ4i`$=shY{$L^_HNI)d7jk5 z-?ZXNedv`KMIRRlkX~H!;M`mXDtsJhjL)4rRqOu3$4`~Nh1Kf-&0nlqos6YY$f%j9 zleQaBz^yD43QD@{B_vW<8XPUl%d6gh+hCF#$L=?AHT-94e=+^aNi34S$gG2AaVkI4 zXw@U5yD{I)1DD~hk*k}8pUJF~iEd?k#OCzm;YI`cuId-Evy8t98uOT@dD3qy@Ojvh zL2$alxG|#kRe}3O+iblmxnsCmkxyzhIR&GhGDk<l5}aQ@zd!tLaHb&1XXg~psXbmE ztY-Dk%nFqISt=Kv+P!Ze@+HUMRadn^&Zmj}ilf!!Ylwpm@jomW$iA(~^?j=BFo*P- zHEU*1OBqi!?~#=3$Qs0^n&iR_*AnM$gxvVxn~v%M4czx1md{E$FQza42+kB4Tsdb~ zoSST_x_AD?6>qz@jaN|mA0N;Q8@q2*j8?xaYFp{7MApq;Es?CuTN$bLaWQs?sI~H< z`N}ooLq17Oy&-*HTTf8vOLJ(nbr++vP-|=R;SX()c`5zPT`#@T&895(f`RpA$1Nya zQpX1tt8^IG_Wlr4-1zCTLh6SX3|Ud%Y}bQkIwij4b2+fsI2)F-eBju;?pryp{oF;z zW^--GF}l`gJ!MC)4!v7}L14d6dfED?a@57&^>&A0rKGU99ox*R5AWwr7^IG-R_KRn zHOBZU4>wXD<o|aYT4&lgyQ6tiMIS9|jC<q*RgJ8v78-;+FZeK)v(~dWe^vX6bc*1a z*A{dVlgg?8b?&{Sg(*jClf}#=8HN0@PRkl>yXALZ7KD|@N}^9u>OzOqM(VQe;Ajoa z$(wWA_?PEuIuP^zbq2!W<yk_K&nl%n^QJvE<QHT<in?J_vZPj@2rlvI1GpN6?{<>% zyP~Pl9lJ|S;;-H-QtZdL=zg!xFWpJ1HJ8-=%+GCKlhEJpZqybfR;_A%v!INNMohU_ z^rck7%#n9BoX$6m6OZ6y_61*qrB*&c4%STSm%Z6x%Y`E{g<^gsyXP=!HS*0pI^Qmz zyOfUmo`Q`MOa0E!{mJ4JtxX9plawZoLV$wugr58bpZ*n5Zf1uT*rPCBMaG6hayns; z*+=gzSw)>rIfP#G&Au4sNlK+=Y2HEN4$ot7O4<40ZtP8kg^otP%!_kt^rtl5w~Egz z&lGG>Frw(<K9nCy#$4JJp13YX=XFds?$WVf1?y1Hc^(BCv!t~8`Qk9nefTkboa?8X z*KUh6&UC-#ocvG={TdIgyJY+hKMHd<7F4ahH08WxYudUg19^TcV1v(7!i}szPoL8( zc!T@ZD<?i97Q7xCXGz%C#uN88#%(A=N#)dV@q1ha6P1hM(M3z7wa2xy#QH-OZu;C} z#xJlJQ?R&CRq>SJ;o*f-(OETh1Gt_k1MbYUVWH`Jq|eSD?Hf<dfPIn0QMTIjZ+Ltm zGxb8MG+xG_S-)K_XSjLJYh{&N;sX_wnhrG-c&u%M17bew%9eyZ|IqdQN>^jKY1QWs zmzc_2(>0f#ACmpBXA*yI-pbQgoYZ55z0gU-@l4Z`l~1XKH%B|MTvXm4y~j@C*r;EW zEvDP+^xro%ByYXF<so%L{!KdD<2gRORv(={=k|M;wC(34&5MyY`yZ-t1;58Ud-zJc znhxI}H@(JBHTz!W1G1z@!&c5!3`;_7#oqM9C`r6R`i6zX=9q`d1;O4CC#)pS#;rGL zm$Yyi{h78f{SM1=+!dLDsM!;cXE+hHP}{lTrpvPT`Q@AWDFl=z-`Qt`^)$zxLf4~j zP8a$t%XV0CQumu7PgU6E<ps7Xo_v_!@PuiopDsE=ChyH=`Rf|*^Ho$f=FW}qcMI>? zKVKlLas;YuB%5YMM}yoZ>H<UEzdSzGC`#gn?c)j&eOY!tKQu?IV)`q#p~nVSo2~_M zx2;3ARlYn7&1oH=7qngS;TX;JaEijv-jf>JR9Jo0yDhgrxbiri)>DV~gydotbNBtU zulpjpwEovog%0?&Q0KR5rb%i?irz~4PP?A$uJVf3@B3icw%YYg(?8fPlCLB61;;T{ z!6Ope^BY}t-&bxp9g=b1N4*Vn#BDmdCXqG{T8~tw1TA+gHC!4m<~2I=LZFA?QlDPF z<bY(ZmC4Y9y(}ve`P9Y4XR+!Jwd_cK&_u*@yR?ViJO0}9+rGi`*Q7mtnDw6Wrp>lY zDQUfAmv>Eu$@a+^?buQFea%QNk0I2~#HkyF#V#N2cFcUncC~RokiViTVb-P>@uq=q z(5m-~w28Un#Y^#+?c`fo5ppjK6-*B0pA?9{CBP;=YZ3`tEg5wsWmr;(PxPFwYt=pG zx}n_S+?*aK+Y@U2aY`U?p~N##+(O|ze4omd?^<jL)W(j16cJm96=Ym8F?JaRj{3hY zU@VqYI^P}J=Y9;=5hL)XXxvQt{YQiHB0iN2gF6=WXQHD7IaBGRwciv4O#6gb6mW%W zmE|*V`AZbj`*%*X8R>uTl@_nL#zQ{BUCd+u)#WZXSvyTK$u<-0o7{A#M4NJDsZV>! ztJAgy514bJ`VA9fo}Bx@y3<^_yx*L3_-#@U<L%zf9S$2`D_m=)i@HW0XQ`Z9)QPjg z_DOL^J(X1j<NKH>(@lDp5tl450m_2?gKk}AucU=v!+rH$Z*<olJMC&T;HTTQel&8J zcW^vgDU7{2IMBxP)&$fiYJm(z8_6kKzsY_hUz*<pAq|_BNKu37_IwGV`Aj|<S(HhS z;7Tp>yKTrkt%Hk7;HKYC)Z%Ybf>@r5*qbsj>*`EWb!|vuoqi(Pjo_IHJfikc^L>7; zi&UKHgb6&+I(;|fX>~w_Xo1t$$K(<kcXSy0_A9hGE3bMrk_1776=yvjwg`8?%{SQd z@BetA<LBLdJ(DizYV?$)!%nJqnmsw)@F!KcYGL^qjKLlbo&M3|Va}SLDonTWggV|V zPO~~kL2)#7V9?5mL*Acv{wj4xjha7VtLjIev|?k7Bl*by21fai*>CkB0ZbZE6yqC= z*KXI}a;A|ub&?Y59PRJxUcf2f8apNdgq`zb`oXmm?isr+)Aq1_JY2+oj*RPNXLX#| zpjM9H^Zf!Z+}nN3Y$od3EJJT+we)D}t9EM@+HPA)OjpQp2dP;dgQ`ofuC0?~i04nm za@GoYIc@lj0@15s)~jprZ>=BjM~+$V6iIX~jCm_bC)~3-vFI*8;a_0n+NJlSdUC9n zbswm{6WUfammD^xmc#SX6Un)FWh@(*DnJ#tE)~2O#r3ty9af=vA*JY;q><NiUGc+O z4t?T_od@hGD?Vk*tD0}ezZ%a~W;8jfaphs0=SX+`hkkTM8GBm4;FB*lK9(dcUsk{| zXrgoXO4NQ>)~0e~%PTRjBG$`#rMleOar<{IW7NJ19z{a)b94uJw8R2+16is=R+4(v z<oUTM_y%y;{;+U^Uifh@m>M#!(*^0J;nrGypOy3DR5*535eTR&%!{yYex)+_1d@y5 zsJBs?h+=e_f_*&C$Zno6IV?4irF-&-Sy<`G8gmN2zW&`g-IdL#d;MD(-PO;%P+`}Z zXRhA2<@;E%T|0P3skLvAu{AH}^{nd~-{Q@^-dSDTC`){s(71DKR>;s*BToV9Lr0h; z49TGIAu3aU#_;zc`O9_8)`3~ceFYS5IzCgVI7p6WMDoam0Dd!fW%FB|XGy7a98#^D z5_986&?m)<8%b5`SKYIC;{_bYuJBIJ9SWJNv-ql9bx}-!B)=j&Ut2jZn#S+jz@BEo zXPF~!am}iF0U!8!rM0Lk$yNkjO$E*Od_L0>_??0tG6m3$DFp><y6P$CtWLX0MYipp zsNf11f0*)?yu!q${rm1*8jZe7!707o*2Ya`w*i*4@0*z&U1sjq*0qm3c4>MC_P^{_ z0oN{dZDu(>v5cnv;!46*Rj+sxInd1En(E<ODTHe;+|3FUdG>Vlic(cU5as1UXQ9)+ zq}#iXgCxHM^@!a*Lf02~BsHJB+J0Nv_f$kqM9CxRTHlN=|7xW<xL8S|Ucsoh7*<$j zQ=aaztEV?pj#tQ5y^c<HQ28Mqy3Ou_fHHB~2gga<EsYpeVkNF_*-*IL?3(uuH4i__ zvvjH+*N-aW+T#ukW8iMif9EYb4HZ?Gaf>w8>*|;hGM=j5bFfn=G(4LunR1eIWdD-S z_(q4?i@RobQ{z+_B66u~%-*2CJnp#X?tg#q=FwDs!>z#yc2+rRiudiGZrizNoDsG- z>s`j^$Mxmew(a!ynU(@GI(q-n(i!cL8R~-Jk2$!{1~f?zXDSUR?l^{3*5$qNew<yW zI<oLK;cDmxiSFePrH(M`CJ!qk3eAbq@=V(u1RoOr`qi$ksU+3px8{K#TW9@!ea~Po zFE4(j3Je#;mirjpLDPrsry{!P2VPXr)a7sKKJu=yUODv?{iAAn*V`%Yb>fFY^Dg|1 z;*7ouu3#G8)m74io2E7k;!>Ml?OIDGsbM~TJ7w$fr@;Eyp$AI>!*fsCAK2=2l=X43 ztkUCIDEak*d%LIEB4$76^v&{Jw7=}{v#-UpBK$D{ox)V<TGXA(FG!j2DY%<Upxt2I zrljN6(XY+(FQcyVpRl30%IfjqfimnQ`~rtP^CjHy`FHuk0&=p`XHK+7a;wiJ8L&&h z`6-)}GwtQw4Kk=Y;>9)WB&4$GveNt%+P%40%qhzStMtTf1+*(RiW#4K_+VmQ1!%1- zW3yB7P=AoZS}MVU*&lG)Fb|7ZQ;{Bw7kne3eCYzmJ=3)J(K+2-X|cnmMp1UDpD8>I z6Ig9zA1vIHyC`vH%Ue_L<w}gOx?Phl|AX7A*H$aeMd;kLQRY`;&dgtb=RgN%oMMAq z^J37VAv3d^3_GW~@=bA{tjCHpmh{%K5>Y=cMjkj61%<$%XKBUMT&(3S+-<l8<;7tT zC;|$F{I^zeEi#Cn6gaq#V>uF!bGRE*36Gwv5bC9;<moHdH0<U*XZY>2r=oWG#}}rt zT8S(;fAksblIME*vkz_e6%FGrb=K@OUR=ND?GP8l`?}iubIpb!8#S&6HzK_Dz6X8! zM{eeuhRBSBeQ~8QvH8m$?bKv$(J>GK%!PpFq$2jGGkPN>{Ex@#S{~dnqZKJ^`z||J zCR{4K6x920Oy%R{%`*F?p!}gX>biFyF5Rd{JL1NNJEUm@OwFDrNA|$9rHu8}3NrX| zhhp?|To#NCWI22nDC%5}s?<2NTAoK+X{|VZsvTu>JQ5f;@zj;s=wkZ4ww{qkE#}V6 z+GZk-x%$Pi<ySpg)Xy%^+Fa(TbL?ZXRi55<>{rpko@ixyS9R2M5R>03;->8!svGQB zI@*SN!R|XJ@^bu*lTKIusnVlOpYku@F=baOv<4U9zBSOKmISjfb&sAtNNH45AHPB} zPp*;4(3_qG-P~_8SJ=?=X)d&;*{vZ4oo%OEX&9!3DMh-MC!VhDZIwj)@G+C%ukV@; zKvBSzmd&!tMyX%7JB?vtup4NOlyA*(j?rgvbH~DtzC&eRniYnS@!Tul(55)!oMB&O zHTP^Fg@+NFejGM>UWPL1+tB^xZwwvk{<fC<oGJd*cTUDv$2euETrBf!4O?6kwrOTo zaiwFDx=6E*iwmUXAG2gRp58P&B;jVY&$=MwmYQr3Eh_{9F|H@N9Eo~nviw7qfd^TN zOAv^(T=tI5H1*kS7d!nj*gIz0Yk+OJ>SN$bv+n30;%Vm4)hs;!>GbaDUVh=t@C~Ln zRy~b^YBjucEHOTLUs)CFIGzt!P)P$@+n!C>A2&bO^7Z>V)bc4e%gLH7n%&WR&d0kv zI}@nRI!4aJIq8yWFvKx(aXnaNf^K7J5hvr@o7@2DIjtC!Fq0fpj+Hna#QU+MNmUun zwszQtf7rb12ot&?yW?GU+_TdjrewSPki=v?(<0_2Z7C)EZtChX>1!$*{zLiwX@k#X zy9%blPCRi`*p4g~h@KxEcgb?>EO;H-H@jhh84G`Tn_+l==z&Ar`*CZ$eSw*TG9?Z{ z4^LcblYAs{i0ym}HQ!;Xf>Mc<xA<bo@?nR#&1fzZ$;9?uTNb5aWhHeE&$7e3H~suv z?>TO@j!@>oDUK;04r7K;lc-n?`SD2~%FZ{^-3)HXfxIE#B1<*e48DZy5*aX>U`p{L z^%5dG&m>TFEkf($n&AH0>d?*DfEHuiDo1t8<WlNwIn}V|+<bmR)+DRSa6p}^pM7rv zyX7^;ugk{RWS~^vqHv=qPK}g7#OqK)ItBAcl>%kSQN?S<AIBt~LK5Z}R>I#%ZBb#S zH5es)971MdBDh2s$z-RK$*z^Ai&S4L*$cYIl8o%SY|_0YSvWkYeU?jEa$E?B6F0f? z)z#E=?JmRdllxUUdz#rDH^&m$MQ=PZ-fC$`^8A!{t1iy6nT?cXULa6Vannweti(P# zeOMqt!Oo8%fBUkDA3g%tob7A<UEq<{^9yVDGSy4mf-f|LL7v~R2o92$3#PEoKWyKD zFRs@<yn)5$59#L&ru7*VJsDexGse|k&t1a5$TKme5{w6^KHtxKLZbU_vY^f+x#ldw z(VT)mpTb(lO~~kuac4ke%%<0F;FWvQHXhWDNomU$OGGma3gJ2yN$O{SerM$;^Zw)J zH3BoNm$`2|-43y<yznHEn_q6QZ$8ZTt5IG9?~`2FflNnAojk_~%0d10SuP=5%2dVl zOKm4ZWaCiq%d_Iq;ZMhJxqp&ro>V%V))dZpL0iFZ=E}wP<)KpDvz{bOBO%UM&H*+Y zwYpkO+^1%}i9&dYv0zE*#|w0=Be$&pna@EX4%ITBh4Kp2Q>B8Dyz4IYr2xqd?C@p% zTZ4_Y#vYT}r<X>cWioN!iu;|taGT;2V~;3H*m?xpPpD4{7V%`vU(0yAQ9B}FWf*TW zJtaWiGWnRg9{_UF7)>)0dycpqj_A-}B3b0M>~Ctcqo%nS<8TMzdgEfUeO!5p6Z^Ch zy0*3Ycp*urHksClLy+jhmh1JDCRP}B<^D4~j5$5!Y&v$qW2`fFOs^Gj;)cBGXYx%g z3Zyn^`yR)5!WS~=;v_Acrxev_lZTi`>$0yLPs5*jUR%V8M_==gBHioWTn!o7em=JN zK=3^|=b>k~CWzPf43eN%u>zf@)!O2dWF+4iE}Wf*#6oRYN*W&Lo;m&NZbJUw_g1WP z<i(PAP0qoZg$s&Ina%+TX?9B-%vFINmWo4oyO)=uxM;BZ;nmk3lCBCrexj#N(ra+> z%$tI)9mARB$uC?DH0qknE#~}!DwVkP)1eeb$75sbNc#hCdEm8VNLfO&l}W)bSw*%o z`LW~Ye!2sPi$DMY2t?rj_6iQi&zY0wlOdq^cnfk3QVf31f?S;p3c;f-!AAfeW(ht5 zF#Nk;kAha<BL;%^vLeSGLvTY5KHSdSv<JU1C<+Zh;M=XpF~^Y*7||jMipH~9lZ&$g z#A^T?hPOXhgF%S)ArS!ng*9joO|*mnAb1)Za0yAY1V<t81~%m4c<r0y%oHd%1d7iB zA6b!5B2^d^f!{tj1w*t1L1XYrw*OiJFc=WCgC&4)7l47H@N>4HF$9q@01XGRwfpCZ zC?tsY!4eU$004*L-`Rn{!ia$dkVq6>(EgwM5NJ5w%O3OuPJ}rC#~|_T|K0|NVk+1i z$gL=eF-JncG~RP2$Kr_6frKN75JZAF{f!R<j)6f4B7`8}a45lf5Ht({A>4~WVSxYk zR;aj;tCEtTVfgrK<l!LW|26|A^&cce04R8csw;UKDH#k_@#Q+X5GhD<c6V|t_+#Ks zZY4>;BnTXafe?BIhry8qcpeO=AXm2C$pvumzdbn!7$B0tKy^Yr7y?B=CU7qp2caGk zjV6c|0tX<l|MYOb3lbE9Q#0Xa0QL_V97<#a_(zNY0)Zkp4*`W?{@#m&KoC#>N(c}* z!6S*IgA<{EfFcME1kZyb0m48Ka5#*RMhGYhfx!`a2uC0Y;YT2$#6}QEBCaA32pA#M z2snTyGK@eXemjW!(+`mtIH6&X=qMrxkr1N1BM<<FP!9=*AqhEyz+eai!9l<pg%c`* z#XtlX5@a`FBuEGXM!XjR5T*_ZK>~!xAi;p4++hB}&mR&Z0T`OFfRHFCKolJk1rX`M zK^F<qi3Cvpko_;B<9=O7pnnJqk=GaibdA743>rch2>^i;r4E2$ewWyv;K062gdh$8 znMvsNK{XM=3P6D0&Fs&CNDKl_gba9l5vB=%ATWf1fT10r`V;>@2Lf>L-X(|_KtPd% zMgSNJNo?dF$bj99C^#f|b^Wn{`#B9j03-%RWEdbm5DkN&h>!tbMD-4UEr3W5<SLQV zH~@nFyCXpk?h+z$0pN!S1prP|+i0-c6F?1v0$`E-iTGE*Xy~sr9pL{5el%FeM2ZMF z5i!wVz=RzW4R$G_Ku{P2ksb>6zXSeNe`o+n1S=Zx5BLE9Ly#u$>V%^IC!haC2cU>J zg9gx0Vm%xhMVJ#bK->vI8HP9#kk*8-f`14RI0!-iqko`LFxXFL!1({b50*9&ThZW{ zN_-%3O2AnILI^(wg&?}hF=)(Rm)%eNF=&9Or(@7i6d@NdXcS@phJXhW_I?-?4gf^X zU?7C!G6aJ`;4p;U3<G*Y05uex*9mVsPzJz=^q?@pihzRG3xuF@Kp6)0YcK8({NO)% z;9&oEKA{kBf+LoJ*(1<{!N8e{NJi9_5B?ea8!ZrjP>3SDouFU?CcKEC2XiL@tWfaU zAZ#>H011Z@I)g%jgExVLD6j|P2ucDR4AI1jpbdg5fnw0$Fhy`6$OS^QKrX-tc?32j z=<nI!&-@1pVT8jY42nh)8UbZsU;f)LC?iS<42ppec2Q6Uga2JkIPgsngCHabC<EUG z2#tXCL=Z8khe7;(AUL@|phSkjmk21qMFi@BU5{Y?1BFCf0A*kcA#er;79K%9Vc@Jx z*vvo~ln6l>I0pPi5KkRIE^dxgfGWVzGBWZP<iIyA=moGq5Em|>WB~-&_z*CZ6t~3x hSH+ZDN{ZIa-Qv2t*L53PTF^3hA<**iUC>aV{eQd7{;U81 diff --git a/man/readNWISgwl.Rd b/man/readNWISgwl.Rd index 86483894..4ee53c4e 100644 --- a/man/readNWISgwl.Rd +++ b/man/readNWISgwl.Rd @@ -3,10 +3,10 @@ \alias{readNWISgwl} \title{Reads groundwater level measurements from NWISweb.} \usage{ -readNWISgwl(siteNumber, startDate = "", endDate = "") +readNWISgwl(siteNumbers, startDate = "", endDate = "") } \arguments{ -\item{siteNumber}{string USGS site number. This is usually an 8 digit number} +\item{siteNumbers}{string USGS site number (or multiple sites). This is usually an 8 digit number} \item{startDate}{string starting date for data retrieval in the form YYYY-MM-DD.} @@ -19,5 +19,7 @@ depending on the year that the data was collected. \examples{ siteNumber <- "434400121275801" data <- readNWISgwl(siteNumber, '','') +sites <- c("434400121275801", "375907091432201") +data2 <- readNWISgwl(sites, '','') } diff --git a/man/readNWISuv.Rd b/man/readNWISuv.Rd index 9dbc2bef..de806e3a 100644 --- a/man/readNWISuv.Rd +++ b/man/readNWISuv.Rd @@ -3,10 +3,11 @@ \alias{readNWISuv} \title{Raw Data Import for Instantaneous USGS NWIS Data} \usage{ -readNWISuv(siteNumber, parameterCd, startDate = "", endDate = "", tz = "") +readNWISuv(siteNumbers, parameterCd, startDate = "", endDate = "", + tz = "") } \arguments{ -\item{siteNumber}{string USGS site number. This is usually an 8 digit number} +\item{siteNumbers}{string USGS site number (or multiple sites). This is usually an 8 digit number} \item{parameterCd}{string USGS parameter code. This is usually an 5 digit number.} diff --git a/man/renameColumns.Rd b/man/renameColumns.Rd deleted file mode 100644 index c8ca1e9d..00000000 --- a/man/renameColumns.Rd +++ /dev/null @@ -1,32 +0,0 @@ -% Generated by roxygen2 (4.0.2): do not edit by hand -\name{renameColumns} -\alias{renameColumns} -\title{renameColumns} -\usage{ -renameColumns(rawData, p00010 = "Wtemp", p00045 = "Precip", - p00060 = "Flow", p00065 = "GH", p00095 = "SpecCond", p00300 = "DO", - p00400 = "pH", p62611 = "GWL", p63680 = "Turb", p72019 = "WLBLS", ...) -} -\arguments{ -\item{rawData}{dataframe returned from retrieval functions} -} -\value{ -rawData dataframe with improved column names -} -\description{ -Rename columns coming back from NWIS data retrievals -} -\examples{ -siteWithTwo <- '01480015' -startDate <- "2012-09-01" -endDate <- "2012-10-01" -url2 <- constructNWISURL(siteWithTwo, "00060",startDate,endDate,'dv') -twoResults <- importWaterML1(url2,TRUE) -twoResults <- renameColumns(twoResults) -} -\keyword{USGS} -\keyword{data} -\keyword{import} -\keyword{service} -\keyword{web} - diff --git a/man/renameNWISColumns.Rd b/man/renameNWISColumns.Rd new file mode 100644 index 00000000..e594b370 --- /dev/null +++ b/man/renameNWISColumns.Rd @@ -0,0 +1,76 @@ +% Generated by roxygen2 (4.0.2): do not edit by hand +\name{renameNWISColumns} +\alias{renameNWISColumns} +\title{renameColumns} +\usage{ +renameNWISColumns(rawData, p00010 = "Wtemp", p00045 = "Precip", + p00060 = "Flow", p00065 = "GH", p00095 = "SpecCond", p00300 = "DO", + p00400 = "pH", p62611 = "GWL", p63680 = "Turb", p72019 = "WLBLS", ...) +} +\arguments{ +\item{rawData}{the daily- or unit-values datset retrieved from NWISweb.} + +\item{p00010}{the base name for parameter code 00010.} + +\item{p00045}{the base name for parameter code 00045.} + +\item{p00060}{the base name for parameter code 00060.} + +\item{p00065}{the base name for parameter code 00065.} + +\item{p00095}{the base name for parameter code 00095.} + +\item{p00300}{the base name for parameter code 00300.} + +\item{p00400}{the base name for parameter code 00400.} + +\item{p62611}{the base name for parameter code 62611.} + +\item{p63680}{the base name for parameter code 63680.} + +\item{p72019}{the base name for parameter code 72019.} + +\item{\dots}{named arguments for the base name for any other parameter code. The +form of the name must be like pXXXXX, where XXXXX is the parameter code.} +} +\value{ +A dataset like \code{data} with selected columns renamed. +} +\description{ +Rename columns coming back from NWIS data retrievals. Daily and unit value columns +have names derived from their data descriptor, parameter, and statistic codes. This +function reads information from the header and the arguments in the call to +to rename those columns. +} +\note{ +The following statistics codes are converted by \code{renameNWISColumns}. See +\url{http://help.waterdata.usgs.gov/stat_cd_nm} for information about USGS statistics codes. +\describe{ +\item{00001}{Maximum value, suffix: Max} +\item{00002}{Minimum value, suffix: Min} +\item{00003}{Mean value, no suffix} +\item{00006}{Sum of values, suffix: Sum} +\item{00007}{Modal value, suffix: Mode} +\item{00008}{Median value, suffix: Median} +\item{00011}{Instantaneous Value, suffix: Inst} +\item{00012}{Equivalent mean value, suffix: EqMean} +\item{00021}{Tidal high-high value, suffix: HiHiTide} +\item{00022}{Tidal low-high value, suffix: LoHiTide} +\item{00023}{Tidal high-low value, suffix: HiLoTide} +\item{00024}{Tidal low-low value, suffix: LoLoTide} +} +} +\examples{ +siteWithTwo <- '01480015' +startDate <- "2012-09-01" +endDate <- "2012-10-01" +url2 <- constructNWISURL(siteWithTwo, "00060",startDate,endDate,'dv') +twoResults <- importWaterML1(url2,TRUE) +twoResults <- renameNWISColumns(twoResults) +} +\seealso{ +\code{\link{readNWISdv}}, \code{\link{readNWISuv}} +} +\keyword{IO} +\keyword{manip} + diff --git a/vignettes/dataRetrieval-concordance.tex b/vignettes/dataRetrieval-concordance.tex new file mode 100644 index 00000000..6719a33a --- /dev/null +++ b/vignettes/dataRetrieval-concordance.tex @@ -0,0 +1,7 @@ +\Sconcordance{concordance:dataRetrieval.tex:dataRetrieval.Rnw:% +1 127 1 49 0 1 7 15 1 1 14 45 1 3 0 93 1 2 0 8 1 9 0 % +24 1 3 0 21 1 4 0 6 1 8 0 18 1 3 0 25 1 1 4 19 1 9 0 % +6 1 7 0 23 1 7 0 16 1 2 0 11 1 15 0 22 1 9 0 20 1 3 0 % +6 1 20 0 30 1 38 0 10 1 9 0 40 1 4 0 14 1 4 0 33 1 13 % +0 39 1 14 0 18 1 2 0 14 1 2 0 24 1 4 0 9 1 14 0 13 1 % +4 0 14 1 4 0 5 1 4 0 22 1 18 0 8 1 4 0 43 1} -- GitLab