From 52119face0154e6073165ada3ddd3e98d3d04836 Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Fri, 26 Jun 2015 10:55:43 -0500
Subject: [PATCH] Add sorted=no.
---
R/constructNWISURL.r | 2 +-
R/readWQPdata.R | 3 +--
R/whatWQPsites.R | 8 ++------
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r
index d8ce58a9..c5326c8d 100644
--- a/R/constructNWISURL.r
+++ b/R/constructNWISURL.r
@@ -267,7 +267,7 @@ constructWQPURL <- function(siteNumber,parameterCd,startDate,endDate){
url <- paste0(url, "&startDateHi=",endDate)
}
- url <- paste0(url,"&countrycode=US&mimeType=tsv")
+ url <- paste0(url,"&sorted=no&mimeType=tsv")
return(url)
}
diff --git a/R/readWQPdata.R b/R/readWQPdata.R
index a54b8ecf..ba93904b 100644
--- a/R/readWQPdata.R
+++ b/R/readWQPdata.R
@@ -147,10 +147,9 @@ readWQPdata <- function(...){
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")
+ "&sorted=no&mimeType=tsv")
retval <- importWQP(urlCall,FALSE, tz=tz)
diff --git a/R/whatWQPsites.R b/R/whatWQPsites.R
index a425df3e..7c7fbd07 100644
--- a/R/whatWQPsites.R
+++ b/R/whatWQPsites.R
@@ -79,11 +79,8 @@ whatWQPsites <- function(...){
}
names(values)[names(values) == "stateCd"] <- "statecode"
}
-
-# values <- gsub(",","%2C",values)
-# values <- gsub(";","%3B",values)
+
values <- gsub("%20","+",values)
- # values <- gsub(":","%3A",values)
if("bBox" %in% names(values)){
values['bBox'] <- gsub(pattern = ";", replacement = ",", x = values['bBox'])
@@ -95,10 +92,9 @@ 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 = "")
+ "&mimeType=tsv&sorted=no",sep = "")
doc <- getWebServiceData(urlCall)
headerInfo <- attr(doc, "headerInfo")
--
GitLab