diff --git a/R/constructNWISURL.r b/R/constructNWISURL.r index e0c288c4e1f9c4431b83eb1390e88e98fc78f34f..30df1d4bcefbe2aec487bfa641bafb3ef2ae3d38 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 7b3762b2e1bc4734d285805d421a63c0891574d6..868e4fcd3da5433efd2ab0e0290f180a11f0d2d1 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) }