From e4f914ed03b433bdba9aac6ed68f36a6a2b2190c Mon Sep 17 00:00:00 2001
From: Laura DeCicco <ldecicco@usgs.gov>
Date: Thu, 25 Apr 2013 12:00:58 -0500
Subject: [PATCH] Figured out a better way to import the minimal zoo functions,
and RCurl and XML.
---
DESCRIPTION | 6 +++---
NAMESPACE | 11 +++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index cd515393..c1f6aacd 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -56,11 +56,11 @@ Collate:
'padVariable.r'
'getRDB1Data.r'
Depends:
- R (>= 2.15.0),
+ R (>= 2.15.0)
+Imports:
+ zoo,
XML,
RCurl
-Imports:
- zoo
Suggests:
xtable,
EGRET
diff --git a/NAMESPACE b/NAMESPACE
index f7ecf0e7..43718bdc 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -6,10 +6,10 @@ export(dateFormatCheck)
export(formatCheckDate)
export(formatCheckParameterCd)
export(formatCheckSiteNumber)
-export(getDVData)
export(getDailyDataFromFile)
export(getDataAvailability)
export(getDataFromFile)
+export(getDVData)
export(getMetaData)
export(getMultipleParameterNames)
export(getParameterInfo)
@@ -18,13 +18,13 @@ export(getPreLoadedData)
export(getPreLoadedSampleData)
export(getQWData)
export(getQWDataFromFile)
-export(getRDB1Data)
export(getRawQWData)
+export(getRDB1Data)
export(getSampleData)
export(getSampleDataFromFile)
export(getSiteFileData)
-export(getWQPData)
export(getWaterML1Data)
+export(getWQPData)
export(mergeReport)
export(padVariable)
export(populateConcentrations)
@@ -38,4 +38,7 @@ export(removeDuplicates)
export(retrieveNWISData)
export(retrieveNWISqwData)
export(retrieveUnitNWISData)
-import(zoo)
+importFrom(zoo, zoo)
+importFrom(zoo, rollapply)
+import(RCurl)
+import(XML)
--
GitLab