Merge branch 'main' of https://github.com/DOI-USGS/nhdplusTools

dblodgett-usgs · Mar 23, 2024 · dc925ad · dc925ad
2 parents bc72578 + a739a28
commit dc925ad
Show file tree

Hide file tree

Showing 134 changed files with 732 additions and 441 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,8 @@
 nhdplusTools 1.1.0
 ==========
 
+- fixed nhd and nhdplushr urls #368
+- fix issue with nhdplusTools_data_dir() #365
 - fixed bug with large nhdplus downloads with empty tiles. #361
 - Added 3DHP_all service client. #363
 - Removed deprecated function `get_huc12` and `get_huc8`

diff --git a/R/A_nhdplusTools.R b/R/A_nhdplusTools.R
@@ -253,16 +253,12 @@ default_nhdplus_path <- "../NHDPlusV21_National_Seamless.gdb"
 assign("default_nhdplus_path", default_nhdplus_path, envir = nhdplusTools_env)
 
 nhd_bucket <- "https://prd-tnm.s3.amazonaws.com/"
-nhdhr_file_list <- "?prefix=StagedProducts/Hydrography/NHDPlusHR/Beta/GDB/"
+nhdhr_file_list <- "?prefix=StagedProducts/Hydrography/NHDPlusHR/VPU/Current/GDB/"
 nhd_file_list <- "?prefix=StagedProducts/Hydrography/NHD/HU4/GDB/"
 
 assign("nhd_bucket", nhd_bucket, envir = nhdplusTools_env)
 assign("nhdhr_file_list", nhdhr_file_list, envir = nhdplusTools_env)
 
-assign("nhdpt_dat_dir",
-       tools::R_user_dir("nhdplusTools"),
-       envir = nhdplusTools_env)
-
 assign("nldi_tier", "prod",
        envir = nhdplusTools_env)
 
@@ -301,7 +297,18 @@ get_nldi_url <- function() {
 nhdplusTools_data_dir <- function(dir = NULL) {
 
   if(is.null(dir)) {
+
+    nhdpt_dat_dir <- try(get("nhdpt_dat_dir", envir = nhdplusTools_env), silent = TRUE)
+
+    if(inherits(nhdpt_dat_dir, "try-error")) {
+      assign("nhdpt_dat_dir",
+             tools::R_user_dir("nhdplusTools"),
+             envir = nhdplusTools_env)
+    }
+
     return(get("nhdpt_dat_dir", envir = nhdplusTools_env))
+
+
   } else {
     assign("nhdpt_dat_dir",
            dir,

diff --git a/R/downloading_tools.R b/R/downloading_tools.R
@@ -136,13 +136,13 @@ download_nhd_internal <- function(bucket, file_list_snip, prefix, nhd_dir, hu_li
 #'   download_nhdplusV2("./data/nhd/")
 #'
 #'   download_nhdplusv2(outdir = "./inst/",
-#'       url = paste0("https://edap-ow-data-commons.s3.amazonaws.com/NHDPlusV21/",
+#'       url = paste0("https://dmap-data-commons-ow.s3.amazonaws.com/NHDPlusV21/",
 #'                    "Data/NationalData/NHDPlusV21_NationalData_Seamless",
 #'                    "_Geodatabase_HI_PR_VI_PI_03.7z"))
 #' }
 
 download_nhdplusv2 <- function(outdir,
-                               url = paste0("https://edap-ow-data-commons.s3.amazonaws.com/NHDPlusV21/",
+                               url = paste0("https://dmap-data-commons-ow.s3.amazonaws.com/NHDPlusV21/",
                                             "Data/NationalData/NHDPlusV21_NationalData_Seamless",
                                             "_Geodatabase_Lower48_07.7z"),
                                progress = TRUE) {

diff --git a/data-raw/build_boundary_data.R b/data-raw/build_boundary_data.R
@@ -5,7 +5,7 @@ library(archive)
 library(rmapshaper)
 library(nhdplusTools)
 
-epa_path <- "https://edap-ow-data-commons.s3.amazonaws.com/NHDPlusV21/Data/GlobalData/NHDPlusV21_NHDPlusGlobalData_03.7z"
+epa_path <- "https://dmap-data-commons-ow.s3.amazonaws.com/NHDPlusV21/Data/GlobalData/NHDPlusV21_NHDPlusGlobalData_03.7z"
 zip <- file.path("data/nhdglobal.7z")
 
 GET(epa_path, write_disk(zip))

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/DISCLAIMER.html b/docs/DISCLAIMER.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/articles/indexing.html b/docs/articles/indexing.html
diff --git a/docs/articles/nhdplusTools.html b/docs/articles/nhdplusTools.html
diff --git a/docs/articles/nhdplusTools_files/figure-html/nldi_nwissite-1.png b/docs/articles/nhdplusTools_files/figure-html/nldi_nwissite-1.png
diff --git a/docs/articles/nhdplusTools_files/figure-html/tldr2-1.png b/docs/articles/nhdplusTools_files/figure-html/tldr2-1.png