From e5dadd09f5d60578606e85c7d7b49b55c4d43d5a Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Tue, 9 Dec 2014 14:37:24 -0600
Subject: [PATCH] Trying to remove notes.
---
R/constructNWISURL.r | 2 +-
R/readNWISpCode.r | 4 ++--
R/whatNWISData.r | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r
index eb58d0c6..11440d14 100644
--- a/R/constructNWISURL.r
+++ b/R/constructNWISURL.r
@@ -48,7 +48,7 @@ constructNWISURL <- function(siteNumber,parameterCd="00060",startDate="",endDate
service <- match.arg(service, c("dv","uv","iv","qw","gwlevels","rating","peak","meas"))
- data(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 95b9a66e..01e4dee7 100644
--- a/R/readNWISpCode.r
+++ b/R/readNWISpCode.r
@@ -24,6 +24,8 @@ readNWISpCode <- function(parameterCd){
pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
+ data("parameterCdFile")
+
if(!pcodeCheck){
goodIndex <- which(parameterCd %in% parameterCdFile$parameter_cd)
if(length(goodIndex) > 0){
@@ -35,8 +37,6 @@ readNWISpCode <- function(parameterCd){
parameterCd <- parameterCd[goodIndex]
}
- data(parameterCdFile)
-
parameterData <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCd,]
if(nrow(parameterData) != length(parameterCd)){
diff --git a/R/whatNWISData.r b/R/whatNWISData.r
index 1d2ed461..b795d3ce 100644
--- a/R/whatNWISData.r
+++ b/R/whatNWISData.r
@@ -71,6 +71,9 @@ whatNWISdata <- function(siteNumbers,service="all",parameterCd="all",statCd="all
if(!("all" %in% service)){
service <- match.arg(service, c("dv","uv","qw","ad","id","pk","sv","gw","aw","all","ad","iv","rt"), several.ok = TRUE)
}
+
+
+ data("parameterCdFile")
if(!("all" %in% parameterCd)){
parameterCdCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
@@ -96,8 +99,6 @@ whatNWISdata <- function(siteNumbers,service="all",parameterCd="all",statCd="all
parameterCds <- unique(SiteFile$parm_cd)
- data(parameterCdFile)
-
parameterCdINFO <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCds,]
SiteFile <- merge(SiteFile,parameterCdINFO,by.x="parm_cd" ,by.y="parameter_cd",all=TRUE)
--
GitLab