Fixes #599

DESCRIPTION

 Package: dataRetrieval
 Type: Package
 Title: Retrieval Functions for USGS and EPA Hydrologic and Water Quality Data
-Version: 2.7.10.1
+Version: 2.7.11
 Authors@R: c(
     person("Laura", "DeCicco", role = c("aut","cre"),
             email = "ldecicco@usgs.gov",

NEWS

@@ -2,6 +2,8 @@ dataRetrieval 2.7.11
 ==================
 * Updated some documentation to improve examples.
 * Changed the check for internet to better account for proxies.
+* Fixed bug due to new behavior in NWIS parameter code service.
+* Updated documentation for readWQPdata and readWQPsummary
 
 dataRetrieval 2.7.10
 ==================

R/importWQP.R

@@ -157,7 +157,7 @@ importWQP <- function(obs_url, zip=TRUE, tz="UTC",
     }
   }
 
-  retval <- suppressWarnings(readr::read_delim(doc, 
+  retval <- suppressWarnings(readr::read_delim(doc,
                        col_types = readr::cols(`ActivityStartTime/Time` = readr::col_character(),
                                         `ActivityEndTime/Time` = readr::col_character(),
                                         USGSPCode = readr::col_character(),
@@ -191,9 +191,18 @@ importWQP <- function(obs_url, zip=TRUE, tz="UTC",
                                         `ResultDepthHeightMeasure/MeasureUnitCode` = readr::col_character(),
                                         `DetectionQuantitationLimitMeasure/MeasureUnitCode` = readr::col_character(),
                                         `HUCEightDigitCode` = readr::col_character(), 
-                                        `ActivityEndTime/TimeZoneCode` = readr::col_character()),
+                                        `ActivityEndTime/TimeZoneCode` = readr::col_character(),
+                                        `ResultAnalyticalMethod/MethodIdentifier` = readr::col_character(), 
+                                        `ResultAnalyticalMethod/MethodIdentifierContext` = readr::col_character(),
+                                        ResultStatusIdentifier = readr::col_character(),
+                                        `SampleCollectionMethod/MethodIdentifier` = readr::col_character(),
+                                        `SampleCollectionMethod/MethodIdentifierContext` = readr::col_character(),
+                                        MonitoringLocationIdentifier = readr::col_character(),
+                                        ProjectIdentifier = readr::col_character(),
+                                        ActivityIdentifier = readr::col_character()),
                        quote = ifelse(csv,'\"',""),
-                       delim = ifelse(csv,",","\t")))
+                       delim = ifelse(csv,",","\t"), 
+                       guess_max = totalPossible))
     
   if(!file.exists(obs_url)){
     actualNumReturned <- nrow(retval)

R/readNWISqw.r

@@ -83,8 +83,7 @@ readNWISqw <- function (siteNumbers,parameterCd,startDate="",endDate="",
                         expanded=TRUE,reshape=FALSE,tz="UTC"){  
   
   .Deprecated(new = "readWQPqw", package = "dataRetrieval", 
-              msg = "NWIS qw web services are being retired. Please see the vignette 
-'Changes to NWIS QW services' for more information.")
+              msg = "NWIS qw web services are being retired. Please see vignette('qwdata_changes', package = 'dataRetrieval') for more information.")
   
   pgrp <- c("INF", "PHY", "INM", "INN", "NUT", "MBI", "BIO", "IMM", "IMN", "TOX",
             "OPE", "OPC", "OOT", "RAD", "XXX", "SED", "POP",

R/whatWQPsites.R

@@ -156,9 +156,10 @@ whatWQPsites <- function(...){
 #' 
 #' lake_sites <- readWQPsummary(siteType = "Lake, Reservoir, Impoundment",
 #'                          countycode = "US:55:025")
-#'                            
-#' # Very slow:
-#' #state1 <- readWQPsummary(statecode="NJ")
+#'                     
+#' state1 <- readWQPsummary(statecode="NJ",
+#'                          summaryYears = 5,
+#'                          siteType = "Stream")
 #' }
 readWQPsummary <- function(...){
   

code.json

@@ -3,7 +3,7 @@
     "name": "dataRetrieval",
     "organization": "U.S. Geological Survey",
     "description": "This R package is designed to obtain USGS or EPA water quality sample data, streamflow data, and metadata directly from web services",
-    "version": "2.7.9",
+    "version": "2.7.11",
     "status": "Production",
 
     "permissions": {
@@ -11,13 +11,13 @@
       "licenses": [
         {
           "name": "Public Domain, CC0-1.0",
-          "URL": "https://code.usgs.gov/WMA-Data-Science/dataRetrieval/blob/master/LICENSE.note"
+          "URL": "https://code.usgs.gov/water/dataRetrieval/blob/master/LICENSE.note"
         }
       ]
     },
 
     "homepageURL": "https://code.usgs.gov/water/dataRetrieval",
-    "downloadURL": "https://code.usgs.gov/water/dataRetrieval/-/archive/v2.7.9/dataRetrieval-v2.7.9.zip",
+    "downloadURL": "https://code.usgs.gov/water/dataRetrieval/-/archive/v2.7.11/dataRetrieval-v2.7.11.zip",
     "disclaimerURL": "https://code.usgs.gov/water/dataRetrieval/blob/master/DISCLAIMER.md",
     "repositoryURL": "https://code.usgs.gov/water/dataRetrieval.git",
     "vcs": "git",
@@ -41,7 +41,7 @@
     },
 
     "date": {
-      "metadataLastUpdated": "2021-07-29"
+      "metadataLastUpdated": "2022-02-11"
     }
   }
 ]

man/readWQPsummary.Rd

@@ -68,9 +68,10 @@ dane_county_data <- readWQPsummary(countycode = "US:55:025",
 
 lake_sites <- readWQPsummary(siteType = "Lake, Reservoir, Impoundment",
                          countycode = "US:55:025")
-                           
-# Very slow:
-#state1 <- readWQPsummary(statecode="NJ")
+                    
+state1 <- readWQPsummary(statecode="NJ",
+                         summaryYears = 5,
+                         siteType = "Stream")
 }
 \dontshow{\}) # examplesIf}
 }