Merge pull request #122 from ldecicco-USGS/master

Updating rBuildignore

.Rbuildignore

@@ -1,16 +1,16 @@
-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
 ^\.Rproj\dataRetrieval.Rproj
 ^\.Rproj\.Rhistory
 ^\.Rproj\.travis.yml
 ^\.Rproj\appveyor.yml
-appveyor.yml
+
 

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)
 

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)