From 98f2898bfc3b4c1af80b6846fefd647a797ba37e Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Mon, 15 Jun 2015 11:04:00 -0500
Subject: [PATCH] Fixing WQP bounding box problem.
---
R/readWQPdata.R | 9 +++------
R/whatWQPsites.R | 9 +++++----
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/R/readWQPdata.R b/R/readWQPdata.R
index 51b2525b..a54b8ecf 100644
--- a/R/readWQPdata.R
+++ b/R/readWQPdata.R
@@ -100,7 +100,7 @@ readWQPdata <- function(...){
matchReturn <- list(...)
- values <- sapply(matchReturn, function(x) URLencode(as.character(paste(eval(x),collapse=";",sep=""))))
+ values <- sapply(matchReturn, function(x) as.character(paste(eval(x),collapse=";",sep="")))
if("bBox" %in% names(values)){
values['bBox'] <- gsub(pattern = ";", replacement = ",", x = values['bBox'])
@@ -141,16 +141,13 @@ readWQPdata <- function(...){
} else {
tz <- ""
}
-
- values <- gsub(",","%2C",values)
- values <- gsub(";","%3B",values)
+
values <- gsub("%20","+",values)
- values <- gsub(":","%3A",values)
urlCall <- paste(paste(names(values),values,sep="="),collapse="&")
-
baseURL <- "http://www.waterqualitydata.us/Result/search?"
+ # baseURL <- "http://wqp-test.er.usgs.gov/Result/search?&sorted=no"
urlCall <- paste0(baseURL,
urlCall,
"&mimeType=tsv")
diff --git a/R/whatWQPsites.R b/R/whatWQPsites.R
index e7533219..a425df3e 100644
--- a/R/whatWQPsites.R
+++ b/R/whatWQPsites.R
@@ -59,7 +59,7 @@ whatWQPsites <- function(...){
matchReturn <- list(...)
- values <- sapply(matchReturn, function(x) URLencode(as.character(paste(eval(x),collapse=";",sep=""))))
+ values <- sapply(matchReturn, function(x) as.character(paste(eval(x),collapse=";",sep="")))
if("tz" %in% names(values)){
values <- values[!(names(values) %in% "tz")]
@@ -80,10 +80,10 @@ whatWQPsites <- function(...){
names(values)[names(values) == "stateCd"] <- "statecode"
}
- values <- gsub(",","%2C",values)
- values <- gsub(";","%3B",values)
+# values <- gsub(",","%2C",values)
+# values <- gsub(";","%3B",values)
values <- gsub("%20","+",values)
- values <- gsub(":","%3A",values)
+ # values <- gsub(":","%3A",values)
if("bBox" %in% names(values)){
values['bBox'] <- gsub(pattern = ";", replacement = ",", x = values['bBox'])
@@ -95,6 +95,7 @@ whatWQPsites <- function(...){
baseURL <- "http://www.waterqualitydata.us/Station/search?"
+ # baseURL <- "http://wqp-test.er.usgs.gov/Station/search?sorted=no&"
urlCall <- paste(baseURL,
urlCall,
"&mimeType=tsv",sep = "")
--
GitLab