diff --git a/DESCRIPTION b/DESCRIPTION index e858c17f..5c12f1cb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: nhdplusTools Type: Package Title: NHDPlus Tools -Version: 1.0.0 +Version: 1.0.1 Authors@R: c(person(given = "David", family = "Blodgett", role = c("aut", "cre"), diff --git a/R/A_nhdplusTools.R b/R/A_nhdplusTools.R index dbc1bd76..72421f2c 100644 --- a/R/A_nhdplusTools.R +++ b/R/A_nhdplusTools.R @@ -3,7 +3,7 @@ vaa_hydroshare <- 'https://www.hydroshare.org/resource/6092c8a62fac45be97a09bfd0b0bf726/data/contents/nhdplusVAA.fst' vaa_sciencebase <- - 'https://www.sciencebase.gov/catalog/file/get/60c92503d34e86b9389df1c9?name=enhd_nhdplusatts.fst' + 'https://www.sciencebase.gov/catalog/file/get/63cb311ed34e06fef14f40a3?name=enhd_nhdplusatts.fst' nhdplusTools_env <- new.env() diff --git a/R/get_vaa.R b/R/get_vaa.R index 1871cd2d..46600cc1 100644 --- a/R/get_vaa.R +++ b/R/get_vaa.R @@ -56,7 +56,7 @@ get_vaa_names <- function(updated_network = FALSE) { #' found at path. #' @param updated_network logical default FALSE. If TRUE, updated network attributes #' from E2NHD and National Water Model retrieved from -#' \doi{10.5066/P9W79I7Q}. +#' \doi{10.5066/P976XCVT}. #' @return data.frame containing requested VAA data #' @importFrom fst read.fst #' @export @@ -298,8 +298,9 @@ get_catchment_characteristics <- function(varname, ids, reference_fabric = "nhdp att$characteristic_id <- x att$percent_nodata <- 0 + distinct( select(att, all_of(c(characteristic_id = "characteristic_id", comid = "COMID", - characteristic_value = x, percent_nodata = "percent_nodata"))) + characteristic_value = x, percent_nodata = "percent_nodata")))) }) }, error = function(e) { e diff --git a/man/download_vaa.Rd b/man/download_vaa.Rd index e9b33b27..6f8ce567 100644 --- a/man/download_vaa.Rd +++ b/man/download_vaa.Rd @@ -19,7 +19,7 @@ Also see: \link{get_vaa_path}} \item{updated_network}{logical default FALSE. If TRUE, updated network attributes from E2NHD and National Water Model retrieved from -\doi{10.5066/P9W79I7Q}.} +\doi{10.5066/P976XCVT}.} } \value{ character path to cached data diff --git a/man/get_vaa.Rd b/man/get_vaa.Rd index ed6e5eca..b0a657d3 100644 --- a/man/get_vaa.Rd +++ b/man/get_vaa.Rd @@ -23,7 +23,7 @@ found at path.} \item{updated_network}{logical default FALSE. If TRUE, updated network attributes from E2NHD and National Water Model retrieved from -\doi{10.5066/P9W79I7Q}.} +\doi{10.5066/P976XCVT}.} } \value{ data.frame containing requested VAA data diff --git a/man/get_vaa_names.Rd b/man/get_vaa_names.Rd index cb41cbf4..a7aa5bd3 100644 --- a/man/get_vaa_names.Rd +++ b/man/get_vaa_names.Rd @@ -9,7 +9,7 @@ get_vaa_names(updated_network = FALSE) \arguments{ \item{updated_network}{logical default FALSE. If TRUE, updated network attributes from E2NHD and National Water Model retrieved from -\doi{10.5066/P9W79I7Q}.} +\doi{10.5066/P976XCVT}.} } \value{ character vector