From 766a971349663fcfb8fb3dc1defeab70abcab2c4 Mon Sep 17 00:00:00 2001
From: unknown <ldecicco@usgs.gov>
Date: Tue, 21 Oct 2014 16:47:20 -0500
Subject: [PATCH] Begin reshuffling process.
---
DESCRIPTION | 8 +++-----
NAMESPACE | 32 ++++----------------------------
2 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 9d98bd25..366ef81c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: dataRetrieval
Type: Package
Title: Retrieval functions for USGS and EPA hydrologic and water quality data
-Version: 1.4.1.9000
+Version: 1.5.0.9000
Date: 2014-10-13
Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
email = "rhirsch@usgs.gov"),
@@ -18,11 +18,11 @@ Copyright: This software is in the public domain because it contains materials
Depends:
R (>= 3.0)
Imports:
- zoo,
XML,
RCurl,
reshape2,
- lubridate
+ lubridate,
+ dplyr
Suggests:
xtable,
EGRET,
@@ -30,6 +30,4 @@ Suggests:
testthat
LazyLoad: yes
LazyData: yes
-VignetteBuilder: knitr
-BuildVignettes: true
Additional_repositories: http://usgs-r.github.com
diff --git a/NAMESPACE b/NAMESPACE
index 9ae99572..2e46c6ae 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,50 +1,26 @@
# Generated by roxygen2 (4.0.2): do not edit by hand
-export(checkStartEndDate)
-export(compressData)
export(constructNWISURL)
-export(dataOverview)
-export(dateFormatCheck)
-export(formatCheckDate)
-export(formatCheckParameterCd)
-export(getDailyDataFromFile)
-export(getDataFromFile)
-export(getNWISDaily)
+export(constructWQPURL)
export(getNWISData)
export(getNWISDataAvailability)
-export(getNWISInfo)
export(getNWISPcodeInfo)
-export(getNWISSample)
export(getNWISSiteInfo)
export(getNWISSites)
export(getNWISdvData)
export(getNWISqwData)
export(getNWISunitData)
export(getRDB1Data)
-export(getUserDaily)
-export(getUserInfo)
-export(getUserSample)
export(getWQPData)
-export(getWQPInfo)
-export(getWQPSample)
export(getWQPSites)
export(getWQPqwData)
export(getWaterML1Data)
-export(mergeReport)
+export(getWaterML2Data)
export(padVariable)
-export(populateConcentrations)
-export(populateDaily)
-export(populateDateColumns)
-export(populateParameterINFO)
-export(populateSampleColumns)
-export(populateSiteINFO)
-export(processQWData)
-export(readWQPData)
-export(removeDuplicates)
+export(parseWQPData)
export(renameColumns)
import(RCurl)
import(XML)
import(reshape2)
-import(zoo)
-importFrom(lubridate,decimal_date)
+importFrom(dplyr,rbind_all)
importFrom(lubridate,parse_date_time)
--
GitLab