Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dataRetrieval
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Water
dataRetrieval
Commits
c59ec8c0
Commit
c59ec8c0
authored
9 years ago
by
Laura A DeCicco
Browse files
Options
Downloads
Plain Diff
Merge pull request #134 from ldecicco-USGS/master
WQP bug fix
parents
ccd734ae
100e44e8
No related branches found
Branches containing commit
Tags
2.1.0
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
DESCRIPTION
+2
-2
2 additions, 2 deletions
DESCRIPTION
R/whatWQPsites.R
+2
-2
2 additions, 2 deletions
R/whatWQPsites.R
tests/testthat/tests_general.R
+4
-3
4 additions, 3 deletions
tests/testthat/tests_general.R
with
8 additions
and
7 deletions
DESCRIPTION
+
2
−
2
View file @
c59ec8c0
Package: dataRetrieval
Type: Package
Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data
Version: 2.3.
0
Date: 2015-0
6-29
Version: 2.3.
1
Date: 2015-0
7-17
Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
email = "rhirsch@usgs.gov"),
person("Laura", "DeCicco", role = c("aut","cre"),
...
...
This diff is collapsed.
Click to expand it.
R/whatWQPsites.R
+
2
−
2
View file @
c59ec8c0
...
...
@@ -104,8 +104,8 @@ whatWQPsites <- function(...){
if
(
!
is.na
(
numToBeReturned
)
&
numToBeReturned
!=
0
){
retval
<-
read.delim
(
textConnection
(
doc
),
header
=
TRUE
,
quote
=
"\""
,
dec
=
"."
,
sep
=
'\t'
,
retval
<-
read.delim
(
textConnection
(
doc
),
header
=
TRUE
,
dec
=
"."
,
sep
=
'\t'
,
quote
=
""
,
colClasses
=
c
(
'character'
),
fill
=
TRUE
)
actualNumReturned
<-
nrow
(
retval
)
...
...
This diff is collapsed.
Click to expand it.
tests/testthat/tests_general.R
+
4
−
3
View file @
c59ec8c0
...
...
@@ -31,14 +31,15 @@ test_that("General NWIS retrievals working", {
test_that
(
"General WQP retrievals working"
,
{
testthat
::
skip_on_cran
()
# testthat::skip_on_cran()
# Bring back when WQP is back
nameToUse
<-
"pH"
pHData
<-
readWQPdata
(
siteid
=
"USGS-04024315"
,
characteristicName
=
nameToUse
)
expect_is
(
pHData
$
ActivityStartDateTime
,
'POSIXct'
)
pHDataExpanded2
<-
readWQPdata
(
bBox
=
c
(
-90.1
,
42.9
,
-89.9
,
43.1
),
characteristicName
=
nameToUse
)
expect_is
(
pHDataExpanded2
$
ActivityStartDateTime
,
'POSIXct'
)
#
pHDataExpanded2 <- readWQPdata(bBox=c(-90.1,42.9,-89.9,43.1),
#
characteristicName=nameToUse)
#
expect_is(pHDataExpanded2$ActivityStartDateTime, 'POSIXct')
startDate
<-
as.Date
(
"2013-01-01"
)
nutrientDaneCounty
<-
readWQPdata
(
countycode
=
"US:55:025"
,
startDate
=
startDate
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment