Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Water
dataRetrieval
Commits
92909d1f
Commit
92909d1f
authored
Apr 18, 2016
by
Laura A DeCicco
Browse files
Merge pull request #208 from ldecicco-USGS/master
Second lubridate fix
parents
588d2c90
7ff8d018
Changes
2
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
92909d1f
Package: dataRetrieval
Package: dataRetrieval
Type: Package
Type: Package
Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data
Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data
Version: 2.5.
4
Version: 2.5.
5
Date: 2016-04-
7
Date: 2016-04-
18
Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
email = "rhirsch@usgs.gov"),
email = "rhirsch@usgs.gov"),
person("Laura", "DeCicco", role = c("aut","cre"),
person("Laura", "DeCicco", role = c("aut","cre"),
...
...
R/importRDB1.r
View file @
92909d1f
...
@@ -199,7 +199,7 @@ importRDB1 <- function(obs_url, asDateTime=TRUE, convertType = TRUE, tz=""){
...
@@ -199,7 +199,7 @@ importRDB1 <- function(obs_url, asDateTime=TRUE, convertType = TRUE, tz=""){
if
(
all
(
c
(
"DATE"
,
"TIME"
,
"TZCD"
)
%in%
header.names
)){
if
(
all
(
c
(
"DATE"
,
"TIME"
,
"TZCD"
)
%in%
header.names
)){
varname
<-
"DATETIME"
varname
<-
"DATETIME"
varval
<-
fast_strptime
(
paste
(
readr.data
[,
"DATE"
],
readr.data
[,
"TIME"
]),
"%Y-%m-%d %H%M%S"
,
tz
=
"UTC"
)
varval
<-
fast_strptime
(
paste
(
readr.data
[,
"DATE"
],
readr.data
[,
"TIME"
]),
"%Y-%m-%d %H%M%S"
,
tz
=
"UTC"
,
lt
=
FALSE
)
readr.data
[,
varname
]
<-
varval
readr.data
[,
varname
]
<-
varval
readr.data
<-
convertTZ
(
readr.data
,
"TZCD"
,
varname
,
tz
,
flip.cols
=
TRUE
)
readr.data
<-
convertTZ
(
readr.data
,
"TZCD"
,
varname
,
tz
,
flip.cols
=
TRUE
)
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment