diff --git a/workspace/02_NHD_navigate.Rmd b/workspace/02_NHD_navigate.Rmd index 7dfde7228a9466264b3ba4e62817313552f2d0fd..fbd3ea4a9618ec7871627d870b24ef94097e6851 100644 --- a/workspace/02_NHD_navigate.Rmd +++ b/workspace/02_NHD_navigate.Rmd @@ -833,7 +833,7 @@ if(needs_layer(temp_gpkg, pois_all_layer)) { # bind together final_POIs <- bind_rows(tmp_POIs_fixed, new_POIs) %>% mutate(Type_Term = ifelse(nexus == 1, NA, Type_Term)) %>% - select(-ID) + select(-dplyr::any_of(c("ID"))) # Write out fixes write_sf(new_POIs, temp_gpkg, poi_moved_layer) diff --git a/workspace/05_hyRefactor_flines.Rmd b/workspace/05_hyRefactor_flines.Rmd index f4a783e7b6b7cb6b1ba46042eb1cac1e9c014ace..db49115d2fc9676ad696d5e696c369caff122909 100644 --- a/workspace/05_hyRefactor_flines.Rmd +++ b/workspace/05_hyRefactor_flines.Rmd @@ -105,8 +105,8 @@ if(needs_layer(out_refac_gpkg, refactored_layer)) { exclude_cats = c(outlets$COMID, avoid$COMID, POI_downstream$COMID), warn = TRUE) - write_sf(st_transform(read_sf(tf), crs), out_refac_gpkg, refactored_layer) - write_sf(st_transform(read_sf(tr), crs), out_refac_gpkg, reconciled_layer) + write_sf(st_transform(read_sf(tf), proj_crs), out_refac_gpkg, refactored_layer) + write_sf(st_transform(read_sf(tr), proj_crs), out_refac_gpkg, reconciled_layer) unlink(list(tf, tr)) rm(tf, tr) diff --git a/workspace/06-1_hyRefactor_cats.Rmd b/workspace/06-1_hyRefactor_cats.Rmd index 0a4a4c615751539ecd8969f4863c02cd318d0b69..389a1eaa2e2b2d534da960b54a9c46468eb2619c 100644 --- a/workspace/06-1_hyRefactor_cats.Rmd +++ b/workspace/06-1_hyRefactor_cats.Rmd @@ -24,7 +24,7 @@ source("R/utils.R") source("R/config.R") source("R/NHD_navigate.R") source("R/hyRefactor_funs.R") - +source("R/user_vars.R") ``` This reconcile-catchments step splits and combines catchment boundaries according to the process that was completed in refactor flines. @@ -63,13 +63,13 @@ if(needs_layer(out_refac_gpkg, divide_layer)) { split_cats$areasqkm <- as.numeric(units::set_units(sf::st_area(split_cats), "km^2")) - write_sf(sf::st_transform(split_cats, crs), out_refac_gpkg, split_divide_layer) + write_sf(sf::st_transform(split_cats, proj_crs), out_refac_gpkg, split_divide_layer) rm(split_cats) } unlink(cache_split) - write_sf(sf::st_transform(divides, crs), out_refac_gpkg, divide_layer) + write_sf(sf::st_transform(divides, proj_crs), out_refac_gpkg, divide_layer) } sf::st_layers(out_refac_gpkg) diff --git a/workspace/06-2_aggregate_cats.Rmd b/workspace/06-2_aggregate_cats.Rmd index 2527d1027c13923e710b008c5886b79efda57e07..06da2fe017bdf7d3c892bcfe29f2397acbf3693c 100644 --- a/workspace/06-2_aggregate_cats.Rmd +++ b/workspace/06-2_aggregate_cats.Rmd @@ -24,7 +24,7 @@ source("R/utils.R") source("R/config.R") source("R/NHD_navigate.R") source("R/hyRefactor_funs.R") - +source("R/user_vars.R") ``` Derive set of outlets to aggregate catchments for. There are three sets of @@ -44,12 +44,12 @@ outlets_POI <- read_sf(out_refac_gpkg, outlets_layer) %>% POIs_data <- read_sf(nav_gpkg, poi_data_table) # reconciled have no ID applied in refactoring flowlines -reconciled <- st_transform(read_sf(out_refac_gpkg, reconciled_layer), crs) +reconciled <- st_transform(read_sf(out_refac_gpkg, reconciled_layer), proj_crs) refactored <- st_drop_geometry(read_sf(out_refac_gpkg, refactored_layer)) %>% select(COMID, Hydroseq) %>% mutate(COMID = as.integer(COMID)) -divides <- st_transform(read_sf(out_refac_gpkg, divide_layer), crs) +divides <- st_transform(read_sf(out_refac_gpkg, divide_layer), proj_crs) lookup <- read_sf(out_refac_gpkg, lookup_table_refactor) %>% inner_join(select(st_drop_geometry(nhd), COMID, TotDASqKM), by = c("NHDPlusV2_COMID" = "COMID"))