Update character parsing

rOpenSpain · Jul 30, 2024 · cc2ee8e · cc2ee8e
1 parent 6825d04
commit cc2ee8e
Show file tree

Hide file tree

Showing 12 changed files with 153 additions and 214 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -32,8 +32,8 @@ Suggests:
 VignetteBuilder: 
     knitr
 Config/Needs/coverage: covr
-Config/Needs/website: reactable, styler, tidyverse,
-    ropenspain/rostemplate, devtools, cpp11, remotes
+Config/Needs/website: cpp11, devtools, progress, reactable, remotes,
+    styler, tidyverse, ropenspain/rostemplate
 Config/testthat/edition: 3
 Config/testthat/parallel: true
 Copyright: See file inst/COPYRIGHTS

diff --git a/R/catalogs.R b/R/catalogs.R
@@ -117,7 +117,7 @@ bde_catalog_load <- function(catalog = c("ALL", "BE", "SI", "TC", "TI", "PB"),
     catalog_load <- read.csv2(catalog_file,
       sep = ",",
       stringsAsFactors = FALSE, na.strings = "",
-      header = FALSE
+      header = FALSE, fileEncoding = "latin1"
     )
 
     # Convert names
@@ -263,13 +263,9 @@ bde_catalog_update <- function(catalog = c("ALL", "BE", "SI", "TC", "TI", "PB"),
   }
   # nocov end
 
-
   # Get cache dir
   cache_dir <- bde_hlp_cachedir(cache_dir = cache_dir, verbose = verbose)
 
-
-
-
   # Loop and download
   catalog_download <- catalog
   if ("ALL" %in% catalog) {
@@ -296,8 +292,7 @@ bde_catalog_update <- function(catalog = c("ALL", "BE", "SI", "TC", "TI", "PB"),
 
     # Download
     result <- bde_hlp_download(
-      url = full_url,
-      local_file = local_file,
+      url = full_url, local_file = local_file,
       verbose = verbose
     )
     return(result)
@@ -376,13 +371,11 @@ bde_catalog_search <- function(pattern, ...) {
   search_match_rows <- NULL
   # Loop thorugh cols
   for (i in col_ind) {
-    search_match_rows <- unique(c(
-      search_match_rows,
-      grep(pattern, catalog_search[[i]],
-        ignore.case = TRUE,
-        useBytes = TRUE
-      )
-    ))
+    search_match_rows <- unique(
+      c(search_match_rows, grep(pattern, catalog_search[[i]],
+        ignore.case = TRUE, useBytes = TRUE
+      ))
+    )
   }
 
   search_results <- catalog_search[search_match_rows, ]

diff --git a/R/indicators.R b/R/indicators.R
@@ -47,8 +47,7 @@ bde_ind_unemployment_rate <-
   function(series_label = "Unemployment_Rate", ...) {
     seq_num <- 4635980
 
-    econom_ind <-
-      bde_series_load(seq_num, series_label = series_label, ...)
+    econom_ind <- bde_series_load(seq_num, series_label = series_label, ...)
     econom_ind <- econom_ind[!is.na(econom_ind[[2]]), ]
 
     return(econom_ind)
@@ -62,8 +61,7 @@ bde_ind_euribor_12m_monthly <-
            ...) {
     seq_num <- 587853
 
-    econom_ind <-
-      bde_series_load(seq_num, series_label = series_label, ...)
+    econom_ind <- bde_series_load(seq_num, series_label = series_label, ...)
     econom_ind <- econom_ind[!is.na(econom_ind[[2]]), ]
 
     return(econom_ind)
@@ -76,8 +74,7 @@ bde_ind_euribor_12m_daily <-
   function(series_label = "Euribor_12M_Daily", ...) {
     seq_num <- 905842
 
-    econom_ind <-
-      bde_series_load(seq_num, series_label = series_label, ...)
+    econom_ind <- bde_series_load(seq_num, series_label = series_label, ...)
     econom_ind <- econom_ind[!is.na(econom_ind[[2]]), ]
 
     return(econom_ind)
@@ -90,8 +87,7 @@ bde_ind_cpi_var <-
   function(series_label = "Consumer_price_index_YoY", ...) {
     seq_num <- 4144807
 
-    econom_ind <-
-      bde_series_load(seq_num, series_label = series_label, ...)
+    econom_ind <- bde_series_load(seq_num, series_label = series_label, ...)
     econom_ind <- econom_ind[!is.na(econom_ind[[2]]), ]
 
     return(econom_ind)
@@ -103,8 +99,7 @@ bde_ind_cpi_var <-
 bde_ind_ibex_monthly <- function(series_label = "IBEX_index_month", ...) {
   seq_num <- 254433
 
-  econom_ind <-
-    bde_series_load(seq_num, series_label = series_label, ...)
+  econom_ind <- bde_series_load(seq_num, series_label = series_label, ...)
   econom_ind <- econom_ind[!is.na(econom_ind[[2]]), ]
 
   return(econom_ind)
@@ -116,8 +111,7 @@ bde_ind_ibex_monthly <- function(series_label = "IBEX_index_month", ...) {
 bde_ind_ibex_daily <- function(series_label = "IBEX_index_day", ...) {
   seq_num <- 821340
 
-  econom_ind <-
-    bde_series_load(seq_num, series_label = series_label, ...)
+  econom_ind <- bde_series_load(seq_num, series_label = series_label, ...)
   econom_ind <- econom_ind[!is.na(econom_ind[[2]]), ]
 
   return(econom_ind)
@@ -129,8 +123,7 @@ bde_ind_ibex_daily <- function(series_label = "IBEX_index_day", ...) {
 bde_ind_gdp_quarterly <- function(series_label = "GDP_quarterly_value", ...) {
   seq_num <- 3777060
 
-  econom_ind <-
-    bde_series_load(seq_num, series_label = series_label, ...)
+  econom_ind <- bde_series_load(seq_num, series_label = series_label, ...)
   econom_ind <- econom_ind[!is.na(econom_ind[[2]]), ]
 
   return(econom_ind)
@@ -143,8 +136,7 @@ bde_ind_gdp_quarterly <- function(series_label = "GDP_quarterly_value", ...) {
 bde_ind_population <- function(series_label = "Population_Spain", ...) {
   # seq_num <- 3078287
   #
-  # econom_ind <-
-  #   bde_series_load(seq_num, series_label = series_label, ...)
+  # econom_ind <- bde_series_load(seq_num, series_label = series_label, ...)
   # econom_ind <- econom_ind[!is.na(econom_ind[[2]]), ]
   #
   # return(econom_ind)

diff --git a/R/scales.R b/R/scales.R
@@ -57,11 +57,7 @@ scale_color_bde_d <- function(
   cols_v <- bde_tidy_palettes(palette = palette, alpha = alpha, rev = rev)
   pal <- scales::manual_pal(cols_v)
 
-  ggplot2::discrete_scale(
-    aesthetics = "color",
-    palette = pal,
-    ...
-  )
+  ggplot2::discrete_scale(aesthetics = "color", palette = pal, ...)
 }
 
 #' @rdname scales_bde
@@ -81,11 +77,7 @@ scale_fill_bde_d <- function(
   cols_v <- bde_tidy_palettes(palette = palette, alpha = alpha, rev = rev)
   pal <- scales::manual_pal(cols_v)
 
-  ggplot2::discrete_scale(
-    aesthetics = "fill",
-    palette = pal,
-    ...
-  )
+  ggplot2::discrete_scale(aesthetics = "fill", palette = pal, ...)
 }
 
 
@@ -104,8 +96,7 @@ scale_color_bde_c <- function(
       rev = rev
     ),
     "bde_qual_pal" = bde_tidy_palettes(6, "bde_qual_pal",
-      alpha = alpha,
-      rev = rev
+      alpha = alpha, rev = rev
     ),
     "bde_rose_pal" = bde_tidy_palettes(6, "bde_rose_pal",
       alpha = alpha,
@@ -149,10 +140,10 @@ scale_fill_bde_c <- function(
       rev = rev
     )[c(1, 2, 3, 6, 5, 4)]
   )
+
   ggplot2::continuous_scale(
     aesthetics = "fill",
     palette = scales::gradient_n_pal(cols),
-    guide = guide,
-    ...
+    guide = guide, ...
   )
 }