add local option

bcgov · Oct 17, 2024 · 8489b00 · 8489b00
1 parent 1d0b335
commit 8489b00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/R/append_clim_vars.R b/R/append_clim_vars.R
@@ -717,5 +717,5 @@ append_clim_vars <- function(dt, vars) {
   }
 
   # Reorder to match vars
-  setcolorder(dt, c(names(dt)[names(dt) %in% c("id", "DATASET", "GCM", "SSP", "RUN", "PERIOD")], vars))
+  setcolorder(dt, c(names(dt)[names(dt) %in% c("id", "DATASET", "GCM", "SSP", "RUN", "PERIOD")], unique(vars)))
 }
diff --git a/R/downscale.R b/R/downscale.R
@@ -50,6 +50,7 @@
 #' @template max_run
 #' @template run_nm
 #' @param cache logical. Cache data locally? Default `TRUE`
+#' @param local logical. Is the postgres database local? Default `FALSE`
 #' @param ... other arguments passed to [`downscale_core()`]. Namely: `return_refperiod`,
 #'   `vars`, `out_spatial` and `plot`
 
@@ -110,7 +111,9 @@ downscale <- function(xyz, which_refmap = "auto",
                       gcm_periods = NULL, gcm_ssp_years = NULL,
                       gcm_hist_years = NULL, max_run = 0L,
                       run_nm = NULL,
-                      cache = TRUE, ...) {
+                      cache = TRUE,
+                      local = FALSE,
+                      ...) {
   message("Welcome to climr!")
 
   ## checks
@@ -123,7 +126,7 @@ downscale <- function(xyz, which_refmap = "auto",
   expectedCols <- c("lon", "lat", "elev", "id")
   xyz <- .checkXYZ(copy(xyz), expectedCols)
 
-  dbCon <- data_connect()
+  dbCon <- data_connect(local = local)
   thebb <- get_bb(xyz) ## get bounding box based on input points
 
   rmCols <- setdiff(names(xyz), expectedCols)