Skip to content
Snippets Groups Projects
Commit e5dadd09 authored by Laura A DeCicco's avatar Laura A DeCicco
Browse files

Trying to remove notes.

parent b16687a7
No related branches found
No related tags found
1 merge request!55Change from lazy loading to data.
...@@ -48,7 +48,7 @@ constructNWISURL <- function(siteNumber,parameterCd="00060",startDate="",endDate ...@@ -48,7 +48,7 @@ constructNWISURL <- function(siteNumber,parameterCd="00060",startDate="",endDate
service <- match.arg(service, c("dv","uv","iv","qw","gwlevels","rating","peak","meas")) service <- match.arg(service, c("dv","uv","iv","qw","gwlevels","rating","peak","meas"))
data(parameterCdFile) data("parameterCdFile")
if(any(!is.na(parameterCd))){ if(any(!is.na(parameterCd))){
pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd)))) pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
......
...@@ -24,6 +24,8 @@ readNWISpCode <- function(parameterCd){ ...@@ -24,6 +24,8 @@ readNWISpCode <- function(parameterCd){
pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd)))) pcodeCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(parameterCd))))
data("parameterCdFile")
if(!pcodeCheck){ if(!pcodeCheck){
goodIndex <- which(parameterCd %in% parameterCdFile$parameter_cd) goodIndex <- which(parameterCd %in% parameterCdFile$parameter_cd)
if(length(goodIndex) > 0){ if(length(goodIndex) > 0){
...@@ -35,8 +37,6 @@ readNWISpCode <- function(parameterCd){ ...@@ -35,8 +37,6 @@ readNWISpCode <- function(parameterCd){
parameterCd <- parameterCd[goodIndex] parameterCd <- parameterCd[goodIndex]
} }
data(parameterCdFile)
parameterData <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCd,] parameterData <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCd,]
if(nrow(parameterData) != length(parameterCd)){ if(nrow(parameterData) != length(parameterCd)){
......
...@@ -71,6 +71,9 @@ whatNWISdata <- function(siteNumbers,service="all",parameterCd="all",statCd="all ...@@ -71,6 +71,9 @@ whatNWISdata <- function(siteNumbers,service="all",parameterCd="all",statCd="all
if(!("all" %in% service)){ 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) 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)){ if(!("all" %in% parameterCd)){
parameterCdCheck <- all(nchar(parameterCd) == 5) & all(!is.na(suppressWarnings(as.numeric(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 ...@@ -96,8 +99,6 @@ whatNWISdata <- function(siteNumbers,service="all",parameterCd="all",statCd="all
parameterCds <- unique(SiteFile$parm_cd) parameterCds <- unique(SiteFile$parm_cd)
data(parameterCdFile)
parameterCdINFO <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCds,] parameterCdINFO <- parameterCdFile[parameterCdFile$parameter_cd %in% parameterCds,]
SiteFile <- merge(SiteFile,parameterCdINFO,by.x="parm_cd" ,by.y="parameter_cd",all=TRUE) SiteFile <- merge(SiteFile,parameterCdINFO,by.x="parm_cd" ,by.y="parameter_cd",all=TRUE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment