diff --git a/R/getWebServiceData.R b/R/getWebServiceData.R index 57e77cfca4674b40b940e2d2f52e05cf85a757cb..5405b4b9c783694ae78e9a79d7c96c8adf08b0e9 100644 --- a/R/getWebServiceData.R +++ b/R/getWebServiceData.R @@ -14,7 +14,9 @@ #' offering <- '00003' #' property <- '00060' #' obs_url <- constructNWISURL(siteNumber,property,startDate,endDate,'dv') +#' \dontrun{ #' rawData <- getWebServiceData(obs_url) +#' } getWebServiceData <- function(obs_url){ possibleError <- tryCatch({ h <- basicHeaderGatherer() diff --git a/R/importRDB1.r b/R/importRDB1.r index 743c09c09d9f9e9295918d84a2d50d9d4d234f6c..83b636b27912ade2bb3c3d61d791f0dbfae4e557 100644 --- a/R/importRDB1.r +++ b/R/importRDB1.r @@ -49,8 +49,9 @@ #' #' obs_url <- constructNWISURL(siteNumber,property, #' startDate,endDate,"dv",format="tsv") -#' data <- importRDB1(obs_url) #' \dontrun{ +#' data <- importRDB1(obs_url) +#' #' urlMultiPcodes <- constructNWISURL("04085427",c("00060","00010"), #' startDate,endDate,"dv",statCd=c("00003","00001"),"tsv") #' multiData <- importRDB1(urlMultiPcodes) diff --git a/R/importWaterML2.r b/R/importWaterML2.r index 0abf9e83335310b95c2b15ecf10d279aa47aa492..d46c1f166953a58def1152b6920e037306a2cc03 100644 --- a/R/importWaterML2.r +++ b/R/importWaterML2.r @@ -35,17 +35,12 @@ #' "statCd=00003", #' "parameterCd=00060",sep="&") #' dataReturnMulti <- importWaterML2(URLmulti) -#' -#' filePath <- system.file("extdata", package="dataRetrieval") -#' fileName <- "WaterML2Example.xml" -#' fullPath <- file.path(filePath, fileName) -#' UserData <- importWaterML2(fullPath) #' } #' filePath <- system.file("extdata", package="dataRetrieval") #' fileName <- "WaterML2Example.xml" #' fullPath <- file.path(filePath, fileName) +#' UserData <- importWaterML2(fullPath) #' -#' fileData <- importWaterML2(fullPath) importWaterML2 <- function(obs_url, asDateTime=FALSE, tz=""){ if(file.exists(obs_url)){ diff --git a/R/readNWISunit.r b/R/readNWISunit.r index 1662a8dabe4ea213888847b2c203f5f3e8bbff16..902fd53180bb705004d8ecfc483d38f026b85136 100644 --- a/R/readNWISunit.r +++ b/R/readNWISunit.r @@ -49,9 +49,9 @@ #' parameterCd <- '00060' #' startDate <- "2014-10-10" #' endDate <- "2014-10-10" -#' # These examples require an internet connection to run -#' rawData <- readNWISuv(siteNumber,parameterCd,startDate,endDate) #' \dontrun{ +#' rawData <- readNWISuv(siteNumber,parameterCd,startDate,endDate) +#' #' timeZoneChange <- readNWISuv(c('04024430','04024000'),parameterCd, #' "2013-11-03","2013-11-03") #' } diff --git a/R/renameColumns.R b/R/renameColumns.R index 480c805f0b2e769481b7fb0e8da79790ff29c445..e98ec7e39a94c1c26cba2fc1928f196c3488a8f2 100644 --- a/R/renameColumns.R +++ b/R/renameColumns.R @@ -42,9 +42,11 @@ #' siteWithTwo <- '01480015' #' startDate <- "2012-09-01" #' endDate <- "2012-10-01" +#' \dontrun{ #' url2 <- constructNWISURL(siteWithTwo, "00060",startDate,endDate,'dv') #' twoResults <- importWaterML1(url2,TRUE) #' twoResults <- renameNWISColumns(twoResults) +#' } renameNWISColumns <- function(rawData, p00010="Wtemp", p00045="Precip", p00060="Flow", p00065="GH", p00095="SpecCond", p00300="DO", p00400="pH", p62611="GWL", p63680="Turb", p72019="WLBLS", diff --git a/R/tabbedDataRetrievals.R b/R/tabbedDataRetrievals.R index 52ec04260de20a5d97932eba351eecd208e04185..d21e64cf7a946c8ecc6411f2b045c01eaeeeffb1 100644 --- a/R/tabbedDataRetrievals.R +++ b/R/tabbedDataRetrievals.R @@ -3,8 +3,8 @@ #' \tabular{ll}{ #' Package: \tab dataRetrieval\cr #' Type: \tab Package\cr -#' Version: \tab 2.0.2\cr -#' Date: \tab 2014-12-15\cr +#' Version: \tab 2.1.1\cr +#' Date: \tab 2015-01-29\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 #' that originally came from the United States Geological Survey, an agency of diff --git a/R/whatNWISsites.R b/R/whatNWISsites.R index 83d9707e8744e7202453f851b8a720725b3b5005..82c847f4684a33816cd5ac41f794a365e96b057b 100644 --- a/R/whatNWISsites.R +++ b/R/whatNWISsites.R @@ -27,7 +27,9 @@ #' @export #' @import XML #' @examples +#' \dontrun{ #' siteListPhos <- whatNWISsites(stateCd="OH",parameterCd="00665") +#' } whatNWISsites <- function(...){ matchReturn <- list(...) diff --git a/man/dataRetrieval-package.Rd b/man/dataRetrieval-package.Rd index f60dfad90dbcd0d3093aa0aa1a337c9d1bb9f585..4756b365b8ea5c2ad5b75d8aa323ac8c5ea14e26 100644 --- a/man/dataRetrieval-package.Rd +++ b/man/dataRetrieval-package.Rd @@ -8,8 +8,8 @@ \tabular{ll}{ Package: \tab dataRetrieval\cr Type: \tab Package\cr -Version: \tab 2.0.2\cr -Date: \tab 2014-12-15\cr +Version: \tab 2.1.1\cr +Date: \tab 2015-01-29\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 that originally came from the United States Geological Survey, an agency of diff --git a/man/getWebServiceData.Rd b/man/getWebServiceData.Rd index a35ccd901f9c33c6abd9120e8853835465c2ce36..1396433f4ee088eabf4a8ab713e5773ce32ae6b2 100644 --- a/man/getWebServiceData.Rd +++ b/man/getWebServiceData.Rd @@ -23,6 +23,8 @@ endDate <- "2012-10-01" offering <- '00003' property <- '00060' obs_url <- constructNWISURL(siteNumber,property,startDate,endDate,'dv') +\dontrun{ rawData <- getWebServiceData(obs_url) } +} diff --git a/man/importRDB1.Rd b/man/importRDB1.Rd index 1bf25ea2eaa9ddc948a2444261fbeb428895609a..3c2764e87014c04c75ece580557c546c958b0035 100644 --- a/man/importRDB1.Rd +++ b/man/importRDB1.Rd @@ -62,8 +62,9 @@ property <- "00060" obs_url <- constructNWISURL(siteNumber,property, startDate,endDate,"dv",format="tsv") -data <- importRDB1(obs_url) \dontrun{ +data <- importRDB1(obs_url) + urlMultiPcodes <- constructNWISURL("04085427",c("00060","00010"), startDate,endDate,"dv",statCd=c("00003","00001"),"tsv") multiData <- importRDB1(urlMultiPcodes) diff --git a/man/importWaterML2.Rd b/man/importWaterML2.Rd index 44d4c1e56db1e19b71bfdfa0fa8b8096f022a668..419775eb44f8777285c24b6148f9866bd25d2e90 100644 --- a/man/importWaterML2.Rd +++ b/man/importWaterML2.Rd @@ -44,16 +44,10 @@ URLmulti <- paste(baseURL, "statCd=00003", "parameterCd=00060",sep="&") dataReturnMulti <- importWaterML2(URLmulti) - -filePath <- system.file("extdata", package="dataRetrieval") -fileName <- "WaterML2Example.xml" -fullPath <- file.path(filePath, fileName) -UserData <- importWaterML2(fullPath) } filePath <- system.file("extdata", package="dataRetrieval") fileName <- "WaterML2Example.xml" fullPath <- file.path(filePath, fileName) - -fileData <- importWaterML2(fullPath) +UserData <- importWaterML2(fullPath) } diff --git a/man/readNWISuv.Rd b/man/readNWISuv.Rd index 53557a8219fef96b1c081d0a2761fccb2108ad65..c2c6201519cd19f96e7b20137ecb5fc490a64fab 100644 --- a/man/readNWISuv.Rd +++ b/man/readNWISuv.Rd @@ -61,9 +61,9 @@ siteNumber <- '05114000' parameterCd <- '00060' startDate <- "2014-10-10" endDate <- "2014-10-10" -# These examples require an internet connection to run -rawData <- readNWISuv(siteNumber,parameterCd,startDate,endDate) \dontrun{ +rawData <- readNWISuv(siteNumber,parameterCd,startDate,endDate) + timeZoneChange <- readNWISuv(c('04024430','04024000'),parameterCd, "2013-11-03","2013-11-03") } diff --git a/man/renameNWISColumns.Rd b/man/renameNWISColumns.Rd index c403d32f3488b1bc7898e2e20e90c5abef7dc923..28cdad5914270c4f53ccb6e1bef767eebae25aaf 100644 --- a/man/renameNWISColumns.Rd +++ b/man/renameNWISColumns.Rd @@ -65,10 +65,12 @@ The following statistics codes are converted by \code{renameNWISColumns}. See siteWithTwo <- '01480015' startDate <- "2012-09-01" endDate <- "2012-10-01" +\dontrun{ url2 <- constructNWISURL(siteWithTwo, "00060",startDate,endDate,'dv') twoResults <- importWaterML1(url2,TRUE) twoResults <- renameNWISColumns(twoResults) } +} \seealso{ \code{\link{readNWISdv}}, \code{\link{readNWISuv}} } diff --git a/man/whatNWISsites.Rd b/man/whatNWISsites.Rd index 40d0ad27f9fb9dd39bae01f45694aca489c13ada..330236fc94f0f6d4f6112bd72de7df12803664b8 100644 --- a/man/whatNWISsites.Rd +++ b/man/whatNWISsites.Rd @@ -35,8 +35,10 @@ Arguments to the function should be based on \url{http://waterservices.usgs.gov/ Mapper format is used } \examples{ +\dontrun{ siteListPhos <- whatNWISsites(stateCd="OH",parameterCd="00665") } +} \keyword{NWIS} \keyword{data} \keyword{import}