case-sensitivty on vpu

workspace/R/config.R

@@ -9,11 +9,11 @@ library(mapview)
 if(!exists("rpu_code")) {
   rv <- get_rpu_dependent_vars()
   rpu_code <- rv$r
-  VPU <- rv$v
+  vpu <- rv$v
 }
 
-if(!exists("VPU")) {
-  VPU <- get_rpu_dependent_vars(rpu_code)$v
+if(!exists("vpu")) {
+  vpu <- get_rpu_dependent_vars(rpu_code)$v
 }
 
 if(!nchar(out_agg_gpkg <- Sys.getenv("OUT_GPKG")) > 5) 
@@ -41,15 +41,15 @@ nhd_catchment <- "nhd_catchment"
 # Created and/or used during 02_Navigate
 elev_diff <- 500 # Max difference in elevation within a single segment/POI
 tt_diff <- 24 # Max number of hours between adjacent POIS
-nav_gpkg <- file.path("cache", paste0("reference_", VPU,".gpkg"))
-xwalk_layer <- paste0("HUC12_nhd_", VPU) # HUC12 - nhdcat crosswalk, built in Nav for VPU 20
-nav_poi_layer <- paste0("POIs_tmp_", VPU) # Rolling Nav POI layer added to/modified througout nav workflow
-WBs_layer <-  paste0("WB_", VPU) # Waterbodies within VPU
-poi_moved_layer <- paste0("POIs_mv_", VPU) # POIs moved from original COMID assignment
-nsegments_layer <- paste0("nsegment_", VPU) # Minimally-sufficient network dissolved by POI_ID
-pois_all_layer <- paste0("POIs_", VPU) # All POIs binded together
-poi_xwalk_layer <- paste0("poi_xwalk_layer_", VPU) # POIs that changed COMIDS during the navigate part of the workflow
-final_poi_layer <- paste0("final_POIS_", VPU)
+nav_gpkg <- file.path("cache", paste0("reference_", vpu,".gpkg"))
+xwalk_layer <- paste0("HUC12_nhd_", vpu) # HUC12 - nhdcat crosswalk, built in Nav for VPU 20
+nav_poi_layer <- paste0("POIs_tmp_", vpu) # Rolling Nav POI layer added to/modified througout nav workflow
+WBs_layer <-  paste0("WB_", vpu) # Waterbodies within VPU
+poi_moved_layer <- paste0("POIs_mv_", vpu) # POIs moved from original COMID assignment
+nsegments_layer <- paste0("nsegment_", vpu) # Minimally-sufficient network dissolved by POI_ID
+pois_all_layer <- paste0("POIs_", vpu) # All POIs binded together
+poi_xwalk_layer <- paste0("poi_xwalk_layer_", vpu) # POIs that changed COMIDS during the navigate part of the workflow
+final_poi_layer <- paste0("final_POIS_", vpu)
 
 # Settings for refactor workflow
 split_meters <- 10000
@@ -59,7 +59,7 @@ min_da_km <- 20
 # parallel factor for catchment reconciliation.
 para_reconcile <- 2
 para_split_flines <- 2
-keep_cat_points <- NULL
+keep_cat_points <- 1
 
 nhd_outlet <- "nhd_outlet"
 nhd_catchment <- "nhd_catchment"
@@ -73,20 +73,20 @@ agg_fline_layer <- "agg_fline"
 agg_cats_layer <- "agg_cats"
 outlets_layer <- "outlets"
 mapped_outlets_layer <- "mapped_outlets"
-lookup_VPU_layer <- paste0(VPU, "_lookup")
+lookup_VPU_layer <- paste0(vpu, "_lookup")
 
 # Defined during NonDend.Rmd
-ND_gpkg <- file.path("cache", paste0("ND_", VPU,".gpkg"))
-divides_xwalk <- paste0("divides_nhd_", VPU)
-HRU_layer <- paste0("poi_cats_", VPU)
-divides_nd <- paste0("divides_nd_", VPU)
-missing_terms <- paste0("miss_terms_", VPU)
-cat_boundary <- paste0("boundaries_", VPU)
-missing_cats <- paste0("miss_cats_", VPU)
+ND_gpkg <- file.path("cache", paste0("ND_", vpu,".gpkg"))
+divides_xwalk <- paste0("divides_nhd_", vpu)
+HRU_layer <- paste0("poi_cats_", vpu)
+divides_nd <- paste0("divides_nd_", vpu)
+missing_terms <- paste0("miss_terms_", vpu)
+cat_boundary <- paste0("boundaries_", vpu)
+missing_cats <- paste0("miss_cats_", vpu)
 
 
 # only used in HI?
-inc_pois_layer <- paste0("inc_POIs_", VPU) # layer of POIs used to derive first cut of segments
+inc_pois_layer <- paste0("inc_POIs_", vpu) # layer of POIs used to derive first cut of segments
 
 # Defined at various points for HI workflow
 #raw_wbd <- paste0("HU12_", VPU) # Raw HUC12

[Bock, Andy]

Thought we had tackled this before, but changed all VPU variable call-outs to lower-case ('vpu')