From e65c4cabc8f193708c0d0c85b95b0d6a767635fc Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Tue, 9 Dec 2014 14:16:35 -0600
Subject: [PATCH] Using data instead of lazy loading.
---
R/constructNWISURL.r | 4 ++--
R/readNWISpCode.r | 2 +-
R/tabbedDataRetrievals.R | 2 +-
R/whatNWISData.r | 2 +-
man/constructNWISURL.Rd | 2 +-
man/parameterCdFile.Rd | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r
index ca19cb45..eb58d0c6 100644
--- a/R/constructNWISURL.r
+++ b/R/constructNWISURL.r
@@ -27,7 +27,7 @@
#' startDate <- '1985-01-01'
#' endDate <- ''
#' pCode <- c("00060","00010")
-#' \dontrun{
+#' \donttest{
#' # Not running for time considerations
#' url_daily <- constructNWISURL(siteNumber,pCode,
#' startDate,endDate,'dv',statCd=c("00003","00001"))
@@ -48,7 +48,7 @@ constructNWISURL <- function(siteNumber,parameterCd="00060",startDate="",endDate
service <- match.arg(service, c("dv","uv","iv","qw","gwlevels","rating","peak","meas"))
- parameterCdFile <- parameterCdFile
+ data(parameterCdFile)
if(any(!is.na(parameterCd))){
pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
diff --git a/R/readNWISpCode.r b/R/readNWISpCode.r
index 24e8fcdf..95b9a66e 100644
--- a/R/readNWISpCode.r
+++ b/R/readNWISpCode.r
@@ -35,7 +35,7 @@ readNWISpCode <- function(parameterCd){
parameterCd <- parameterCd[goodIndex]
}
- parameterCdFile <- parameterCdFile
+ data(parameterCdFile)
parameterData <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCd,]
diff --git a/R/tabbedDataRetrievals.R b/R/tabbedDataRetrievals.R
index 003bfe8a..4d4dacf4 100644
--- a/R/tabbedDataRetrievals.R
+++ b/R/tabbedDataRetrievals.R
@@ -47,7 +47,7 @@ NULL
#' @docType data
#' @keywords USGS parameterCd
#' @examples
-#' parameterCdFile <- parameterCdFile
+#' data(parameterCdFile)
#' dischargeInfo <- parameterCdFile[parameterCdFile$parameter_cd=="00060",]
NULL
diff --git a/R/whatNWISData.r b/R/whatNWISData.r
index 7d32e365..1d2ed461 100644
--- a/R/whatNWISData.r
+++ b/R/whatNWISData.r
@@ -96,7 +96,7 @@ whatNWISdata <- function(siteNumbers,service="all",parameterCd="all",statCd="all
parameterCds <- unique(SiteFile$parm_cd)
- parameterCdFile <- parameterCdFile
+ data(parameterCdFile)
parameterCdINFO <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCds,]
SiteFile <- merge(SiteFile,parameterCdINFO,by.x="parm_cd" ,by.y="parameter_cd",all=TRUE)
diff --git a/man/constructNWISURL.Rd b/man/constructNWISURL.Rd
index 100f4eaa..cbe2bde3 100644
--- a/man/constructNWISURL.Rd
+++ b/man/constructNWISURL.Rd
@@ -44,7 +44,7 @@ siteNumber <- '01594440'
startDate <- '1985-01-01'
endDate <- ''
pCode <- c("00060","00010")
-\dontrun{
+\donttest{
# Not running for time considerations
url_daily <- constructNWISURL(siteNumber,pCode,
startDate,endDate,'dv',statCd=c("00003","00001"))
diff --git a/man/parameterCdFile.Rd b/man/parameterCdFile.Rd
index 4052d274..e52989d4 100644
--- a/man/parameterCdFile.Rd
+++ b/man/parameterCdFile.Rd
@@ -22,7 +22,7 @@ Complete list of USGS parameter codes as of November 7, 2014. The data was pulle
format=rdb&show=parameter_group_nm&show=parameter_nm&show=casrn&show=srsname&show=parameter_units}
}
\examples{
-parameterCdFile <- parameterCdFile
+data(parameterCdFile)
dischargeInfo <- parameterCdFile[parameterCdFile$parameter_cd=="00060",]
}
\keyword{USGS}
--
GitLab