Merge pull request #293 from ldecicco-USGS/master

>120 fix

.Rbuildignore

@@ -3,7 +3,9 @@ vignettes/figure
 appveyor.yml
 .travis.yml
 .gitignore
+dataRetrieval.Rproj
 examplePhosQuery.R
+README.md
 dataRetrieval-concordance.tex
 ^.*\.Rproj$
 ^\.Rproj\.user$

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: dataRetrieval
 Type: Package
 Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data
-Version: 2.6.3
-Date: 2016-12-06
+Version: 2.6.4
+Date: 2016-12-12
 Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
     email = "[email protected]"),
     person("Laura", "DeCicco", role = c("aut","cre"),
@@ -17,15 +17,13 @@ Authors@R: c( person("Robert", "Hirsch", role = c("aut"),
     email = "[email protected]"))
 Description: Collection of functions to help retrieve U.S. Geological Survey
     (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
-    quality data are obtained from the Water Quality Portal.
+    quality data are obtained from the Water Quality Portal <https://www.waterqualitydata.us/>.
 License: CC0
 Copyright: This software is in the public domain because it contains materials
     that originally came from the United States Geological Survey, an agency of
-    the United States Department of Interior. For more information, see the
-    official USGS copyright policy at
-    https://www2.usgs.gov/visual-id/credit_usgs.html#copyright
+    the United States Department of Interior. 
 Depends:
     R (>= 3.0)
 Imports:
@@ -45,5 +43,5 @@ Suggests:
 VignetteBuilder: knitr
 BuildVignettes: true
 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

NEWS

@@ -1,3 +1,7 @@
+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
 ==========
 * Response to readr 1.0.0 updates

R/setAccess.R

@@ -41,7 +41,7 @@ access = match.arg(access, c('public','internal','cooperator','USGS'))
   }
 
   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$gwlevels = "https://waterservices.usgs.gov/nwis/gwlevels/"
   pkg.env$measurements = "https://waterdata.usgs.gov/nwis/measurements/"

README.md

@@ -42,14 +42,14 @@ Follow `@USGS-R` on Twitter for updates on all USGS R packages:
 
 |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](http://depsy.org/api/package/cran/dataRetrieval/badge.svg)](http://depsy.org/package/r/dataRetrieval)
 
 
 ##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.
 

tests/testthat/tests_userFriendly_fxns.R

@@ -10,6 +10,13 @@ test_that("Unit value data returns correct types", {
 
   rawData <- readNWISuv(siteNumber,parameterCd,startDate,endDate)
   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,
                                "2013-11-03","2013-11-03", 
                                tz="America/Chicago")