diff --git a/.Rbuildignore b/.Rbuildignore index b9f08b03..c9b87c83 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,10 +1,10 @@ -vignettes\figure +vignettes/figure +appveyor.yml +.travis.yml +.gitignore +dataRetrieval-concordance.tex ^.*\.Rproj$ ^\.Rproj\.user$ -^\.Rproj\inst\dataRetrieval.log -^\.Rproj\inst\dataRetrieval-concordance.tex -^\.Rproj\inst\dataRetrieval.toc -^\.Rproj\inst\dataRetrieval.tex ^\.travis\.yml$ ^\.Rproj\.gitignore ^\.Rproj\.RData @@ -12,5 +12,5 @@ vignettes\figure ^\.Rproj\.Rhistory ^\.Rproj\.travis.yml ^\.Rproj\appveyor.yml -appveyor.yml + diff --git a/R/readWQPdata.R b/R/readWQPdata.R index 93a87fc2..51b2525b 100644 --- a/R/readWQPdata.R +++ b/R/readWQPdata.R @@ -143,6 +143,7 @@ readWQPdata <- function(...){ } values <- gsub(",","%2C",values) + values <- gsub(";","%3B",values) values <- gsub("%20","+",values) values <- gsub(":","%3A",values) diff --git a/R/whatWQPsites.R b/R/whatWQPsites.R index 643168ff..e7533219 100644 --- a/R/whatWQPsites.R +++ b/R/whatWQPsites.R @@ -65,7 +65,23 @@ whatWQPsites <- function(...){ values <- values[!(names(values) %in% "tz")] } + if("statecode" %in% names(values)){ + stCd <- values["statecode"] + if(!grepl("US:",stCd)){ + values["statecode"] <- paste0("US:",stateCdLookup(stCd, "id")) + } + } + + if("stateCd" %in% names(values)){ + stCd <- values["stateCd"] + if(!grepl("US:",stCd)){ + values["stateCd"] <- paste0("US:",stateCdLookup(stCd, "id")) + } + names(values)[names(values) == "stateCd"] <- "statecode" + } + values <- gsub(",","%2C",values) + values <- gsub(";","%3B",values) values <- gsub("%20","+",values) values <- gsub(":","%3A",values) diff --git a/inst/doc/dataRetrieval.pdf b/inst/doc/dataRetrieval.pdf index c58a9e6b..a520a59e 100644 Binary files a/inst/doc/dataRetrieval.pdf and b/inst/doc/dataRetrieval.pdf differ