Added DnMinorHyd back in

workspace/02_NHD_navigate.Rmd

@@ -28,6 +28,11 @@ staged_nhd <- stage_national_data(nhdplus_data = data_paths$nhdplus_gdb,
 
 nhd_rds <- fix_headwaters(staged_nhd$flowline, gsub("flowline.rds", "flowline_update.rds", staged_nhd$flowline),
                new_atts = data_paths$new_nhdp_atts, nhdpath = data_paths$nhdplus_gdb)
+
+# Need DnMinorHyd for switching POIs downstream of watebodies/dams
+nhd_orig <- readRDS(file.path(data_paths$nhdplus_dir, "nhdplus_flowline.rds")) %>%
+  st_drop_geometry() %>%
+  select(COMID, DnMinorHyd)
 ```
 
 ```{r huc12 POIs}
@@ -35,8 +40,10 @@ nhd_rds <- fix_headwaters(staged_nhd$flowline, gsub("flowline.rds", "flowline_up
 if(needs_layer(nav_gpkg, nav_poi_layer)) {
   
   if (needs_layer(nav_gpkg, nhd_flowline)){
+    
     # Subset NHD by VPU
-    nhd <- VPU_Subset(nhd_rds, VPU)
+    nhd <- VPU_Subset(nhd_rds, VPU) %>%
+      left_join(nhd_orig, by = "COMID")
     
     if("arbolate_sum" %in% names(nhd)) nhd <- rename(nhd, ArbolateSu = arbolate_sum)
     
@@ -55,10 +62,11 @@ if(needs_layer(nav_gpkg, nav_poi_layer)) {
      nhd <- read_sf(nav_gpkg, nhd_flowline)
      try(nhd <- select(nhd, -c(minNet, WB, struct_POI, struct_Net, POI_ID)))
   }
-
+  
   # Join HUC12 outlets with NHD
   HUC12_COMIDs <- read_sf(data_paths$hu12_points_path, "hu_points") %>% 
     filter(grepl(paste0("^", substr(VPU, start = 1, stop = 2)), .data$HUC12)) %>%
+    #filter(grepl("^02|^04", .data$HUC12)) %>% 
     select(COMID, HUC12) %>%
     #switchDiv(., nhd) %>%
     # Remove this when HUC12 outlets finished
@@ -80,9 +88,6 @@ if(needs_layer(nav_gpkg, nav_poi_layer)) {
 ```
 
 ```{r streamgage POIs}
-#  Derive gage POIs----------------------
-# Note several POIs have multiple gages indexed
- # Need to add in drainage area threshold
 if(all(is.na(tmp_POIs$Type_Gages))) { 
 
   # Previously identified streamgages within Gage_Selection.Rmd
@@ -93,6 +98,7 @@ if(all(is.na(tmp_POIs$Type_Gages))) {
     st_drop_geometry() %>%
     # these two lines below will not be needed when Marilyn finishes Gage work
     # Should we keep all streamgages larger than 10 km or stick with min_da_km threshold
+    switchDiv(., nhd) %>%
     group_by(COMID) %>%
     top_n(n = -1)
 
@@ -102,7 +108,7 @@ if(all(is.na(tmp_POIs$Type_Gages))) {
   
   # As a fail-safe, write out list of gages not assigned a POI
   if(nrow(filter(streamgages, !Gage_no %in% tmp_POIs$Type_Gages)) > 0) {
-    write_sf(filter(streamgages, !Gage_no %in% tmp_POIs$Type_Gages),
+    write_sf(filter(read_sf("cache/Gages_info.gpkg", "Gages"), !Gage_no %in% tmp_POIs$Type_Gages),
              nav_gpkg, "unassigned_gages")
   }
   
@@ -123,8 +129,9 @@ if(all(is.na(tmp_POIs$Type_TE))) {
   TE_COMIDs <- read_sf(data_paths$TE_points_path, "2015_TE_Model_Estimates_lat.long_COMIDs") %>%
     mutate(COMID = as.integer(COMID)) %>%
     inner_join(., select(st_drop_geometry(nhd), COMID, VPUID), by = "COMID") %>%
-    filter(grepl(paste0("^", VPU, ".*"), .data$VPUID), COMID > 0) %>%
-    #switchDiv(., nhd) %>%
+    filter(grepl(paste0("^", substr(VPU, 1, 2), ".*"), .data$VPUID), COMID > 0) %>%
+    #filter(grepl("^02.*|^04.*", data$VPUID), COMID > 0) %>% 
+    switchDiv(., nhd) %>%
     group_by(COMID) %>%
     summarize(EIA_PLANT = paste0(unique(EIA_PLANT_), collapse = " "), count = n()) 
   
@@ -225,14 +232,14 @@ if(all(is.na(tmp_POIs$Type_WBOut))) {
   wbout_COMIDs <- filter(nhd, dend == 1 & WB == 1) %>%
     group_by(WBAREACOMI) %>%
     slice(which.min(Hydroseq)) %>%
-    #switchDiv(., nhd) %>%
+    switchDiv(., nhd) %>%
     select(COMID, WBAREACOMI) 
 
   wbin_COMIDs <- filter(nhd, WB == 0, 
                         DnHydroseq %in% filter(nhd, WB == 1)$Hydroseq,
                         TotDASqKM >= min_da_km) %>%
     select(-WBAREACOMI) %>%
-    #switchDiv(., nhd) %>%
+    switchDiv(., nhd) %>%
     inner_join(st_drop_geometry(filter(nhd, minNet == 1)) %>%
                  select(Hydroseq, WBAREACOMI), by = c("DnHydroseq" = "Hydroseq")) %>%
     select(COMID, WBAREACOMI) %>%