stick with wcde-v3 - dont allow wcde-v31, wcde-v30

Author: guyabel

R/get_wcde.R

@@ -11,7 +11,7 @@
 #' @param pop_edu Character string for population educational attainment if `indicator` is set to `pop`. Defaults to `total`, but can be set to `four`, `six` or `eight`.
 #' @param include_scenario_names Logical vector of length one to indicate if to include additional columns for scenario names and short names. `FALSE` by default.
 #' @param server Character string for server to download from. Defaults to `iiasa`, but can use `github` or `1&1` if IIASA server is down. Can check availability by setting to `search-available`.
-#' @param version Character string for version of projections to obtain. Defaults to `wcde-v3`, but can use `wcde-v2` or `wcde-v1`. Scenario and indicator availability vary between versions.
+#' @param version Character string for version of projections to obtain. Defaults to `wcde-v31`, but can use `wcde-v2` or `wcde-v1`. Scenario and indicator availability vary between versions.
 #'
 #' @details If no `country_name` or `country_code` is provided data for all countries and regions are downloaded. A full list of available countries and regions can be found in the `wic_locations` data frame.
 #'
@@ -123,6 +123,8 @@ get_wcde <- function(
   country_code <- c(country_code, guessed_code)
 
   version <- match.arg(version)
+  # if(version == "wcde-v3")
+  #   version <- "wcde-v31"
 
   if(indicator == "pop"){
     pop_age <- match.arg(pop_age)

data-raw/wic_indicators.R

@@ -14,6 +14,18 @@ x <- dir_ls("./data-raw", type = "directory") %>%
          description = 2) %>%
   mutate_if(is.numeric, as.logical)
 
+# x0 <- x %>%
+#   filter(version == "wcde-v3") %>%
+#   mutate(version = "wcde-v30")
+#
+# x1 <- x %>%
+#   filter(version == "wcde-v3") %>%
+#   mutate(version = "wcde-v31")
+#
+# x <- x %>%
+#   bind_rows(x0) %>%
+#   bind_rows(x1)
+
 # latest definition - to many edits which messes up pivot wider later on
 d <- x %>%
   arrange(version) %>%
@@ -36,7 +48,10 @@ wic_indicators <- x %>%
   relocate(1, 2, contains("wcde")) %>%
   rename(wcde_v1 = `wcde-v1`,
          wcde_v2 = `wcde-v2`,
-         wcde_v3 = `wcde-v3`) %>%
+         wcde_v3 = `wcde-v3`,
+         # wcde_v30 = `wcde-v30`,
+         # wcde_v31 = `wcde-v31`
+         ) %>%
   mutate(
     wcde_v1 = case_when(
       wcde_v1 == FALSE ~ "projection-only",
@@ -49,7 +64,15 @@ wic_indicators <- x %>%
     wcde_v3 = case_when(
       wcde_v3 == FALSE ~ "projection-only",
       wcde_v3 == TRUE ~ "past-available",
-    )
+    ),
+    # wcde_v30 = case_when(
+    #   wcde_v30 == FALSE ~ "projection-only",
+    #   wcde_v30 == TRUE ~ "past-available",
+    # ),
+    # wcde_v31 = case_when(
+    #   wcde_v31 == FALSE ~ "projection-only",
+    #   wcde_v31 == TRUE ~ "past-available",
+    # )
   ) %>%
   rename("wcde-v1" = wcde_v1,
          "wcde-v2" = wcde_v2,

data/wic_indicators.rda

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 5007d75c-9231-421a-9ca0-6933d661f5b4
 
 RestoreWorkspace: No
 SaveWorkspace: No