diff --git a/R/getNWISData.r b/R/getNWISData.r index bd1cf61f1f1e26f2a635b7787f39f64f9959e609..5905e359a5b376e55963afa3445c66d468b2e770 100644 --- a/R/getNWISData.r +++ b/R/getNWISData.r @@ -27,6 +27,5 @@ getNWISData <- function(service="dv", ...){ } retval <- getRDB1Data(urlCall) - return(retval) } diff --git a/R/getRDB1Data.r b/R/getRDB1Data.r index c6e8ce718904895ef6a171db84ca333f23c565e5..ee553aadb0d38dd8bbaecc4c98fc35e9dca54d68 100644 --- a/R/getRDB1Data.r +++ b/R/getRDB1Data.r @@ -22,7 +22,6 @@ #' unitDataURL <- constructNWISURL(siteNumber,property, #' as.character(Sys.Date()),as.character(Sys.Date()),'uv',format='tsv') #' unitData <- getRDB1Data(unitDataURL, asDateTime=TRUE) -#' mulitSites <- getRDB1Data("http://waterservices.usgs.gov/nwis/dv/?format=rdb&stateCd=OH¶meterCd=00010") getRDB1Data <- function(obs_url,asDateTime=FALSE){ retval = tryCatch({ @@ -79,10 +78,10 @@ getRDB1Data <- function(obs_url,asDateTime=FALSE){ mostCommonTZ <- names(sort(summary(as.factor(timeZone)),decreasing = TRUE)[1]) - data[,regexpr('d$', dataType) > 0] <- as.POSIXct(data[,regexpr('d$', dataType) > 0], "%Y-%m-%d %H:%M", tz = mostCommonTZ) + data[,grep('d$', dataType)] <- as.POSIXct(data[,grep('d$', dataType)], "%Y-%m-%d %H:%M", tz = mostCommonTZ) additionalTZs <- names(sort(summary(as.factor(timeZone)),decreasing = TRUE)[-1]) for(i in additionalTZs){ - data[timeZone == i,regexpr('d$', dataType) > 0] <- as.POSIXct(data[,regexpr('d$', dataType) > 0], "%Y-%m-%d %H:%M", tz = i) + data[timeZone == i,grep('d$', dataType)] <- as.POSIXct(data[,grep('d$', dataType)], "%Y-%m-%d %H:%M", tz = i) } } @@ -90,8 +89,6 @@ getRDB1Data <- function(obs_url,asDateTime=FALSE){ for (i in grep('d$', dataType)){ data[,i] <- as.Date(data[,i]) } - - } }