From 9b3239966e697f63bc66bd498ea6200816cb6787 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Wed, 12 Nov 2014 11:06:36 -0600
Subject: [PATCH] Switched format.
---
R/readNWISdata.r | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/R/readNWISdata.r b/R/readNWISdata.r
index 8f541d79..1de4bcf3 100644
--- a/R/readNWISdata.r
+++ b/R/readNWISdata.r
@@ -20,13 +20,21 @@ readNWISdata <- function(service="dv", ...){
urlCall <- paste(paste(names(values),values,sep="="),collapse="&")
+ if(service %in% c("dv","iv","gwlevels")){
+ format <- "waterml"
+ } else {
+ format <- "rdb1,1"
+ }
- baseURL <- paste0("http://waterservices.usgs.gov/nwis/",service,"/?format=rdb&")
+ baseURL <- paste0("http://waterservices.usgs.gov/nwis/",service,"/?format=",format,"&")
urlCall <- paste0(baseURL,urlCall)
if(service=="qwdata"){
urlCall <- paste0(urlCall,"&siteOutput=expanded")
+ retval <- importRDB1(urlCall)
+ } else {
+ retval <- importWaterML1(urlCall)
}
- retval <- importRDB1(urlCall)
+
return(retval)
}
--
GitLab