update core

.gitignore

@@ -8,4 +8,5 @@ depriciate
 dead
 inst/doc
 vignettes/cihro-data
-data
+data
+check

DESCRIPTION

@@ -36,7 +36,6 @@ Imports:
     purrr,
     magrittr
 Remotes: 
-    USGS-R/nhdplusTools,
     mikejohnson51/hydrofab,
     mikejohnson51/ngen.hydrofab,
     mikejohnson51/zonal,

R/attach.R

@@ -1,5 +1,6 @@
 core <- c("dplyr",  "terra",  "ngen.hydrofab","climateR",  
-          "sf", "nhdplusTools",  "hydrofab","zonal", "glue")
+          "sf", "nhdplusTools",  "hydrofab","zonal", 
+          "glue", 'arrow')
 
 core_unloaded <- function() {
   search <- paste0("package:", core)

R/subset_network.R

@@ -11,6 +11,8 @@ get_fabric = function(VPU,
                       cache_dir = NULL,
                       cache_overwrite = FALSE){
 
+  Key <- NULL
+
   xx = get_bucket_df(bucket = dirname(base_s3), prefix = basename(base_s3), region = 'us-west-2') %>%
     filter(grepl(basename(base_s3), Key) &
              grepl(paste0(VPU, ".gpkg$"), Key)) %>%
@@ -77,6 +79,8 @@ subset_network = function(id = NULL,
                           cache_dir = NULL,
                           cache_overwrite = FALSE) {
 
+  Key <- hf_hydroseq <- hf_id  <- hydroseq <- member_COMID <- toid  <- vpu <- NULL
+
   net = tryCatch({
     open_dataset(glue(base_s3, "conus_net.parquet")) %>%
       select(id, toid, hf_id, hl_uri, hf_hydroseq, hydroseq, vpu) %>%
@@ -126,7 +130,9 @@ subset_network = function(id = NULL,
       get_nhdplus(comid = comid)
     })
 
-    vpuid = vpu_boundaries$VPUID[which(lengths(st_intersects(st_transform(vpu_boundaries, st_crs(xx)), xx)) > 0)]
+    v = nhdplusTools::vpu_boundaries
+
+    vpuid = v$VPUID[which(lengths(st_intersects(st_transform(v, st_crs(xx)), xx)) > 0)]
   } else {
     vpuid = unique(pull(filter(net, id == origin |
                                  toid == origin), vpu))

README.Rmd

@@ -7,16 +7,15 @@ output: github_document
 ```{r, include = FALSE}
 options(width=100)
 knitr::opts_chunk$set(
-  #collapse = TRUE,
-  #comment = "#>",
-  #fig.path = "man/figures"
+  #warning = FALSE,
+  message = TRUE
 )
 
 ```
 
 <br>
 
-## NOAA Next Generation Modeling Framework Hydrofabric
+## Next Generation Water Resource Modeling Framework Hydrofabric(s)
 
 <!-- badges: start -->
 
@@ -44,6 +43,9 @@ NextGen artifacts are publicly available through a partnership with Lynker and t
 
 ### [Lynker's NextGen Data Artifacts](https://lynker-spatial.s3.amazonaws.com/index.html)
 
+```{r, fig.align='center', echo = FALSE}
+knitr::include_graphics("man/figures/lynker-spatial.png")
+```
 
 ## Package Installation
 
@@ -110,6 +112,8 @@ knitr::include_graphics("man/figures/logos.png")
 
 <a href = "mailto:[email protected]?subject=Nexgen Hydrofabric Questions">
 Mike Johnson</a> (Hydrofabric Lead), <a href = "mailto:[email protected]?subject=Nexgen Hydrofabric Questions"> Trey Flowers </a> (Director, OWP Analysis and Prediction Division)
+
+
 
-**Disclaimer**: These data are preliminary or provisional and are subject to revision. They are being provided to meet the need for timely best science. The data have not received final approval by the National Oceanic and Atmospheric Administration (NOAA) or the U.S. Geological Survey (USGS) and are provided on the condition that neither NOAA, the USGS, nor the U.S. Government shall be held liable for any damages resulting from the authorized or unauthorized use of the data.
+## Disclaimer: These data are preliminary or provisional and are subject to revision. They are being provided to meet the need for timely best science. The data have not received final approval by the National Oceanic and Atmospheric Administration (NOAA) or the U.S. Geological Survey (USGS) and are provided on the condition that the U.S. Government shall not be held liable for any damages resulting from use of the data.
 

README.md

@@ -41,6 +41,8 @@ tables, spatial data, and lookups relevant to a hydrofabric data model
 
 ### [Lynker’s NextGen Data Artifacts](https://lynker-spatial.s3.amazonaws.com/index.html)
 
+<img src="man/figures/lynker-spatial.png" width="1529" style="display: block; margin: auto;" />
+
 ## Package Installation
 
 ``` r
@@ -63,7 +65,7 @@ library(hydrofabric)
 
     ## ── Attaching packages ────────────────────────────────────────────────────────── hydrofabric0.0.6 ──
 
-    ## ✔ dplyr         1.1.3       ✔ nhdplusTools  1.0.0  
+    ## ✔ dplyr         1.1.3       ✔ nhdplusTools  1.0.1  
     ## ✔ terra         1.7.46      ✔ hydrofab      0.5.0  
     ## ✔ ngen.hydrofab 0.0.3       ✔ zonal         0.0.2  
     ## ✔ climateR      0.3.1.4     ✔ glue          1.6.2  
@@ -148,12 +150,10 @@ page](https://github.com/LynkerIntel/hfsubset/releases).
 
 ## Questions:
 
-<a href = "mailto:[email protected]?subject=Nexgen Hydrofabric Questions">
+<a href = "mailto:[email protected]?subject=Nexgen Hydrofabric Questions">
 Mike Johnson</a> (Hydrofabric Lead),
 <a href = "mailto:[email protected]?subject=Nexgen Hydrofabric Questions">
-Trey Flowers </a> (Director, OWP Analysis and Prediction Division),
-<a href = "mailto:[email protected]?subject=Nexgen Hydrofabric Questions">
-Fernando Salas </a> (Director, OWP Geospatial Intellegence Division)
+Trey Flowers </a> (Director, OWP Analysis and Prediction Division)
 
 **Disclaimer**: These data are preliminary or provisional and are
 subject to revision. They are being provided to meet the need for timely