From 5f5ec7823688abc3af8afc4790985490f4c5bd3b Mon Sep 17 00:00:00 2001 From: Andy Bock <abock@usgs.gov> Date: Mon, 25 Apr 2022 09:32:40 -0600 Subject: [PATCH] Mods for clean cats --- workspace/07-2_NonDend.Rmd | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/workspace/07-2_NonDend.Rmd b/workspace/07-2_NonDend.Rmd index fe535cc..150a96a 100644 --- a/workspace/07-2_NonDend.Rmd +++ b/workspace/07-2_NonDend.Rmd @@ -38,6 +38,8 @@ if (vpu == "20"){ full_nhd <- readRDS(file.path(data_paths$nhdplus_dir, "nhdplus_flowline.rds")) } +elev <- data_paths$elev_cm[grepl(paste0("Ned", substr(vpu, 1, 2)), data_paths$elev_cm, ignore.case = TRUE)] + # HUC extraction for specific NHD+ vpus if(vpu == "02"){ grep_exp <-"^02|^04" @@ -45,6 +47,7 @@ if(vpu == "02"){ grep_exp <- "^03|^08" } else { grep_exp <- paste0("^", substr(vpu, start = 1, stop = 2)) + elev <- append(elev, list(rpu_03g = data_paths$elev_cm$rpu_03g)) } cat_rpu_table <- readRDS(data_paths$fullcats_table) @@ -57,8 +60,6 @@ full_nhd <- full_nhd %>% vpu_WBD <- readRDS(file.path(data_paths$nhdplus_dir, "HUC12.rds")) %>% filter(grepl(paste0("^", grep_exp, ".*"), .data$HUC_12)) -elev <- data_paths$elev_cm[grepl(paste0("Ned", vpu), data_paths$elev_cm, ignore.case = TRUE)] - nhd <- st_transform(read_sf(gf_gpkg, nhd_flowline), crs) cats <- st_transform(read_sf(gf_gpkg, nhd_catchment), crs) divides <- st_transform(read_sf(gf_gpkg, divide_layer), crs) @@ -98,7 +99,7 @@ if(needs_layer(ND_gpkg, xwalk_layer)){ # Bring over divides/HUC12 intersection information into divides layer xwalk_nhd_wbd <- st_drop_geometry(nhd_wbd_int$cats_HUC12) %>% - select(-c(ACRES, SOURCEFC, Shape_Length, Shape_Area, HU_12_MOD)) + select(-c(ACRES, HU_12_MOD)) rm(nhd_wbd_int) @@ -301,6 +302,10 @@ if(needs_layer(ND_gpkg, "missing_cats")){ nhd = full_nhd, elev = elev), by = "outlet_COMID") + # yohoho <- miss_term_assign(term_outlets = term_outlets_wPOI, + # divides_poi = divides_lu, + # nhd = full_nhd, elev = elev) + write_sf(term_outlets_wPOI, ND_gpkg, missing_terms) } else { term_outlets_wPOI <- read_sf(ND_gpkg, missing_terms) @@ -350,7 +355,7 @@ if(needs_layer(ND_gpkg, "missing_cats")){ st_make_valid() # Prob HRU - filter(all_hrus, POI_ID == 140402000209) - all_hrus <- divides_lu %>% + all_hrus <- filter(divides_lu, !is.na(POI_ID)) %>% group_by(POI_ID) %>% summarize(do_union = T) %>% sfheaders::sf_remove_holes(.) %>% -- GitLab