fix up merge and remove some events near measure 100

workspace/R/utils.R

@@ -128,9 +128,8 @@ Merge_hydReg <- function(feat, in_gpkg, out_gpkg){
   if(needs_layer(out_gpkg, feat)) {
     all_sf <- paste0(feat, "_CONUS")
     VPUs <- c(paste0("0", c(1:9)), as.character(11:18), "10U", "10L")
-
     featCON <- do.call("rbind", lapply(VPUs, function(x) 
-      read_sf(file.path("cache", paste0("GF_", x, "_", in_gpkg, ".gpkg")), paste0(feat, "_", x))))
+      read_sf(file.path("cache", paste0("GF_", x, in_gpkg, ".gpkg")), paste0(feat, "_", x))))
     
     write_sf(featCON, out_gpkg, feat)
   }

workspace/hyRefactor_cats.Rmd

@@ -147,7 +147,7 @@ if(needs_layer(out_gpkg, agg_cats_layer)) {
 agg_cats$cat_sets$set <- lapply(strsplit(agg_cats$cat_sets$set, split = ","), as.integer)
 agg_cats$fline_sets$set <- lapply(strsplit(agg_cats$fline_sets$set, split = ","), as.integer)
 
-POIs <- read_sf(gf_gpkg, "POIs") %>%
+POIs <- read_sf(gf_gpkg, poi_layer) %>%
   filter(COMID %in% gf_outlets$COMID)
 
 ```

workspace/hyRefactor_config.R

@@ -15,7 +15,8 @@ if(!nchar(cache_split <- Sys.getenv("CACHE_SPLIT")) > 5)
 if(!nchar(lookup_table_file <- Sys.getenv("LOOKUP_TABLE")) > 5) 
   lookup_table_file <- file.path("cache", paste0(rpu_code, "_lookup.csv"))
 
-gf_gpkg <- file.path("cache", "GF_CONUS.gpkg")
+gf_gpkg <- file.path("cache", "GF_CONUS_Merge.gpkg")
+poi_layer <- "merPOIs"
 
 rpu <- paste0("rpu_", rpu_code)
 split_meters <- 10000

workspace/hyRefactor_flines.Rmd

@@ -67,7 +67,7 @@ Read and filter catchments.
 
 Read POIs and add nhd outlets. Save to a non-spatial table.
 ```{r refactor}
-POIs <- read_sf(gf_gpkg, "POIs")
+POIs <- read_sf(gf_gpkg, poi_layer)
 
 POIs_in <- filter(POIs, !is.na(Type_NID))
 POIs_out <- filter(POIs, is.na(Type_NID))
@@ -91,8 +91,8 @@ outlets <- select(POIs, COMID) %>%
 
 events <- readRDS("data/gages_MDA.rds") %>%
   rename(COMID = Gage_COMID) %>%
-  right_join(select(st_drop_geometry(nhd), AreaSqKM, COMID, FromMeas), by = "COMID") %>%
-  filter(REACH_meas - FromMeas > 5 & AreaSqKM > 2)
+  right_join(select(st_drop_geometry(nhd), AreaSqKM, COMID, FromMeas, ToMeas), by = "COMID") %>%
+  filter(REACH_meas - FromMeas > 5 & AreaSqKM > 2 & ToMeas - REACH_meas > 5)
 
 if(needs_layer(out_gpkg, outlets_layer)) {
   write_sf(outlets, out_gpkg, outlets_layer)

workspace/merge.Rmd

@@ -4,19 +4,19 @@ library(sf)
 source("R/utils.R")
 source("hyRefactor_config.R")
 
-
 # 1 - Feat type
 # 2 - Name of geopackage (""- Navigate; "Collapse", "ND")
-in_gpkg <- ""
-# - Name of CONUS geopackage
-gf_gpkg <- "CONUS_Nav"
+in_gpkg <- "_Collapse"
+
+gf_gpkg <- "GF_CONUS_Merge.gpkg"
 
 # Navigate
+Merge_hydReg("merPOIs", in_gpkg, gf_gpkg)
 Merge_hydReg("HUC12", in_gpkg, gf_gpkg)
 Merge_hydReg("WB", in_gpkg, gf_gpkg)
 Merge_hydReg("WBOut",in_gpkg, gf_gpkg)
 Merge_hydReg("WBIn", in_gpkg, gf_gpkg)
-Merge_hydReg("Gages", in_gpkg, gf_gpkg)
+# Merge_hydReg("Gages", in_gpkg, gf_gpkg)
 Merge_hydReg("TE", in_gpkg, gf_gpkg)
 Merge_hydReg("NID", in_gpkg, gf_gpkg)
 Merge_hydReg("Conf", in_gpkg, gf_gpkg)