From aecd38d2c236f189044084f89dffbb098b59b3b7 Mon Sep 17 00:00:00 2001
From: David Blodgett <dblodgett@usgs.gov>
Date: Fri, 15 Apr 2022 09:12:41 -0500
Subject: [PATCH] incorporate new catchments
---
workspace/01_NHD_prep.Rmd | 9 ++++++++-
workspace/05_hyRefactor_flines.Rmd | 3 ---
workspace/06-1_hyRefactor_cats.Rmd | 8 --------
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/workspace/01_NHD_prep.Rmd b/workspace/01_NHD_prep.Rmd
index ac09c30..790460e 100644
--- a/workspace/01_NHD_prep.Rmd
+++ b/workspace/01_NHD_prep.Rmd
@@ -39,7 +39,10 @@ out_rpu <- rep(list(list()), length(all_rpu_codes))
names(out_rpu) <- all_rpu_codes
fline <- sf::read_sf(data_paths$ref_flowline)
-catchment <- readRDS(staged_nhd$catchment)
+
+fline <- sf::st_cast(fline, "LINESTRING")
+
+catchment <- sf::read_sf(file.path(data_paths$nhdplus_dir, "reference_catchments.gpkg"))
for(VPU in vpu_codes) {
@@ -77,6 +80,10 @@ for(VPU in vpu_codes) {
filter(RPUID %in% rpu_codes$rpuid)
cats <- catchment %>%
+ rename(FEATUREID = featureid,
+ AREASQKM = areasqkm,
+ RPUID = rpuid,
+ VPUID = vpuid) %>%
filter(FEATUREID %in%
unique(c(nhd$COMID,
full_cat_table$FEATUREID[full_cat_table$RPUID %in% rpu_codes$rpuid]))) %>%
diff --git a/workspace/05_hyRefactor_flines.Rmd b/workspace/05_hyRefactor_flines.Rmd
index 2bf6015..1015377 100644
--- a/workspace/05_hyRefactor_flines.Rmd
+++ b/workspace/05_hyRefactor_flines.Rmd
@@ -36,9 +36,6 @@ Load and filter source NHD Flowline network.
cats <- read_sf(out_refac_gpkg, nhd_catchment)
```
-
-
-
Read POIs and add nhd outlets. Save to a non-spatial table.
```{r refactor}
POIs <- read_sf(nav_gpkg, final_poi_layer) %>%
diff --git a/workspace/06-1_hyRefactor_cats.Rmd b/workspace/06-1_hyRefactor_cats.Rmd
index 3b8bbe4..bad8c27 100644
--- a/workspace/06-1_hyRefactor_cats.Rmd
+++ b/workspace/06-1_hyRefactor_cats.Rmd
@@ -45,14 +45,6 @@ if(needs_layer(out_refac_gpkg, divide_layer)) {
distinct(.keep_all = T)
cats <- st_transform(read_sf(out_refac_gpkg, nhd_catchment), crs)
- st_precision(cats) <- 30 # meters
- cats <- sf::st_simplify(cats, dTolerance = 0) %>%
- st_cast("MULTIPOLYGON")
-
- cats <- nhdplusTools:::check_valid(cats)
-
- # Write out catchments to use in 06_non_dend
- write_sf(cats, out_refac_gpkg, nhd_catchment)
divides <- reconcile_catchment_divides(catchment = cats,
fline_ref = refactored,
--
GitLab