Commit 9b63afb0 authored by Laura A DeCicco's avatar Laura A DeCicco Committed by GitHub
Browse files

Merge pull request #293 from ldecicco-USGS/master

>120 fix
parents 9377d0c4 df177ebe
...@@ -3,7 +3,9 @@ vignettes/figure ...@@ -3,7 +3,9 @@ vignettes/figure
appveyor.yml appveyor.yml
.travis.yml .travis.yml
.gitignore .gitignore
dataRetrieval.Rproj
examplePhosQuery.R examplePhosQuery.R
README.md
dataRetrieval-concordance.tex dataRetrieval-concordance.tex
^.*\.Rproj$ ^.*\.Rproj$
^\.Rproj\.user$ ^\.Rproj\.user$
......
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.6.3 Version: 2.6.4
Date: 2016-12-06 Date: 2016-12-12
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"),
...@@ -17,15 +17,13 @@ Authors@R: c( person("Robert", "Hirsch", role = c("aut"), ...@@ -17,15 +17,13 @@ Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
email = "wwatkins@usgs.gov")) email = "wwatkins@usgs.gov"))
Description: Collection of functions to help retrieve U.S. Geological Survey Description: Collection of functions to help retrieve U.S. Geological Survey
(USGS) and U.S. Environmental Protection Agency (EPA) water quality and (USGS) and U.S. Environmental Protection Agency (EPA) water quality and
hydrology data from web services. USGS web services are discovered from the hydrology data from web services. USGS web services are discovered from
National Water Information System (NWIS) tools. Both EPA and USGS water National Water Information System (NWIS) tools. Both EPA and USGS water
quality data are obtained from the Water Quality Portal. quality data are obtained from the Water Quality Portal <https://www.waterqualitydata.us/>.
License: CC0 License: CC0
Copyright: This software is in the public domain because it contains materials Copyright: This software is in the public domain because it contains materials
that originally came from the United States Geological Survey, an agency of that originally came from the United States Geological Survey, an agency of
the United States Department of Interior. For more information, see the the United States Department of Interior.
official USGS copyright policy at
https://www2.usgs.gov/visual-id/credit_usgs.html#copyright
Depends: Depends:
R (>= 3.0) R (>= 3.0)
Imports: Imports:
...@@ -45,5 +43,5 @@ Suggests: ...@@ -45,5 +43,5 @@ Suggests:
VignetteBuilder: knitr VignetteBuilder: knitr
BuildVignettes: true BuildVignettes: true
BugReports: https://github.com/USGS-R/dataRetrieval/issues BugReports: https://github.com/USGS-R/dataRetrieval/issues
URL: https://github.com/USGS-R/dataRetrieval, http://pubs.usgs.gov/tm/04/a10/ URL: https://pubs.er.usgs.gov/publication/tm4A10
RoxygenNote: 5.0.1 RoxygenNote: 5.0.1
dataRetrieval 2.6.3
==========
* All USGS web services are being flipped from http to https. This version of dataRetrieval will attempt to access https, if that fails, will attempt http.
dataRetrieval 2.5.12 dataRetrieval 2.5.12
========== ==========
* Response to readr 1.0.0 updates * Response to readr 1.0.0 updates
......
...@@ -41,7 +41,7 @@ access = match.arg(access, c('public','internal','cooperator','USGS')) ...@@ -41,7 +41,7 @@ access = match.arg(access, c('public','internal','cooperator','USGS'))
} }
pkg.env$site = "https://waterservices.usgs.gov/nwis/site/" pkg.env$site = "https://waterservices.usgs.gov/nwis/site/"
pkg.env$iv = "https://waterservices.usgs.gov/nwis/iv/" pkg.env$iv = "https://nwis.waterservices.usgs.gov/nwis/iv/"
pkg.env$dv = "https://waterservices.usgs.gov/nwis/dv/" pkg.env$dv = "https://waterservices.usgs.gov/nwis/dv/"
pkg.env$gwlevels = "https://waterservices.usgs.gov/nwis/gwlevels/" pkg.env$gwlevels = "https://waterservices.usgs.gov/nwis/gwlevels/"
pkg.env$measurements = "https://waterdata.usgs.gov/nwis/measurements/" pkg.env$measurements = "https://waterdata.usgs.gov/nwis/measurements/"
......
...@@ -42,14 +42,14 @@ Follow `@USGS-R` on Twitter for updates on all USGS R packages: ...@@ -42,14 +42,14 @@ Follow `@USGS-R` on Twitter for updates on all USGS R packages:
|Version|Monthly Downloads|Total Downloads| |Version|Monthly Downloads|Total Downloads|
|----------|------------|------------| |----------|------------|------------|
|[![CRAN version](http://www.r-pkg.org/badges/version/dataRetrieval)](https://cran.r-project.org/package=dataRetrieval)|[![](http://cranlogs.r-pkg.org/badges/dataRetrieval)](https://cran.r-project.org/package=dataRetrieval)|[![](http://cranlogs.r-pkg.org/badges/grand-total/dataRetrieval)](https://cran.r-project.org/package=dataRetrieval)| |[![CRAN version](http://www.r-pkg.org/badges/version/dataRetrieval)](https://CRAN.R-project.org/package=dataRetrieval)|[![](http://cranlogs.r-pkg.org/badges/dataRetrieval)](https://CRAN.R-project.org/package=dataRetrieval)|[![](http://cranlogs.r-pkg.org/badges/grand-total/dataRetrieval)](https://CRAN.R-project.org/package=dataRetrieval)|
### Research software impact: ### Research software impact:
[![Research software impact](http://depsy.org/api/package/cran/dataRetrieval/badge.svg)](http://depsy.org/package/r/dataRetrieval) [![Research software impact](http://depsy.org/api/package/cran/dataRetrieval/badge.svg)](http://depsy.org/package/r/dataRetrieval)
##Disclaimer ##Disclaimer
This software is in the public domain because it contains materials that originally came from the U.S. Geological Survey, an agency of the United States Department of Interior. For more information, see the [official USGS copyright policy](https://www.usgs.gov/visual-id/credit_usgs.html#copyright/ "official USGS copyright policy") This software is in the public domain because it contains materials that originally came from the U.S. Geological Survey, an agency of the United States Department of Interior. For more information, see the [official USGS copyright policy](https://www2.usgs.gov/visual-id/credit_usgs.html#copyright)
Although this software program has been used by the U.S. Geological Survey (USGS), no warranty, expressed or implied, is made by the USGS or the U.S. Government as to the accuracy and functioning of the program and related program material nor shall the fact of distribution constitute any such warranty, and no responsibility is assumed by the USGS in connection therewith. Although this software program has been used by the U.S. Geological Survey (USGS), no warranty, expressed or implied, is made by the USGS or the U.S. Government as to the accuracy and functioning of the program and related program material nor shall the fact of distribution constitute any such warranty, and no responsibility is assumed by the USGS in connection therewith.
......
...@@ -10,6 +10,13 @@ test_that("Unit value data returns correct types", { ...@@ -10,6 +10,13 @@ test_that("Unit value data returns correct types", {
rawData <- readNWISuv(siteNumber,parameterCd,startDate,endDate) rawData <- readNWISuv(siteNumber,parameterCd,startDate,endDate)
rawData <- renameNWISColumns(rawData) rawData <- renameNWISColumns(rawData)
spreadOver120 <- readNWISuv(siteNumber,parameterCd,
as.Date(Sys.Date()-200),
Sys.Date())
expect_true(min(spreadOver120$dateTime) < as.POSIXct(Sys.Date(), tz="UTC"))
timeZoneChange <- readNWISuv(c('04024430','04024000'),parameterCd, timeZoneChange <- readNWISuv(c('04024430','04024000'),parameterCd,
"2013-11-03","2013-11-03", "2013-11-03","2013-11-03",
tz="America/Chicago") tz="America/Chicago")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment