From 93bb07a4e6bb649ba8920bed097e8429567128fc Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Tue, 3 Feb 2015 11:12:42 -0600
Subject: [PATCH] Fixed a re-direct issue with readNWISdata.
---
R/readNWISdata.r | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/R/readNWISdata.r b/R/readNWISdata.r
index 7b27bcb1..8bcd4a15 100644
--- a/R/readNWISdata.r
+++ b/R/readNWISdata.r
@@ -63,22 +63,18 @@ readNWISdata <- function(service="dv", ...){
urlCall <- paste(paste(names(values),values,sep="="),collapse="&")
- if(service %in% c("dv","iv","gwlevels")){
- format <- "waterml"
+ format <- "waterml,1.1"
+
+ if(service == "iv"){
+ baseURL <- "http://nwis.waterservices.usgs.gov/nwis/"
} else {
- format <- "rdb1,1"
+ baseURL <- "http://waterservices.usgs.gov/nwis/"
}
- baseURL <- paste0("http://waterservices.usgs.gov/nwis/",service,"/?format=",format,"&")
+ baseURL <- paste0(baseURL,service,"/?format=",format,"&")
urlCall <- paste0(baseURL,urlCall)
- if(service=="qwdata"){
- urlCall <- paste0(urlCall,"&siteOutput=expanded")
- retval <- importRDB1(urlCall)
- } else {
-
- retval <- importWaterML1(urlCall, asDateTime = ("iv" == service))
- }
+ retval <- importWaterML1(urlCall, asDateTime = ("iv" == service))
return(retval)
--
GitLab