load_epe() reshaping (#270)

* 2

* energy_consumption_per_class

Resolvido Issue 1/2

* download matriz balanço energetico

Download da matriz de balanço energito raw, corrigindo caminho e método. Sem desenvolvimento mais a fundo a esperar contato do victor hugo. Optado pelo balaço consolidado por organização dos dados.

* dataset ajustados

* Ajuste aos pedido

* final

Adicionada a limpeza completa do balanço e realizados os preparativos fianis. Notas: Revisar se a versão colocada é a correta (estava diferente em DESCRIPTION e em NEWS. Chega se formatação do README está correta. devtools_check() apresentou apenas 2 "Notes", sem warning ou error.

* binding global vars + readme

* removing redundant code, making it faster

---------

Co-authored-by: Igor Rigolon <igor.rilave@hotmail.com>
Co-authored-by: IgorRigolon <77173467+IgorRigolon@users.noreply.github.com>

Author: bernardo-sieira

DESCRIPTION

@@ -17,7 +17,8 @@ Authors@R: c(
     person("Francisco", "de Lima Cavalcanti", , "francisco.lima.cavalcanti@gmail.com", role = "aut"),
     person("Maria", "Mittelbach", , "mariamittelbach@gmail.com", role = "aut"),
     person("Felipe", "de Moraes Nunes", , "felipedmoraesn@gmail.com", role = "aut"),
-    person("Joao Paulo","Santos P. Barbosa",,"joao.31582129@gmail.com", role = "aut")
+    person("Joao Paulo","Santos P. Barbosa",,"joao.31582129@gmail.com", role = "aut"),
+    person("Bernardo","Furlanetto Sieira",,"bernardo.sieira@gmail.com", role = "aut")
   )
 Description: Functions to download and treat data regarding the Brazilian
     Amazon region from a variety of official sources.

NEWS.md

@@ -1,11 +1,15 @@
 # datazoom.amazonia 1.1.3.9000 (development version)
 
-  * Added support for four new SIH datasets in the load_datasus() function:
-  "datasus_sih_rd" – Reduced AIHs (summary of hospitalizations)
-  "datasus_sih_sp" – Professional Services performed during hospitalizations
-  "datasus_sih_rj" – Rejected AIHs with general rejection reasons
-  "datasus_sih_er" – Rejected AIHs with specific error codes
+  * Updated `download.R` to read the data now avaiable at the EPE website.
+  
+  * Updated `load_epe` which has now 3 parameters following the split of `energy_consumption_per_class` in `industrial_energy_consumption` and `consumer_energy_consumption`. 
 
+  * Added support for four new SIH datasets in the load_datasus() function:
+    * "datasus_sih_rd" – Reduced AIHs (summary of hospitalizations)
+    * "datasus_sih_sp" – Professional Services performed during hospitalizations
+    * "datasus_sih_rj" – Rejected AIHs with general rejection reasons
+    * "datasus_sih_er" – Rejected AIHs with specific error codes
+    
 # datazoom.amazonia 1.1.2.9000 (development version)
 
   * Updated `load_mapbiomas` to download the newest Mapbiomas Collections and to warn about the currently unavailable download URL of the datasets water and irrigation. Also added the Indigenous Lands option to the `"mapbiomas_cover"` dataset.

R/download.R

@@ -466,11 +466,6 @@ external_download <- function(dataset = NULL, source = NULL, year = NULL,
   if (source == "imazon") {
     file_extension <- ".rds"
   }
-  if (source == "epe") {
-    if (param$dataset == "national_energy_balance") {
-      file_extension <- ".csv"
-    }
-  }
   if (source == "aneel") {
     if (dataset == "energy_development_budget") {
       file_extension <- ".rds"
@@ -504,11 +499,6 @@ external_download <- function(dataset = NULL, source = NULL, year = NULL,
       options(timeout = 1000) # increase timeout limit
     }
   }
-  if (source == "epe") {
-    if (dataset == "national_energy_balance") {
-      download_method <- "googledrive"
-    }
-  }
   if (source %in% c("deter", "terraclimate", "baci", "sigmine", "mapbiomas")) {
     download_method <- "curl"
     quiet <- FALSE
@@ -608,37 +598,22 @@ external_download <- function(dataset = NULL, source = NULL, year = NULL,
     }
   }
 
-  if (param$source == "epe" & param$dataset == "energy_consumption_per_class") {
-    # param$sheet contains the selected sheets
-
-    # Making a list with all the sheets
-    dat <- purrr::imap(
-      param$sheet,
-      function(sheets, number) {
-        base::message(
-          paste0("Reading sheet ", number, " out of ", length(param$sheet), " (", sheets, ")")
-        )
-        base::suppressMessages(
-          readxl::read_xls(temp, sheet = sheets)
-        )
-      }
-    )
-
-    names(dat) <- param$sheet
-  }
   if (param$source == "aneel") {
     if (param$dataset == "energy_enterprises_distributed") {
       dat <- data.table::fread(temp, encoding = "Latin-1")
     } else if (dataset == "energy_generation") {
-      dat <- readxl::read_xlsx(temp, sheet = param$sheet, skip = param$skip_rows, na = c("-", ""))
+      dat <- readxl::read_xlsx(temp, sheet = param$sheet,skip = param$skip_rows,na = c("-", ""))
     }
-  }
-
-  if (param$source == "ips") {
+  } else if (param$source == "ips") {
     dat <- param$sheet %>%
       purrr::map(
         ~ readxl::read_xlsx(temp, sheet = .)
       )
+  } else if (param$source == "epe") {
+    dat <- param$sheet %>%
+      purrr::map(
+        ~ base::suppressMessages(readxl::read_xlsx(temp, sheet = .))
+      )
   }
 
   ## Now the rest of the functions
@@ -953,8 +928,9 @@ datasets_link <- function(source = NULL, dataset = NULL, url = FALSE) {
 
     ## EPE
 
-    "epe", "energy_consumption_per_class", NA, "2004-2021", "Region, Subsystem, State", "https://www.epe.gov.br/sites-pt/publicacoes-dados-abertos/publicacoes/Documents/CONSUMO%20MENSAL%20DE%20ENERGIA%20EL%c3%89TRICA%20POR%20CLASSE.xls",
-    "epe", "national_energy_balance", NA, "2011-2022", NA, "https://drive.google.com/file/d/1_JTYyAPdbQayR-nrURts6OmbKcm2cLix/view?usp=share_link",
+    "epe", "industrial_energy_consumption", NA, "2004-2025", "Region, Subsystem, State", "https://www.epe.gov.br/sites-pt/publicacoes-dados-abertos/dados-abertos/Documents/Dados_abertos_Consumo_Mensal.xlsx",
+    "epe", "consumer_energy_consumption", NA, "2004-2025", "Region, Subsystem, State", "https://www.epe.gov.br/sites-pt/publicacoes-dados-abertos/dados-abertos/Documents/Dados_abertos_Consumo_Mensal.xlsx",
+    "epe", "national_energy_balance", NA, "2003-2023", NA, "https://www.epe.gov.br/sites-pt/publicacoes-dados-abertos/publicacoes/PublicacoesArquivos/publicacao-819/topico-716/Anexo%20IX%20-%20Balan%C3%A7os%20Consolidados%20(em%20tep)%201970%20a%202023.xlsx",
 
     ## Shapefile from github repository