Using data instead of lazy loading.

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))))

R/readNWISpCode.r

@@ -35,7 +35,7 @@ readNWISpCode <- function(parameterCd){
     parameterCd <- parameterCd[goodIndex]
   }
   
-  parameterCdFile <- parameterCdFile
+  data(parameterCdFile)
   
   parameterData <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCd,]
 

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
 

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)

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"))

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}