From b13658cf63ec8ea54c967484bebec2c29e3f34ab Mon Sep 17 00:00:00 2001 From: Laura DeCicco Date: Thu, 24 Sep 2026 09:29:04 -0500 Subject: [PATCH 1/3] updates for CRAN --- R/addWaterYear.R | 8 ++++---- R/citations.R | 12 ++++++------ inst/CITATION | 4 ++-- man/addWaterYear.Rd | 8 ++++---- man/create_WQP_bib.Rd | 12 ++++++------ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/R/addWaterYear.R b/R/addWaterYear.R index e5f36ae85..12af3c5ee 100644 --- a/R/addWaterYear.R +++ b/R/addWaterYear.R @@ -16,11 +16,11 @@ #' #' @examples #' \donttest{ -#' nwisData <- readNWISdv("04085427", "00060", "2022-01-01", "2022-06-30") -#' nwisData <- addWaterYear(nwisData) +#' # nwisData <- readNWISdv("04085427", "00060", "2022-01-01", "2022-06-30") +#' # nwisData <- addWaterYear(nwisData) #' -#' wqpData <- readWQPqw("USGS-01594440", "01075", "", "") -#' wqpData <- addWaterYear(wqpData) +#' # wqpData <- readWQPqw("USGS-01594440", "01075", "", "") +#' # wqpData <- addWaterYear(wqpData) #' } addWaterYear <- function(rawData) { allowedDateColNames <- c( diff --git a/R/citations.R b/R/citations.R index fd43227ef..dea62d75c 100644 --- a/R/citations.R +++ b/R/citations.R @@ -66,13 +66,13 @@ create_NWIS_bib <- function(x) { #' #' @examples #' \donttest{ -#' WQPData <- readWQPqw("USGS-05288705", -#' parameterCd = "00300") -#' wqp_citation <- create_WQP_bib(WQPData) -#' wqp_citation +#' # WQPData <- readWQPqw("USGS-05288705", +#' # parameterCd = "00300") +#' # wqp_citation <- create_WQP_bib(WQPData) +#' # wqp_citation #' -#' print(wqp_citation, style = "Bibtex") -#' print(wqp_citation, style = "citation") +#' # print(wqp_citation, style = "Bibtex") +#' # print(wqp_citation, style = "citation") #' } create_WQP_bib <- function(x) { textVersion <- paste0( diff --git a/inst/CITATION b/inst/CITATION index a77feb353..4348352ee 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -37,9 +37,9 @@ bibentry(bibtype = "Manual", title = "dataRetrieval: R packages for discovering and retrieving water data available from U.S. federal hydrologic web services", publisher = "U.S. Geological Survey", address="Reston, VA", - version = "2.7.25", + version = "2.7.26", institution = "U.S. Geological Survey", year = 2026, doi = "10.5066/P9X4L3GE", - textVersion = "De Cicco, L.A., Hirsch, R.M., Lorenz, D., Watkins, W.D., Johnson, M., Blodgett, D.L., Hinman, E.D., Zemmels, J., 2026, dataRetrieval: R packages for discovering and retrieving water data available from Federal hydrologic web services, v.2.7.25, doi:10.5066/P9X4L3GE" + textVersion = "De Cicco, L.A., Hirsch, R.M., Lorenz, D., Watkins, W.D., Johnson, M., Blodgett, D.L., Hinman, E.D., Zemmels, J., 2026, dataRetrieval: R packages for discovering and retrieving water data available from Federal hydrologic web services, v.2.7.26, doi:10.5066/P9X4L3GE" ) diff --git a/man/addWaterYear.Rd b/man/addWaterYear.Rd index 789f974e4..99d810dbe 100644 --- a/man/addWaterYear.Rd +++ b/man/addWaterYear.Rd @@ -24,10 +24,10 @@ of the data. } \examples{ \donttest{ -nwisData <- readNWISdv("04085427", "00060", "2022-01-01", "2022-06-30") -nwisData <- addWaterYear(nwisData) +# nwisData <- readNWISdv("04085427", "00060", "2022-01-01", "2022-06-30") +# nwisData <- addWaterYear(nwisData) -wqpData <- readWQPqw("USGS-01594440", "01075", "", "") -wqpData <- addWaterYear(wqpData) +# wqpData <- readWQPqw("USGS-01594440", "01075", "", "") +# wqpData <- addWaterYear(wqpData) } } diff --git a/man/create_WQP_bib.Rd b/man/create_WQP_bib.Rd index b79722817..96bd64be2 100644 --- a/man/create_WQP_bib.Rd +++ b/man/create_WQP_bib.Rd @@ -22,12 +22,12 @@ See \code{?bibentry} for more information. } \examples{ \donttest{ -WQPData <- readWQPqw("USGS-05288705", - parameterCd = "00300") -wqp_citation <- create_WQP_bib(WQPData) -wqp_citation +# WQPData <- readWQPqw("USGS-05288705", +# parameterCd = "00300") +# wqp_citation <- create_WQP_bib(WQPData) +# wqp_citation -print(wqp_citation, style = "Bibtex") -print(wqp_citation, style = "citation") +# print(wqp_citation, style = "Bibtex") +# print(wqp_citation, style = "citation") } } From 69a441cb5182f9384afe4d99bb702b42f63ca6f4 Mon Sep 17 00:00:00 2001 From: Laura DeCicco Date: Thu, 24 Sep 2026 09:38:45 -0500 Subject: [PATCH 2/3] update map baselayers --- tutorials/basic_slides_deck.qmd | 26 +++++++++++++------------- vignettes/read_waterdata_functions.Rmd | 6 +++--- vignettes/samples_data.Rmd | 2 +- vignettes/wqp_large_pull_script.Rmd | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tutorials/basic_slides_deck.qmd b/tutorials/basic_slides_deck.qmd index 84d506a9b..ba0ae5b64 100644 --- a/tutorials/basic_slides_deck.qmd +++ b/tutorials/basic_slides_deck.qmd @@ -682,24 +682,24 @@ Here are a bunch of valid inputs: #| code-line-numbers: "1-9|10-11|12-15|16-19" #| label: rtime # Ask for exact times: -time = "2025-01-01" -time = as.Date("2025-01-01") -time = "2025-01-01T23:20:50Z" -time = as.POSIXct( +time <- "2025-01-01" +time <- as.Date("2025-01-01") +time <- "2025-01-01T23:20:50Z" +time <- as.POSIXct( "2025-01-01T23:20:50Z", format = "%Y-%m-%dT%H:%M:%S", tz = "UTC" ) # Ask for specific range -time = c("2024-01-01", "2025-01-01") # or Dates or POSIXs +time <- c("2024-01-01", "2025-01-01") # or Dates or POSIXs # Asking beginning of record to specific end: -time = c(NA, "2024-01-01") # or Date or POSIX +time <- c(NA, "2024-01-01") # or Date or POSIX # Asking specific beginning to end of record: -time = c("2024-01-01", NA) # or Date or POSIX +time <- c("2024-01-01", NA) # or Date or POSIX # Ask for period -time = "P1M" # past month -time = "P7D" # past 7 days -time = "PT12H" # past hours +time <- "P1M" # past month +time <- "P7D" # past 7 days +time <- "PT12H" # past hours ``` ### Python @@ -896,7 +896,7 @@ leaflet( data = site_info_refined |> sf::st_transform(crs = leaflet_crs) ) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers(popup = ~monitoring_location_name, radius = 3, opacity = 1) ``` @@ -909,7 +909,7 @@ If you have `geopandas` installed, the function will return a GeoDataFrame with site_info_refined.set_crs(crs="WGS84").explore( marker_kwds=dict(radius=7), style_kwds=dict(opacity=1, fillOpacity=1), - tiles="CartoDB.Positron", + tiles="Esri.WorldGrayCanvas", ) ``` @@ -1023,7 +1023,7 @@ leaflet( data = tus_summary |> sf::st_transform(crs = leaflet_crs) ) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers(popup = ~monitoring_location_name, radius = 3, opacity = 1) ``` diff --git a/vignettes/read_waterdata_functions.Rmd b/vignettes/read_waterdata_functions.Rmd index 28fa03211..fa77a47a2 100644 --- a/vignettes/read_waterdata_functions.Rmd +++ b/vignettes/read_waterdata_functions.Rmd @@ -154,7 +154,7 @@ leaflet_crs <- "+proj=longlat +datum=WGS84" #default leaflet crs leaflet(data = sites_wi |> sf::st_transform(crs = leaflet_crs)) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers(popup = ~monitoring_location_name, radius = 0.1, opacity = 1) @@ -397,7 +397,7 @@ pal <- colorNumeric("viridis", sites_mn_wi$drainage_area) leaflet(data = sites_mn_wi |> sf::st_transform(crs = leaflet_crs)) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers(popup = ~monitoring_location_name, color = ~ pal(drainage_area), radius = 0.1, @@ -433,7 +433,7 @@ pal <- colorFactor("viridis", what_huc_sites$hydrologic_unit_code) leaflet(data = what_huc_sites |> sf::st_transform(crs = leaflet_crs)) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers(popup = ~monitoring_location_name, color = ~ pal(hydrologic_unit_code), radius = 0.1, diff --git a/vignettes/samples_data.Rmd b/vignettes/samples_data.Rmd index b5412e33d..15c731862 100644 --- a/vignettes/samples_data.Rmd +++ b/vignettes/samples_data.Rmd @@ -53,7 +53,7 @@ map_it <- function(df){ leaflet_crs <- "+proj=longlat +datum=WGS84" leaf_map <- leaflet::leaflet() |> - leaflet::addProviderTiles("CartoDB.Positron") |> + leaflet::addProviderTiles("Esri.WorldGrayCanvas") |> leaflet::addCircleMarkers(data = df_sf |> sf::st_transform(crs = leaflet_crs), color = "red", diff --git a/vignettes/wqp_large_pull_script.Rmd b/vignettes/wqp_large_pull_script.Rmd index 4a44217b8..758355037 100644 --- a/vignettes/wqp_large_pull_script.Rmd +++ b/vignettes/wqp_large_pull_script.Rmd @@ -155,7 +155,7 @@ library(leaflet) attr(all_nitrogen, "siteInfo") |> filter(!is.na(dec_lon_va)) |> leaflet() |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers(~dec_lon_va, ~dec_lat_va, color = "red", radius = 3, stroke = FALSE, fillOpacity = 0.8, opacity = 0.8, @@ -170,4 +170,4 @@ For an extended discussion, see: # Disclaimer -Any use of trade, firm, or product names is for descriptive purposes only and does not imply endorsement by the U.S. Government. \ No newline at end of file +Any use of trade, firm, or product names is for descriptive purposes only and does not imply endorsement by the U.S. Government. From 6bb5169d3d8de946e77db897b3a6c2b0bb3059b7 Mon Sep 17 00:00:00 2001 From: Laura DeCicco Date: Thu, 24 Sep 2026 09:45:23 -0500 Subject: [PATCH 3/3] And the slideshows --- tutorials/basic_slides_deck.qmd | 4 ++-- tutorials/changes_slides_deck.qmd | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutorials/basic_slides_deck.qmd b/tutorials/basic_slides_deck.qmd index ba0ae5b64..ced4c96eb 100644 --- a/tutorials/basic_slides_deck.qmd +++ b/tutorials/basic_slides_deck.qmd @@ -1093,7 +1093,7 @@ leaflet( data = latest_discharge |> sf::st_transform(crs = leaflet_crs) ) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers( popup = paste( latest_discharge$monitoring_location_id, @@ -1124,7 +1124,7 @@ leaflet( latest_discharge.set_crs(crs="WGS84").explore( marker_kwds=dict(radius=7), style_kwds=dict(opacity=1, fillOpacity=1), - tiles="CartoDB.Positron", + tiles="Esri.WorldGrayCanvas", column="value", cmap="viridis", zoom_start=10, diff --git a/tutorials/changes_slides_deck.qmd b/tutorials/changes_slides_deck.qmd index a1d7f9721..d23203ce1 100644 --- a/tutorials/changes_slides_deck.qmd +++ b/tutorials/changes_slides_deck.qmd @@ -517,7 +517,7 @@ leaflet( data = site_info_refined |> sf::st_transform(crs = leaflet_crs) ) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers(popup = ~monitoring_location_name, radius = 3, opacity = 1) ``` @@ -799,7 +799,7 @@ leaflet( data = latest_dane_county |> sf::st_transform(crs = leaflet_crs) ) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers( popup = paste( latest_dane_county$monitoring_location_id, @@ -844,7 +844,7 @@ leaflet( data = latest_dane_county_daily |> sf::st_transform(crs = leaflet_crs) ) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers( popup = paste( latest_dane_county_daily$monitoring_location_id, @@ -943,7 +943,7 @@ leaflet( data = sites_mn_wi |> sf::st_transform(crs = leaflet_crs) ) |> - addProviderTiles("CartoDB.Positron") |> + addProviderTiles("Esri.WorldGrayCanvas") |> addCircleMarkers( popup = ~monitoring_location_name, color = ~ pal(drainage_area),