From 4ae2b704ab27d9604d792e766148776256082ba9 Mon Sep 17 00:00:00 2001
From: Jordan S Read <jread@usgs.gov>
Date: Tue, 10 Nov 2015 09:02:36 -0600
Subject: [PATCH] adding uv and iv
---
R/constructNWISURL.r | 6 +-----
R/setAccess.R | 3 ++-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r
index e0c288c4..30df1d4b 100644
--- a/R/constructNWISURL.r
+++ b/R/constructNWISURL.r
@@ -149,9 +149,6 @@ constructNWISURL <- function(siteNumber,parameterCd="00060",startDate="",endDate
if ("uv"==service) {
service <- "iv"
- baseURL <- paste0("http://nwis.waterservices.usgs.gov/nwis/",service)
- } else {
- baseURL <- paste0("http://waterservices.usgs.gov/nwis/",service)
}
format <- match.arg(format, c("xml","tsv","wml1","wml2","rdb"))
@@ -174,8 +171,7 @@ constructNWISURL <- function(siteNumber,parameterCd="00060",startDate="",endDate
}
)
-
- url <- paste0(baseURL,"/?site=",siteNumber, "&format=", formatURL)
+ url <- drURL(service, paste0("&site=",siteNumber, "&format=", formatURL))
if("gwlevels"!= service){
url <- paste0(url, "&ParameterCd=",parameterCd)
diff --git a/R/setAccess.R b/R/setAccess.R
index 7b3762b2..868e4fcd 100644
--- a/R/setAccess.R
+++ b/R/setAccess.R
@@ -29,7 +29,8 @@ setAccess = function(access="public"){
}
pkg.env$waterservices = paste0("http://waterservices.usgs.gov/nwis/site/", access.param)
-
+ pkg.env$iv = paste0("http://nwis.waterservices.usgs.gov/nwis/iv/", access.param)
+ pkg.env$dv = paste0("http://waterservices.usgs.gov/nwis/dv/", access.param)
}
--
GitLab