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
f188d3a5
Commit
f188d3a5
authored
10 years ago
by
Laura A DeCicco
Browse files
Options
Downloads
Patches
Plain Diff
Changing siteNumber to siteNumbers when appropriate.
parent
b540dd2a
No related branches found
No related tags found
1 merge request
!53
Help file updates.
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
R/readNWISunit.r
+10
-10
10 additions, 10 deletions
R/readNWISunit.r
man/readNWISmeas.Rd
+4
-4
4 additions, 4 deletions
man/readNWISmeas.Rd
man/readNWISpeak.Rd
+4
-4
4 additions, 4 deletions
man/readNWISpeak.Rd
with
18 additions
and
18 deletions
R/readNWISunit.r
+
10
−
10
View file @
f188d3a5
...
...
@@ -69,7 +69,7 @@ readNWISuv <- function (siteNumbers,parameterCd,startDate="",endDate="", tz=""){
#' Reads peak flow from NWISweb.
#' Data is retrieved from \url{http://waterdata.usgs.gov/nwis}.
#'
#' @param siteNumber character USGS site number. This is usually an 8 digit number
#' @param siteNumber
s
character USGS site number
(or multiple sites)
. This is usually an 8 digit number
.
#' @param startDate character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
#' retrieval for the earliest possible record.
#' @param endDate character ending date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
...
...
@@ -102,9 +102,9 @@ readNWISuv <- function (siteNumbers,parameterCd,startDate="",endDate="", tz=""){
#' }
#' @export
#' @examples
#' siteNumber <- '01594440'
#' data <- readNWISpeak(siteNumber)
readNWISpeak
<-
function
(
siteNumber
,
startDate
=
""
,
endDate
=
""
){
#' siteNumber
s
<-
c(
'01594440'
,'040851325')
#' data <- readNWISpeak(siteNumber
s
)
readNWISpeak
<-
function
(
siteNumber
s
,
startDate
=
""
,
endDate
=
""
){
# Doesn't seem to be a peak xml service
url
<-
constructNWISURL
(
siteNumber
,
NA
,
startDate
,
endDate
,
"peak"
)
...
...
@@ -186,7 +186,7 @@ readNWISrating <- function (siteNumber,type="base"){
#'Reads surface-water measurement data from NWISweb. Data is retrieved from \url{http://waterdata.usgs.gov/nwis}.
#'See \url{http://waterdata.usgs.gov/usa/nwis/sw} for details about surface water.
#'
#' @param siteNumber character USGS site number. This is usually an 8 digit number
#' @param siteNumber
s
character USGS site number
(or multiple sites)
. This is usually an 8 digit number
#' @param startDate character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
#' retrieval for the earliest possible record.
#' @param endDate character ending date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
...
...
@@ -217,12 +217,12 @@ readNWISrating <- function (siteNumber,type="base"){
#' }
#' @export
#' @examples
#' siteNumber <- '01594440'
#' data <- readNWISmeas(siteNumber)
readNWISmeas
<-
function
(
siteNumber
,
startDate
=
""
,
endDate
=
""
,
tz
=
""
){
#' siteNumber
s
<-
c(
'01594440'
,'040851325')
#' data <- readNWISmeas(siteNumber
s
)
readNWISmeas
<-
function
(
siteNumber
s
,
startDate
=
""
,
endDate
=
""
,
tz
=
""
){
# Doesn't seem to be a WaterML1 format option
url
<-
constructNWISURL
(
siteNumber
,
NA
,
startDate
,
endDate
,
"meas"
)
url
<-
constructNWISURL
(
siteNumber
s
,
NA
,
startDate
,
endDate
,
"meas"
)
data
<-
importRDB1
(
url
,
asDateTime
=
FALSE
,
tz
=
tz
)
...
...
@@ -230,7 +230,7 @@ readNWISmeas <- function (siteNumber,startDate="",endDate="", tz=""){
data
$
diff_from_rating_pc
<-
as.numeric
(
data
$
diff_from_rating_pc
)
}
siteInfo
<-
readNWISsite
(
siteNumber
)
siteInfo
<-
readNWISsite
(
siteNumber
s
)
attr
(
data
,
"siteInfo"
)
<-
siteInfo
attr
(
data
,
"variableInfo"
)
<-
NULL
...
...
This diff is collapsed.
Click to expand it.
man/readNWISmeas.Rd
+
4
−
4
View file @
f188d3a5
...
...
@@ -3,10 +3,10 @@
\alias{readNWISmeas}
\title{Reads surface-water measurement data from NWISweb.}
\usage{
readNWISmeas(siteNumber, startDate = "", endDate = "", tz = "")
readNWISmeas(siteNumber
s
, startDate = "", endDate = "", tz = "")
}
\arguments{
\item{siteNumber}{character USGS site number. This is usually an 8 digit number}
\item{siteNumber
s
}{character USGS site number
(or multiple sites)
. This is usually an 8 digit number}
\item{startDate}{character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
retrieval for the earliest possible record.}
...
...
@@ -46,7 +46,7 @@ Reads surface-water measurement data from NWISweb. Data is retrieved from \url{h
See \url{http://waterdata.usgs.gov/usa/nwis/sw} for details about surface water.
}
\examples{
siteNumber <- '01594440'
data <- readNWISmeas(siteNumber)
siteNumber
s
<-
c(
'01594440'
,'040851325')
data <- readNWISmeas(siteNumber
s
)
}
This diff is collapsed.
Click to expand it.
man/readNWISpeak.Rd
+
4
−
4
View file @
f188d3a5
...
...
@@ -3,10 +3,10 @@
\alias{readNWISpeak}
\title{Reads peak flow data from NWISweb.}
\usage{
readNWISpeak(siteNumber, startDate = "", endDate = "")
readNWISpeak(siteNumber
s
, startDate = "", endDate = "")
}
\arguments{
\item{siteNumber}{character USGS site number. This is usually an 8 digit number}
\item{siteNumber
s
}{character USGS site number
(or multiple sites)
. This is usually an 8 digit number
.
}
\item{startDate}{character starting date for data retrieval in the form YYYY-MM-DD. Default is "" which indicates
retrieval for the earliest possible record.}
...
...
@@ -47,7 +47,7 @@ Reads peak flow from NWISweb.
Data is retrieved from \url{http://waterdata.usgs.gov/nwis}.
}
\examples{
siteNumber <- '01594440'
data <- readNWISpeak(siteNumber)
siteNumber
s
<-
c(
'01594440'
,'040851325')
data <- readNWISpeak(siteNumber
s
)
}
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