Last updates before CRAN submission

Author: ldecicco-USGS

NAMESPACE

@@ -49,7 +49,6 @@ export(read_waterdata)
 export(read_waterdata_daily)
 export(read_waterdata_latest_continuous)
 export(read_waterdata_monitoring_location)
-export(read_waterdata_parameter_code)
 export(read_waterdata_samples)
 export(read_waterdata_ts_meta)
 export(renameNWISColumns)

R/read_waterdata_latest_continuous.R

@@ -84,28 +84,9 @@ read_waterdata_latest_continuous <- function(monitoring_location_id = NA_charact
   output_id <- "latest_continuous_id"
 
   args <- mget(names(formals()))
-  args[["service"]] <-  service
-  
-  args <- switch_arg_id(args, 
-                        id_name = output_id, 
-                        service = service)
-  
-  args[["properties"]] <- switch_properties_id(properties, 
-                                               id_name = output_id, 
-                                               service = service)
-  
-  args[["convertType"]] <- NULL
-  
-  dv_req <- do.call(construct_api_requests, args)
-
-  return_list <- walk_pages(dv_req, max_results)
-  
-  return_list <- deal_with_empty(return_list, properties, service)
-    
-  if(convertType) return_list <- cleanup_cols(return_list,
-                                              service = service)
-  
-  return_list <- rejigger_cols(return_list, properties, output_id)
+  return_list <- get_ogc_data(args,
+                              output_id, 
+                              service)
 
   return_list <- return_list[order(return_list$time, return_list$monitoring_location_id), ]
 

R/read_waterdata_parameter_code.R

@@ -31,7 +31,10 @@ The `dataRetrieval` package was created to simplify the process of loading hydro
 
 # Introduction
 
-:warning: USGS discrete water-quality data availability and format are changing. Beginning March 11, 2024 USGS data obtained from legacy services will not include new USGS data or recent updates to existing data. To view the status of changes in data availability and code functionality, visit: <https://doi-usgs.github.io/dataRetrieval/articles/Status.html>
+:warning: NWIS web services (readNWIS functions) will be replaced over time by USGS Water Data APIs (read_waterdata_). Read more about it here:
+<https://doi-usgs.github.io/dataRetrieval/articles/read_waterdata_functions.html>
+
+:warning: USGS discrete water-quality data availability and format are changing. To view the status of changes in data availability and code functionality, visit: <https://doi-usgs.github.io/dataRetrieval/articles/Status.html>
 
 If you have additional questions about these changes, email [email protected].
 

README.Rmd

@@ -15,10 +15,13 @@ Environmental Protection Agency (EPA), U.S. Department of Agriculture
 
 # Introduction
 
+:warning: NWIS web services (readNWIS functions) will be replaced over
+time by USGS Water Data APIs (read_waterdata\_). Read more about it
+here:
+<https://doi-usgs.github.io/dataRetrieval/articles/read_waterdata_functions.html>
+
 :warning: USGS discrete water-quality data availability and format are
-changing. Beginning March 11, 2024 USGS data obtained from legacy
-services will not include new USGS data or recent updates to existing
-data. To view the status of changes in data availability and code
+changing. To view the status of changes in data availability and code
 functionality, visit:
 <https://doi-usgs.github.io/dataRetrieval/articles/Status.html>
 
@@ -193,14 +196,14 @@ NWIScitation
 #> U.S. Geological Survey (2025). _National Water Information System data
 #> available on the World Wide Web (USGS Water Data for the Nation)_.
 #> doi:10.5066/F7P55KJN <https://doi.org/10.5066/F7P55KJN>, Accessed Jun
-#> 13, 2025,
+#> 27, 2025,
 #> <https://waterservices.usgs.gov/nwis/dv/?site=09010500&format=waterml%2C1.1&ParameterCd=00060&StatCd=00003&startDT=1851-01-01>.
 print(NWIScitation, style = "Bibtex")
 #> @Manual{,
 #>   title = {National Water Information System data available on the World Wide Web (USGS Water Data for the Nation)},
 #>   author = {{U.S. Geological Survey}},
 #>   doi = {10.5066/F7P55KJN},
-#>   note = {Accessed Jun 13, 2025},
+#>   note = {Accessed Jun 27, 2025},
 #>   year = {2025},
 #>   url = {https://waterservices.usgs.gov/nwis/dv/?site=09010500&format=waterml%2C1.1&ParameterCd=00060&StatCd=00003&startDT=1851-01-01},
 #> }
@@ -224,14 +227,14 @@ WQPcitation <- create_WQP_bib(SC)
 WQPcitation
 #> National Water Quality Monitoring Council (2025). _Water Quality
 #> Portal_. doi:10.5066/P9QRKUVJ <https://doi.org/10.5066/P9QRKUVJ>,
-#> Accessed Jun 13, 2025,
+#> Accessed Jun 27, 2025,
 #> <https://www.waterqualitydata.us/data/Result/search?siteid=USGS-05288705&count=no&pCode=00300&mimeType=csv>.
 print(WQPcitation, style = "Bibtex")
 #> @Manual{,
 #>   title = {Water Quality Portal},
 #>   author = {{National Water Quality Monitoring Council}},
 #>   doi = {10.5066/P9QRKUVJ},
-#>   note = {Accessed Jun 13, 2025},
+#>   note = {Accessed Jun 27, 2025},
 #>   year = {2025},
 #>   url = {https://www.waterqualitydata.us/data/Result/search?siteid=USGS-05288705&count=no&pCode=00300&mimeType=csv},
 #> }

README.md

@@ -64,13 +64,14 @@ navbar:
   - icon: fa-github fa-lg
     href: https://github.com/DOI-USGS/dataRetrieval
 reference:
-  - title: USGS new data services
-    desc: Functions to retrieve USGS data from new services.
+  - title: USGS Water Data
+    desc: Functions to retrieve USGS Water Data APIs.
     contents:
       - read_waterdata_samples
       - read_waterdata_daily
       - read_waterdata_ts_meta
       - read_waterdata_monitoring_location
+      - read_waterdata_latest_continuous
       - read_waterdata
       - summarize_waterdata_samples
       - check_waterdata_sample_params