diff --git a/workspace/R/NHD_navigate.R b/workspace/R/NHD_navigate.R index bb1f5d4c41f2434e1c0966a4d20f9a6c08a180d1..02f8f8c4da6816590772ca63d32d9dcaff64f5d5 100644 --- a/workspace/R/NHD_navigate.R +++ b/workspace/R/NHD_navigate.R @@ -89,7 +89,7 @@ segment_increment <- function(nhdDF, POIs){ #' @param routing_fix (sf data.frame) any additional routing fixes #' #' @return (sf data.frame) data.frame of segments -segment_creation <- function(nhdDF, routing_fix){ +segment_creation <- function(nhdDF, routing_fix){ if(!"StartFlag" %in% names(nhdDF)) { nhdDF$StartFlag <- ifelse(nhdDF$Hydroseq %in% nhdDF$DnHydroseq, 0, 1) @@ -98,7 +98,7 @@ segment_creation <- function(nhdDF, routing_fix){ in_segs <- filter(nhdDF, !is.na(POI_ID)) # If there are routing fixes to account for if a POI with a DA of 0 is moved upsream or downstream - if (!is.na(routing_fix)){ + if (!missing(routing_fix)){ routing_fix <- routing_fix %>% rename(COMID = oldPOI, new_COMID = COMID) @@ -993,7 +993,7 @@ gage_POI_creation <- function(tmp_POIs, gages_info, nhd, combine_meters, reach_m #' wbout_POI_creaton <- function(nhd, WBs_VPU, data_paths, crs){ # Create waterbody outlet POIs for waterbodies that are in NHDv2 waterbody set - wbout_COMIDs <- nhd %>% #filter(nhd, dend == 1 & WB == 1) + wbout_COMIDs <- nhd %>% group_by(WBAREACOMI) %>% slice(which.min(Hydroseq)) %>% switchDiv(., nhd) %>% @@ -1335,15 +1335,15 @@ wb_inlet_collapse <- function(tmp_POIs, nhd, events){ } } -#' Creates Waterbody POIs, calls a few other functions +#' Collapses POIs us/ds of waterbody POIs #' @param (sf data.frame) rolling POI data frame #' @param nhd (sf data.frame) nhd flowlines -#' @param events (sf data.frame) waterbody inlet events +#' @param events (sf data.frame) waterbody events #' -#' @return (sf data.frame) dataframe of wb inlet POIs collapse +#' @return (sf data.frame) dataframe of wb inlet POIs collapsed wb_poi_collapse <- function(tmp_POIs, nhd, events){ gage_dist_node <- function(x, wb_ds_ds, gage_add, events){ - print (x) #6116850 + print (x) wb_out_fl <- filter(wb_ds_ds, COMID == x) gage_ds <- filter(wb_ds_ds, Hydroseq %in% wb_out_fl$Hydroseq | Hydroseq %in% wb_out_fl$DnHydroseq) @@ -1398,7 +1398,6 @@ wb_poi_collapse <- function(tmp_POIs, nhd, events){ } } - # Previously identified streamgages within Gage_Selection.Rmd streamgages_VPU <- gages %>% rename(COMID = comid) %>%