From 2511ae8150ef8c42d54255dd86c4149b4ff00f2d Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Mon, 27 Apr 2015 13:14:27 -0500
Subject: [PATCH] Fixes #119.

---
 R/readWQPdata.R  |  1 +
 R/whatWQPsites.R | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

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)