Fixes #119.

DOI-USGS · Apr 27, 2015 · 2511ae8 · 2511ae8
1 parent e2f3b91
commit 2511ae8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git 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
@@ -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)