From f188d3a5a9dcbb38988af5e385af4812be9d0fb3 Mon Sep 17 00:00:00 2001 From: unknown <ldecicco@usgs.gov> Date: Tue, 2 Dec 2014 15:30:53 -0600 Subject: [PATCH] Changing siteNumber to siteNumbers when appropriate. --- R/readNWISunit.r | 20 ++++++++++---------- man/readNWISmeas.Rd | 8 ++++---- man/readNWISpeak.Rd | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/R/readNWISunit.r b/R/readNWISunit.r index 595ae09d..5f27695e 100644 --- a/R/readNWISunit.r +++ b/R/readNWISunit.r @@ -69,7 +69,7 @@ readNWISuv <- function (siteNumbers,parameterCd,startDate="",endDate="", tz=""){ #' Reads peak flow from NWISweb. #' Data is retrieved from \url{http://waterdata.usgs.gov/nwis}. #' -#' @param siteNumber character USGS site number. This is usually an 8 digit number +#' @param siteNumbers character USGS site number(or multiple sites). This is usually an 8 digit number. #' @param startDate character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates #' retrieval for the earliest possible record. #' @param endDate character ending date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates @@ -102,9 +102,9 @@ readNWISuv <- function (siteNumbers,parameterCd,startDate="",endDate="", tz=""){ #' } #' @export #' @examples -#' siteNumber <- '01594440' -#' data <- readNWISpeak(siteNumber) -readNWISpeak <- function (siteNumber,startDate="",endDate=""){ +#' siteNumbers <- c('01594440','040851325') +#' data <- readNWISpeak(siteNumbers) +readNWISpeak <- function (siteNumbers,startDate="",endDate=""){ # Doesn't seem to be a peak xml service url <- constructNWISURL(siteNumber,NA,startDate,endDate,"peak") @@ -186,7 +186,7 @@ readNWISrating <- function (siteNumber,type="base"){ #'Reads surface-water measurement data from NWISweb. Data is retrieved from \url{http://waterdata.usgs.gov/nwis}. #'See \url{http://waterdata.usgs.gov/usa/nwis/sw} for details about surface water. #' -#' @param siteNumber character USGS site number. This is usually an 8 digit number +#' @param siteNumbers character USGS site number (or multiple sites). This is usually an 8 digit number #' @param startDate character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates #' retrieval for the earliest possible record. #' @param endDate character ending date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates @@ -217,12 +217,12 @@ readNWISrating <- function (siteNumber,type="base"){ #' } #' @export #' @examples -#' siteNumber <- '01594440' -#' data <- readNWISmeas(siteNumber) -readNWISmeas <- function (siteNumber,startDate="",endDate="", tz=""){ +#' siteNumbers <- c('01594440','040851325') +#' data <- readNWISmeas(siteNumbers) +readNWISmeas <- function (siteNumbers,startDate="",endDate="", tz=""){ # Doesn't seem to be a WaterML1 format option - url <- constructNWISURL(siteNumber,NA,startDate,endDate,"meas") + url <- constructNWISURL(siteNumbers,NA,startDate,endDate,"meas") data <- importRDB1(url,asDateTime=FALSE,tz=tz) @@ -230,7 +230,7 @@ readNWISmeas <- function (siteNumber,startDate="",endDate="", tz=""){ data$diff_from_rating_pc <- as.numeric(data$diff_from_rating_pc) } - siteInfo <- readNWISsite(siteNumber) + siteInfo <- readNWISsite(siteNumbers) attr(data, "siteInfo") <- siteInfo attr(data, "variableInfo") <- NULL diff --git a/man/readNWISmeas.Rd b/man/readNWISmeas.Rd index 7cb0b8b1..800c18db 100644 --- a/man/readNWISmeas.Rd +++ b/man/readNWISmeas.Rd @@ -3,10 +3,10 @@ \alias{readNWISmeas} \title{Reads surface-water measurement data from NWISweb.} \usage{ -readNWISmeas(siteNumber, startDate = "", endDate = "", tz = "") +readNWISmeas(siteNumbers, startDate = "", endDate = "", tz = "") } \arguments{ -\item{siteNumber}{character USGS site number. This is usually an 8 digit number} +\item{siteNumbers}{character USGS site number (or multiple sites). This is usually an 8 digit number} \item{startDate}{character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates retrieval for the earliest possible record.} @@ -46,7 +46,7 @@ Reads surface-water measurement data from NWISweb. Data is retrieved from \url{h See \url{http://waterdata.usgs.gov/usa/nwis/sw} for details about surface water. } \examples{ -siteNumber <- '01594440' -data <- readNWISmeas(siteNumber) +siteNumbers <- c('01594440','040851325') +data <- readNWISmeas(siteNumbers) } diff --git a/man/readNWISpeak.Rd b/man/readNWISpeak.Rd index de3d4d82..59a601e8 100644 --- a/man/readNWISpeak.Rd +++ b/man/readNWISpeak.Rd @@ -3,10 +3,10 @@ \alias{readNWISpeak} \title{Reads peak flow data from NWISweb.} \usage{ -readNWISpeak(siteNumber, startDate = "", endDate = "") +readNWISpeak(siteNumbers, startDate = "", endDate = "") } \arguments{ -\item{siteNumber}{character USGS site number. This is usually an 8 digit number} +\item{siteNumbers}{character USGS site number(or multiple sites). This is usually an 8 digit number.} \item{startDate}{character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates retrieval for the earliest possible record.} @@ -47,7 +47,7 @@ Reads peak flow from NWISweb. Data is retrieved from \url{http://waterdata.usgs.gov/nwis}. } \examples{ -siteNumber <- '01594440' -data <- readNWISpeak(siteNumber) +siteNumbers <- c('01594440','040851325') +data <- readNWISpeak(siteNumbers) } -- GitLab