diff --git a/man/constructNWISURL.Rd b/man/constructNWISURL.Rd index bc503ef25d639e879ca3f9ebe3f1de2969bf81a4..c8208e01258b31856cfcb9d24994db044efc515d 100644 --- a/man/constructNWISURL.Rd +++ b/man/constructNWISURL.Rd @@ -16,7 +16,7 @@ constructNWISURL(siteNumber, parameterCd, startDate, endDate, service, \item{endDate}{string ending date for data retrieval in the form YYYY-MM-DD.} -\item{service}{string USGS service to call. Possible values are "dv" (daily values), "uv" (unit/instantaneous values), "qw" (water quality data), and "wqp" (water quality portal, which can include STORET).} +\item{service}{string USGS service to call. Possible values are "dv" (daily values), "uv" (unit/instantaneous values), "qw" (water quality data), "gwlevels" (groundwater),and "wqp" (water quality portal, which can include STORET).} \item{statCd}{string or vector USGS statistic code only used for daily value service. This is usually 5 digits. Daily mean (00003) is the default.} diff --git a/man/dataOverview.Rd b/man/dataOverview.Rd index e52b5e5c45c82ed85dcc19b83401f81c80ed9e6d..e8fdb6c6cc17af832e76549f5403e98bb8a34950 100644 --- a/man/dataOverview.Rd +++ b/man/dataOverview.Rd @@ -3,12 +3,12 @@ \alias{dataOverview} \title{Data Overview for WRTDS} \usage{ -dataOverview(localDaily = Daily, localSample = Sample) +dataOverview(Daily, Sample) } \arguments{ -\item{localDaily}{dataframe} +\item{Daily}{dataframe} -\item{localSample}{dataframe} +\item{Sample}{dataframe} } \description{ Gives a summary of data to be used for WRTDS analysis @@ -17,7 +17,7 @@ Gives a summary of data to be used for WRTDS analysis # These examples require an internet connection to run exDaily <- getNWISDaily('01594440','00060', '1985-01-01', '1985-03-31', interactive=FALSE) exSample <- getNWISSample('01594440','01075', '1985-01-01', '1985-03-31', interactive=FALSE) -dataOverview(localDaily = exDaily, localSample = exSample) +dataOverview(Daily = exDaily, Sample = exSample) } \seealso{ \code{\link{mergeReport}} diff --git a/man/dataRetrieval-package.Rd b/man/dataRetrieval-package.Rd index b7f83a2b966dec71e435985eaed6b1eaa3ae5eb8..06e4b1493549825394033e4d506114e541c1d8cc 100644 --- a/man/dataRetrieval-package.Rd +++ b/man/dataRetrieval-package.Rd @@ -7,7 +7,7 @@ \tabular{ll}{ Package: \tab dataRetrieval\cr Type: \tab Package\cr -Version: \tab 1.3.3\cr +Version: \tab 1.4.0\cr Date: \tab 2014-09-16\cr License: \tab Unlimited for this package, dependencies have more restrictive licensing.\cr Copyright: \tab This software is in the public domain because it contains materials diff --git a/man/getDVData.Rd b/man/getDVData.Rd deleted file mode 100644 index fd8fa266416c7b8e870ddf59732ac8a41564e268..0000000000000000000000000000000000000000 --- a/man/getDVData.Rd +++ /dev/null @@ -1,47 +0,0 @@ -% Generated by roxygen2 (4.0.2): do not edit by hand -\name{getDVData} -\alias{getDVData} -\title{Import Daily Data for WRTDS} -\usage{ -getDVData(siteNumber, parameterCd, startDate, endDate, interactive = TRUE, - convert = TRUE, format = "tsv") -} -\arguments{ -\item{siteNumber}{string USGS site number. This is usually an 8 digit number} - -\item{parameterCd}{string USGS parameter code. This is usually an 5 digit number.} - -\item{startDate}{string starting date for data retrieval in the form YYYY-MM-DD.} - -\item{endDate}{string ending date for data retrieval in the form YYYY-MM-DD.} - -\item{interactive}{logical Option for interactive mode. If true, there is user interaction for error handling and data checks.} - -\item{convert}{logical Option to include a conversion from cfs to cms (35.314667). The default is TRUE, -which is appropriate for using NWIS data in the EGRET package. Set this to FALSE to not include the conversion. If the parameter code is not 00060 (NWIS discharge), -there is no conversion applied.} - -\item{format}{string, can be "tsv" or "xml", and is only applicable for daily and unit value requests. "tsv" returns results faster, but there is a possiblitiy that an incomplete file is returned without warning. XML is slower, -but will offer a warning if the file was incomplete (for example, if there was a momentary problem with the internet connection). It is possible to safely use the "tsv" option, -but the user must carefully check the results to see if the data returns matches what is expected. The default is "tsv".} -} -\value{ -Daily dataframe -} -\description{ -This function is being deprecated for \code{\link{getNWISDaily}}. -} -\examples{ -# These examples require an internet connection to run -\dontrun{Daily <- getDVData('01594440','00060', '1985-01-01', '1985-03-31')} -\dontrun{DailyCFS <- getDVData('01594440','00060', '1985-01-01', '1985-03-31',convert=FALSE)} -\dontrun{DailySuspSediment <- getDVData('01594440','80154', '1985-01-01', '1985-03-31')} -} -\seealso{ -\code{\link{getNWISdvData}}, \code{\link{populateDaily}}, \code{\link{getNWISData}} -} -\keyword{USGS} -\keyword{WRTDS} -\keyword{data} -\keyword{import} - diff --git a/man/getDataAvailability.Rd b/man/getDataAvailability.Rd deleted file mode 100644 index b4955943661147c9fb24bc6c8fac9d533c3e9893..0000000000000000000000000000000000000000 --- a/man/getDataAvailability.Rd +++ /dev/null @@ -1,31 +0,0 @@ -% Generated by roxygen2 (4.0.2): do not edit by hand -\name{getDataAvailability} -\alias{getDataAvailability} -\title{USGS data availability} -\usage{ -getDataAvailability(siteNumber, type = c("uv", "dv", "qw")) -} -\arguments{ -\item{siteNumber}{string USGS site number.} - -\item{type}{vector string. Options are "uv", "dv", "qw"} -} -\value{ -retval dataframe with all information found in the expanded site file -} -\description{ -This function is being deprecated for \code{\link{getNWISDataAvailability}}. -} -\examples{ -# These examples require an internet connection to run -\dontrun{availableData <- getDataAvailability('05114000')} -# To find just unit value ('instantaneous') data: -\dontrun{uvData <- getDataAvailability('05114000',type="uv")} -\dontrun{uvDataMulti <- getDataAvailability(c('05114000','09423350'),type="uv")} -} -\keyword{USGS} -\keyword{data} -\keyword{import} -\keyword{service} -\keyword{web} - diff --git a/man/getMetaData.Rd b/man/getMetaData.Rd deleted file mode 100644 index 92df4ef0a327374d62d5e26eb06503e6c1dae612..0000000000000000000000000000000000000000 --- a/man/getMetaData.Rd +++ /dev/null @@ -1,32 +0,0 @@ -% Generated by roxygen2 (4.0.2): do not edit by hand -\name{getMetaData} -\alias{getMetaData} -\title{Import Metadata for USGS Data} -\usage{ -getMetaData(siteNumber = "", parameterCd = "", interactive = TRUE) -} -\arguments{ -\item{siteNumber}{string USGS site number. This is usually an 8 digit number} - -\item{parameterCd}{string USGS parameter code. This is usually an 5 digit number.} - -\item{interactive}{logical Option for interactive mode. If true, there is user interaction for error handling and data checks.} -} -\value{ -INFO dataframe with agency, site, dateTime, value, and code columns -} -\description{ -This function is being deprecated for \code{\link{getNWISInfo}}. -} -\examples{ -# These examples require an internet connection to run -# Automatically gets information about site 05114000 and temperature, no interaction with user -INFO <- getMetaData('05114000','00010') -} -\keyword{USGS} -\keyword{WRTDS} -\keyword{data} -\keyword{import} -\keyword{service} -\keyword{web} - diff --git a/man/getParameterInfo.Rd b/man/getParameterInfo.Rd deleted file mode 100644 index 1dcd19e33b11ee1834d754cde74ddb2b7c613a88..0000000000000000000000000000000000000000 --- a/man/getParameterInfo.Rd +++ /dev/null @@ -1,28 +0,0 @@ -% Generated by roxygen2 (4.0.2): do not edit by hand -\name{getParameterInfo} -\alias{getParameterInfo} -\title{USGS Parameter Data Retrieval} -\usage{ -getParameterInfo(parameterCd, interactive = TRUE) -} -\arguments{ -\item{parameterCd}{vector of USGS parameter codes. This is usually an 5 digit number.} - -\item{interactive}{logical Option for interactive mode. If true, there is user interaction for error handling and data checks.} -} -\value{ -parameterData dataframe with all information from the USGS about the particular parameter (usually code, name, short name, units, and CAS registry numbers) -} -\description{ -This function is being deprecated for \code{\link{getNWISPcodeInfo}}. -} -\examples{ -# These examples require an internet connection to run -paramINFO <- getParameterInfo (c('01075','00060','00931')) -} -\keyword{USGS} -\keyword{data} -\keyword{import} -\keyword{service} -\keyword{web} - diff --git a/man/getSTORETSampleData.Rd b/man/getSTORETSampleData.Rd deleted file mode 100644 index b478d3045695cfd4c0a7e74ba975edcde4c1e650..0000000000000000000000000000000000000000 --- a/man/getSTORETSampleData.Rd +++ /dev/null @@ -1,38 +0,0 @@ -% Generated by roxygen2 (4.0.2): do not edit by hand -\name{getSTORETSampleData} -\alias{getSTORETSampleData} -\title{Import Sample Data for WRTDS} -\usage{ -getSTORETSampleData(siteNumber, characteristicName, startDate, endDate, - interactive = TRUE) -} -\arguments{ -\item{siteNumber}{string site number. If USGS, it should be in the form :'USGS-XXXXXXXXX...'} - -\item{characteristicName}{string} - -\item{startDate}{string starting date for data retrieval in the form YYYY-MM-DD.} - -\item{endDate}{string ending date for data retrieval in the form YYYY-MM-DD.} - -\item{interactive}{logical Option for interactive mode. If true, there is user interaction for error handling and data checks.} -} -\value{ -Sample dataframe -} -\description{ -This function is being deprecated for \code{\link{getWQPSample}}. -} -\examples{ -# These examples require an internet connection to run -\dontrun{Sample_01075 <- getSTORETSampleData('USGS-01594440','Chloride', '', '')} -\dontrun{Sample_All <- getSTORETSampleData('WIDNR_WQX-10032762','Specific conductance', '', '')} -} -\seealso{ -\code{\link{getWQPSample}} -} -\keyword{USGS} -\keyword{WRTDS} -\keyword{data} -\keyword{import} - diff --git a/man/getSampleData.Rd b/man/getSampleData.Rd deleted file mode 100644 index e2f1b497c541d868b58ab1c71a888462d9023351..0000000000000000000000000000000000000000 --- a/man/getSampleData.Rd +++ /dev/null @@ -1,38 +0,0 @@ -% Generated by roxygen2 (4.0.2): do not edit by hand -\name{getSampleData} -\alias{getSampleData} -\title{Import Sample Data for WRTDS} -\usage{ -getSampleData(siteNumber, parameterCd, startDate, endDate, interactive = TRUE) -} -\arguments{ -\item{siteNumber}{string USGS site number. This is usually an 8 digit number} - -\item{parameterCd}{string USGS parameter code. This is usually an 5 digit number.} - -\item{startDate}{string starting date for data retrieval in the form YYYY-MM-DD.} - -\item{endDate}{string ending date for data retrieval in the form YYYY-MM-DD.} - -\item{interactive}{logical Option for interactive mode. If true, there is user interaction for error handling and data checks.} -} -\value{ -Sample dataframe -} -\description{ -This function is being deprecated for \code{\link{getNWISSample}}. -} -\examples{ -# These examples require an internet connection to run -\dontrun{Sample_01075 <- getSampleData('01594440','01075', '1985-01-01', '1985-03-31')} -\dontrun{Sample_All <- getSampleData('05114000','00915;00931', '1985-01-01', '1985-03-31')} -\dontrun{Sample_Select <- getSampleData('05114000','00915;00931', '', '')} -} -\seealso{ -\code{\link{compressData}}, \code{\link{populateSampleColumns}}, \code{\link{getNWISSample}} -} -\keyword{USGS} -\keyword{WRTDS} -\keyword{data} -\keyword{import} - diff --git a/man/getSampleDataFromFile.Rd b/man/getSampleDataFromFile.Rd deleted file mode 100644 index ee25a09c5fc0f71e70180d9629d778b83658896b..0000000000000000000000000000000000000000 --- a/man/getSampleDataFromFile.Rd +++ /dev/null @@ -1,35 +0,0 @@ -% Generated by roxygen2 (4.0.2): do not edit by hand -\name{getSampleDataFromFile} -\alias{getSampleDataFromFile} -\title{Import Sample Data for WRTDS} -\usage{ -getSampleDataFromFile(filePath, fileName, hasHeader = TRUE, separator = ",", - interactive = TRUE) -} -\arguments{ -\item{filePath}{string specifying the path to the file} - -\item{fileName}{string name of file to open} - -\item{hasHeader}{logical true if the first row of data is the column headers} - -\item{separator}{string character that separates data cells} - -\item{interactive}{logical Option for interactive mode. If true, there is user interaction for error handling and data checks.} -} -\value{ -Sample dataframe -} -\description{ -This function is being deprecated for \code{\link{getUserSample}}. -} -\examples{ -filePath <- system.file("extdata", package="dataRetrieval") -filePath <- paste(filePath,"/",sep="") -fileName <- 'ChoptankRiverNitrate.csv' -\dontrun{Sample <- getSampleDataFromFile(filePath,fileName, separator=";",interactive=FALSE)} -} -\keyword{data} -\keyword{file} -\keyword{import} - diff --git a/man/getSiteFileData.Rd b/man/getSiteFileData.Rd deleted file mode 100644 index 7eeecdf26f3377eb490f1904885f4075d6a70a28..0000000000000000000000000000000000000000 --- a/man/getSiteFileData.Rd +++ /dev/null @@ -1,27 +0,0 @@ -% Generated by roxygen2 (4.0.2): do not edit by hand -\name{getSiteFileData} -\alias{getSiteFileData} -\title{USGS Site File Data Retrieval} -\usage{ -getSiteFileData(siteNumber) -} -\arguments{ -\item{siteNumber}{string USGS site number. This is usually an 8 digit number} -} -\value{ -retval dataframe with all information found in the expanded site file -} -\description{ -This function is being deprecated for \code{\link{getNWISSiteInfo}}. -} -\examples{ -# These examples require an internet connection to run -\dontrun{siteINFO <- getSiteFileData('05114000')} -\dontrun{siteINFOMulti <- getSiteFileData(c('05114000','09423350'))} -} -\keyword{USGS} -\keyword{data} -\keyword{import} -\keyword{service} -\keyword{web} - diff --git a/man/getWQPData.Rd b/man/getWQPData.Rd index c46578d06675cbb8442038e65d4048ec39c38f89..7fa0bdd33b8da644b53bd7292c033bf145c4c729 100644 --- a/man/getWQPData.Rd +++ b/man/getWQPData.Rd @@ -17,9 +17,11 @@ Imports data from Water Quality Portal web service. This function gets the data because it allows for other agencies rather than the USGS. } \examples{ +\dontrun{ nameToUse <- "pH" pHData <- getWQPData(siteid="USGS-04024315",characteristicName=nameToUse) } +} \keyword{WQP} \keyword{data} \keyword{import} diff --git a/man/getWQPInfo.Rd b/man/getWQPInfo.Rd index 319513b4f0dd181beceb826b22ea9d82c5ef3a8e..46eb210ed08aa5c83c1e4035c4e2581013163f22 100644 --- a/man/getWQPInfo.Rd +++ b/man/getWQPInfo.Rd @@ -26,12 +26,14 @@ constitAbbrev - constitute abbreviation # Automatically gets information about site 01594440 and temperature, no interaction with user nameToUse <- 'Specific conductance' pcodeToUse <- '00095' +\dontrun{ INFO <- getWQPInfo('USGS-04024315',pcodeToUse,interactive=TRUE) INFO2 <- getWQPInfo('WIDNR_WQX-10032762',nameToUse) # To adjust the label names: INFO$shortName <- "Little" INFO$paramShortName <- "SC" } +} \keyword{USGS} \keyword{WRTDS} \keyword{data} diff --git a/man/getWQPSample.Rd b/man/getWQPSample.Rd index 4fb18800d312d3a52cbd44f9d86f27bac8a05d29..6418f32a98fce6ad5546d55b35ac9d2b9c78d148 100644 --- a/man/getWQPSample.Rd +++ b/man/getWQPSample.Rd @@ -27,9 +27,11 @@ chapter 7 of the EGRET user guide for more details, then converts it to the Samp } \examples{ # These examples require an internet connection to run +\dontrun{ Sample_01075 <- getWQPSample('USGS-01594440','Chloride', '', '') Sample_All <- getWQPSample('WIDNR_WQX-10032762','Specific conductance', '', '') } +} \seealso{ \code{\link{getWQPData}}, \code{\link{getWQPSites}}, \code{\link{getWQPqwData}}, \code{\link{getNWISqwData}}, and \code{\link{readWQPData}}, diff --git a/man/getWQPSites.Rd b/man/getWQPSites.Rd index 343631dfcf86701c8f14ec518d245f91b2f18273..6ac4d2163e830967c3d04f2d2b61cc5b518a3af7 100644 --- a/man/getWQPSites.Rd +++ b/man/getWQPSites.Rd @@ -17,10 +17,12 @@ Returns a list of sites from the Water Quality Portal web service. This function Arguments to the function should be based on \url{www.waterqualitydata.us/webservices_documentation.jsp} } \examples{ +\dontrun{ site1 <- getWQPSites(siteid="USGS-01594440") type <- "Stream" sites <- getWQPSites(statecode="US:55",countycode="US:55:025",siteType=type) } +} \keyword{WQP} \keyword{data} \keyword{import} diff --git a/man/getWQPqwData.Rd b/man/getWQPqwData.Rd index 44c6244eef89d43b496826606cd61cf3dd215776..4eb60fd4385a70b91ff24a6b989985f655e668a2 100644 --- a/man/getWQPqwData.Rd +++ b/man/getWQPqwData.Rd @@ -31,12 +31,14 @@ site name, such as 'USGS-01234567'. } \examples{ # These examples require an internet connection to run +\dontrun{ rawPcode <- getWQPqwData('USGS-01594440','01075', '1985-01-01', '1985-03-31') rawCharacteristicName <- getWQPqwData('WIDNR_WQX-10032762','Specific conductance', '', '') } +} \seealso{ \code{\link{getWQPData}}, \code{\link{getWQPSites}}, -\code{\link{getSTORETSampleData}}, \code{\link{getNWISqwData}}, and \code{\link{readWQPData}} +\code{\link{getNWISqwData}}, and \code{\link{readWQPData}} } \keyword{USGS} \keyword{data} diff --git a/man/getWaterML1Data.Rd b/man/getWaterML1Data.Rd index 575e44579cfa19b48b1cb8447e193342c12f08ca..4284dfbf438cde0afbd036293ba96acef4f7401d 100644 --- a/man/getWaterML1Data.Rd +++ b/man/getWaterML1Data.Rd @@ -21,14 +21,18 @@ startDate <- "2012-09-01" endDate <- "2012-10-01" offering <- '00003' property <- '00060' +urlBase <- "http://waterservices.usgs.gov/nwis" obs_url <- constructNWISURL(siteNumber,property,startDate,endDate,'dv') data <- getWaterML1Data(obs_url) urlMulti <- constructNWISURL("04085427",c("00060","00010"), startDate,endDate,'dv',statCd=c("00003","00001")) multiData <- getWaterML1Data(urlMulti) -goundwaterExampleURL <- - "http://waterservices.usgs.gov/nwis/gwlevels/?format=waterml&sites=431049071324301&startDT=2013-10-01&endDT=2014-06-30" -groundWater <- getWaterML1Data(goundwaterExampleURL) +groundWaterSite <- "431049071324301" +startGW <- "2013-10-01" +endGW <- "2014-06-30" +groundwaterExampleURL <- constructNWISURL(groundWaterSite, NA, + startGW,endGW, service="gwlevels", format="xml",interactive=FALSE) +groundWater <- getWaterML1Data(groundwaterExampleURL) unitDataURL <- constructNWISURL(siteNumber,property, as.character(Sys.Date()),as.character(Sys.Date()),'uv',format='xml') unitData <- getWaterML1Data(unitDataURL) diff --git a/man/getWaterML2Data.Rd b/man/getWaterML2Data.Rd index ac84669ef8160e9781b0ab7fb213679ababd6547..7024add4e460a49bd71ed8384056b7f13432d4d9 100644 --- a/man/getWaterML2Data.Rd +++ b/man/getWaterML2Data.Rd @@ -15,7 +15,12 @@ mergedDF a data frame containing columns agency, site, dateTime, values, and rem This function accepts a url parameter for a WaterML2 getObservation } \examples{ -URL <- "http://waterservices.usgs.gov/nwis/dv/?format=waterml,2.0&sites=01646500&startDT=2014-09-01&endDT=2014-09-08&statCd=00003¶meterCd=00060" +baseURL <- "http://waterservices.usgs.gov/nwis/dv/?format=waterml,2.0" +URL <- paste(baseURL, "sites=01646500", + "startDT=2014-09-01", + "endDT=2014-09-08", + "statCd=00003", + "parameterCd=00060",sep="&") \dontrun{dataReturned3 <- getWaterML2Data(URL)} } diff --git a/man/mergeReport.Rd b/man/mergeReport.Rd index d246ee527ae06535a6add14c2c3288a96b405cf3..1ac27dabccc1862005ab7a4133ef3c54e15b02d7 100644 --- a/man/mergeReport.Rd +++ b/man/mergeReport.Rd @@ -3,12 +3,12 @@ \alias{mergeReport} \title{Merge Sample and Daily Data for WRTDS} \usage{ -mergeReport(localDaily = Daily, localSample = Sample, interactive = TRUE) +mergeReport(Daily, Sample, interactive = TRUE) } \arguments{ -\item{localDaily}{dataframe containing the daily data, default is Daily} +\item{Daily}{dataframe containing the daily data, default is Daily} -\item{localSample}{dataframe containing the sample data, default is Sample} +\item{Sample}{dataframe containing the sample data, default is Sample} \item{interactive}{logical Option for interactive mode. If true, there is user interaction for error handling and data checks.} } @@ -22,7 +22,7 @@ Merges the flow data from the daily record into the sample record. # These examples require an internet connection to run Daily <- getNWISDaily('01594440','00060', '1985-01-01', '1985-03-31') Sample <- getNWISSample('01594440','01075', '1985-01-01', '1985-03-31') -Sample <- mergeReport() +Sample <- mergeReport(Daily, Sample) } \seealso{ \code{\link{getNWISDaily}}, \code{\link{getNWISSample}} diff --git a/man/populateParameterINFO.Rd b/man/populateParameterINFO.Rd index 29c59aca4158c9081718fc891529449615f9ab5c..bfd5aa1f083a76c230f0e78fb2cd1f0e14451a9d 100644 --- a/man/populateParameterINFO.Rd +++ b/man/populateParameterINFO.Rd @@ -3,17 +3,17 @@ \alias{populateParameterINFO} \title{Populate Parameter Information Columns} \usage{ -populateParameterINFO(parameterCd, localINFO = INFO, interactive = TRUE) +populateParameterINFO(parameterCd, INFO, interactive = TRUE) } \arguments{ \item{parameterCd}{string USGS parameter code} -\item{localINFO}{dataframe with value and code columns. Default is INFO} +\item{INFO}{dataframe with value and code columns. Default is INFO} \item{interactive}{logical Option for interactive mode. If true, there is user interaction for error handling and data checks.} } \value{ -localINFO dataframe +INFO dataframe } \description{ Populates INFO data frame with additional user-supplied information concerning the measured parameter. @@ -27,6 +27,6 @@ INFO$param.nm <- parameterData$parameter_nm INFO$param.units <- parameterData$parameter_units INFO$paramShortName <- parameterData$srsname INFO$paramNumber <- parameterData$parameter_cd -INFO <- populateParameterINFO(parameterCd) +INFO <- populateParameterINFO(parameterCd, INFO) } diff --git a/man/processQWData.Rd b/man/processQWData.Rd index 1188049a94f21b856c49957d68e9a9f7bd138644..c68559e050ba0d224f575a3781b27c1e53f95fc7 100644 --- a/man/processQWData.Rd +++ b/man/processQWData.Rd @@ -21,9 +21,11 @@ conditions to determine if a value is left censored or not. Censored values are } \examples{ # These examples require an internet connection to run -rawSample <- getWQPqwData('USGS-01594440','01075', '1985-01-01', '1985-03-31') +\dontrun{ +rawSample <- getWQPqwData('USGS-01594440','', '', '') rawSampleSelect <- processQWData(rawSample) } +} \keyword{USGS} \keyword{data} \keyword{import} diff --git a/man/readWQPData.Rd b/man/readWQPData.Rd index 75a3337fbc7e012eba6935bb725435b9a9b17128..81f1ff3649e1c5446b05a828b395e65aabf10128 100644 --- a/man/readWQPData.Rd +++ b/man/readWQPData.Rd @@ -17,9 +17,11 @@ Imports data from the Water Quality Portal based on a specified url. } \examples{ # These examples require an internet connection to run +\dontrun{ rawSampleURL <- constructNWISURL('USGS-01594440','01075', '1985-01-01', '1985-03-31',"wqp") rawSample <- readWQPData(rawSampleURL) } +} \keyword{USGS} \keyword{data} \keyword{import} diff --git a/man/removeDuplicates.Rd b/man/removeDuplicates.Rd index a6711768866ae58f141b13dcb099e198d0fc0a7b..6eed234002f01221fa02e3777404c815c3a31f34 100644 --- a/man/removeDuplicates.Rd +++ b/man/removeDuplicates.Rd @@ -3,10 +3,10 @@ \alias{removeDuplicates} \title{Remove Duplicates} \usage{ -removeDuplicates(localSample = Sample) +removeDuplicates(Sample) } \arguments{ -\item{localSample}{dataframe with at least DecYear and ConcHigh, default name is Sample} +\item{Sample}{dataframe with at least DecYear and ConcHigh, default name is Sample} } \value{ Sample1 dataframe diff --git a/vignettes/dataRetrieval.Rnw b/vignettes/dataRetrieval.Rnw index ecd2d82431a11a2965d254b9fe479b5d9e42549e..4ecffbbe2a992c03ff0ccb6a19d5ada4547678cc 100644 --- a/vignettes/dataRetrieval.Rnw +++ b/vignettes/dataRetrieval.Rnw @@ -2,7 +2,7 @@ %\VignetteEngine{knitr::knitr} %\VignetteDepends{} %\VignetteSuggests{xtable,EGRET} -%\VignetteImports{zoo, XML, RCurl} +%\VignetteImports{zoo, XML, RCurl, dplyr, reshape2,lubridate} %\VignettePackage{dataRetrieval} \documentclass[a4paper,11pt]{article} @@ -1004,7 +1004,7 @@ endDate <- "2013-01-01" Daily <- getNWISDaily(siteNumber, "00060", startDate, endDate) Sample <- getNWISSample(siteNumber,parameterCd, startDate, endDate) -Sample <- mergeReport() +Sample <- mergeReport(Daily,Sample) names(Sample) @ diff --git a/vignettes/figure/egretEx.pdf b/vignettes/figure/egretEx.pdf index b06cd6fa6226005c41c3dff6449a573b0f09a9d7..87e7eaa2180bcea11e601464052ae1271f4246c3 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 b89257452f8190556a4b65ee34493c5ea5f6f4b8..5cf81a71bd976ec7ebacf2a1cd9ce80e589cbc8e 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 9a5f1629424ea4246c17101915a887bac0eed346..25956da25d0bd807ce86645cbc6142f375ff2088 100644 Binary files a/vignettes/figure/getQWtemperaturePlot.pdf and b/vignettes/figure/getQWtemperaturePlot.pdf differ