diff --git a/workspace/07-1_merge.Rmd b/workspace/07-1_merge.Rmd index 827742da43ba6612b6b827464fa4942c25ece4b2..5a8202306c61905921e72b1ad8c762a7120ee402 100644 --- a/workspace/07-1_merge.Rmd +++ b/workspace/07-1_merge.Rmd @@ -28,18 +28,17 @@ source("R/config.R") For a given VPU bind RPUs into a single geopackage for an entire VPU. This step is intended to be run after Refactor flowlines/cats. For a given VPU, this binds the results of aggregated from the associated RPUs into a single layer and writes them out to a single geopackage for the non-dendritic work. -```{r Bind RPUs} -if(needs_layer(gf_gpkg, agg_cats_layer)) { +```{r refactor} +if(needs_layer(rfc_gpkg, divide_layer)) { # Thematic POIs - POIs <- read_sf(nav_gpkg, final_poi_layer) %>% - st_transform(crs) + POIs <- read_sf(nav_gpkg, poi_data_table) %>% + select(-geom_id) - # write_sf(POIs, rfc_gpkg, final_poi_layer) - # - # write_sf(POIs, gf_gpkg, final_poi_layer) - # - merged_layers <- merge_refactor(rpu_codes$rpuid, rpu_vpu_out, + sf::write_sf(POIs, gf_gpkg, poi_data_table) + + merged_layers <- merge_refactor(rpu_codes$rpuid, + rpu_vpu_out, lookup_table_refactor, reconciled_layer, divide_layer, @@ -61,9 +60,7 @@ if(needs_layer(gf_gpkg, agg_cats_layer)) { sf::write_sf(merged_layers[[split_divide_layer]], rfc_gpkg, split_divide_layer) - - sf::write_sf(merged_layers[[mapped_outlets_layer]], rfc_gpkg, mapped_outlets_layer) - + sf::write_sf(merged_layers[[mapped_outlets_layer]], gf_gpkg, mapped_outlets_layer) merged_layers[[agg_cats_layer]] <- merged_layers[[agg_cats_layer]] %>% @@ -93,6 +90,5 @@ if(needs_layer(gf_gpkg, agg_cats_layer)) { id = aggregated_flowpath_ID, levelpathid = LevelPathID))) %>% sf::write_sf(gf_gpkg, catchment_network_table) - } ```