diff --git a/R/getSampleData.r b/R/getSampleData.r index ae766ec1c72c9252099555d82295da7eb06680f4..b9182da2882cffb9e0a4e69d43587638c7d8f69b 100644 --- a/R/getSampleData.r +++ b/R/getSampleData.r @@ -21,8 +21,11 @@ #' Sample_All <- getSampleData('05114000','00915;00931', '1985-01-01', '1985-03-31') #' Sample_Select <- getSampleData('05114000','00915;00931', '', '') getSampleData <- function(siteNumber,ParameterCd,StartDate,EndDate,interactive=TRUE){ - data <- getQWData(siteNumber,ParameterCd,StartDate,EndDate,interactive=interactive) - compressedData <- compressData(data, interactive=interactive) + rawSample <- retrieveNWISqwData(siteNumber,ParameterCd,StartDate,EndDate) + rawSample$dateTime <- strptime(rawSample$dateTime,"%Y-%m-%d %H:%M:%S") + rawSample$dateTime <- as.Date(rawSample$dateTime) + rawSample$site <- NULL + compressedData <- compressData(rawSample, interactive=interactive) Sample <- populateSampleColumns(compressedData) return(Sample) }