diff --git a/DESCRIPTION b/DESCRIPTION index 11faadd..66ca73e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -11,7 +11,7 @@ License: MIT + file LICENSE Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 Imports: dplyr, forcats, diff --git a/R/data.R b/R/data.R index cbb5a7b..f707415 100644 --- a/R/data.R +++ b/R/data.R @@ -1,6 +1,6 @@ #' Menu, current #' -#' @source https://www.imf.org/en/Publications/WEO/weo-database/2023/October +#' @source https://www.imf.org/en/Publications/WEO/weo-database/2024/April #' @format A list. #' \describe{ #' \item{a_menu}{ @@ -26,8 +26,7 @@ #' Meta data, current #' -#' @source https://www.imf.org/en/Publications/WEO/weo-database/2023/April/download-entire-database -#' @format A list. +#' @source https://www.imf.org/en/Publications/WEO/weo-database/2024/April #' \describe{ #' \item{area}{ #' @format A tibble. @@ -44,9 +43,9 @@ #' IMF World Economic Outlook data, current #' -#' Economic data published in October 2023. +#' Economic data published in April 2024. #' -#' @source https://www.imf.org/en/Publications/WEO/weo-database/2023/October +#' @source https://www.imf.org/en/Publications/WEO/weo-database/2024/April #' @format A tibble. #' \describe{ #' \item{unit}{refer to meta unit} @@ -59,13 +58,13 @@ #' \item{year}{year like 1980} #' \item{value}{observed value} #' } -"data_2310" +"data_2404" #' IMF World Economic Outlook data, previous #' -#' Economic data published in April 2023. Cut to since 2019 only. +#' Economic data published in October 2023. Cut to since 2020 only. #' -#' @source https://www.imf.org/en/Publications/WEO/weo-database/2023/April +#' @source https://www.imf.org/en/Publications/WEO/weo-database/2023/October #' @format A tibble. #' \describe{ #' \item{unit}{refer to meta unit} @@ -78,4 +77,4 @@ #' \item{year}{year like 1980} #' \item{value}{observed value} #' } -"data_2304_cut" \ No newline at end of file +"data_2310_cut" \ No newline at end of file diff --git a/R/main.R b/R/main.R index f2452ef..b1a62e2 100644 --- a/R/main.R +++ b/R/main.R @@ -17,7 +17,7 @@ #' } mainApp <- function(data_current, data_prev, name_current, name_prev) { # Define UI for application - ui <- navbarPage("IMF World Economic Outlook, October 2023", + ui <- navbarPage("IMF World Economic Outlook, April 2024", tags$head(includeHTML(("google-analytics.html"))), selected = "By area", diff --git a/R/selectArea.R b/R/selectArea.R index 1101148..78118a1 100644 --- a/R/selectArea.R +++ b/R/selectArea.R @@ -50,18 +50,18 @@ selectAreaUI <- function(id, a_menu, c_menu) { sliderInput(NS(id, "year_range"), label = h4("Select year range"), min = 1980, - max = 2028, - value = c(1980, 2028), + max = 2029, + value = c(1980, 2029), sep = "" ), - + # Toggle add previous forecast or not - radioButtons(NS(id, "previous"), "Add April 2023 forecast?", c("Yes", "No"), + radioButtons(NS(id, "previous"), "Add October 2023 forecast?", c("Yes", "No"), selected = "No"), # Show source and Shiny app creator a( - href = "https://www.imf.org/en/Publications/WEO/weo-database/2023/October", + href = "https://www.imf.org/en/Publications/WEO/weo-database/2024/April", "Source: IMF" ), br(), diff --git a/app.R b/app.R index 577cfb1..aa2f916 100644 --- a/app.R +++ b/app.R @@ -1,3 +1,3 @@ pkgload::load_all(".") -mainApp(data_current = data_2310, data_prev = data_2304_cut, - name_current = "2310", name_prev = "2304") +mainApp(data_current = data_2404, data_prev = data_2310_cut, + name_current = "2404", name_prev = "2310") diff --git a/appFileManifest b/appFileManifest index b6db77c..b718d5d 100644 --- a/appFileManifest +++ b/appFileManifest @@ -7,8 +7,8 @@ R/main.R R/output.R R/selectArea.R R/utils-pipe.R -data/data_2304_cut.rda -data/data_2310.rda +data/data_2310_cut.rda +data/data_2404.rda data/menu.rda data/meta.rda google-analytics.html diff --git a/data-raw/cut_previous.R b/data-raw/cut_previous.R index 400a2c8..0a01606 100644 --- a/data-raw/cut_previous.R +++ b/data-raw/cut_previous.R @@ -1,8 +1,8 @@ library(tidyverse) -load("data-old/data_2304.rda") +load("data-old/data_2310.rda") -data_2304_cut <- data_2304 %>% - filter(year >= 2019) +data_2310_cut <- data_2310 %>% + filter(year >= 2020) -usethis::use_data(data_2304_cut) +usethis::use_data(data_2310_cut) diff --git a/data-raw/setup_current.R b/data-raw/setup_current.R index ea3e1a0..6e52e12 100644 --- a/data-raw/setup_current.R +++ b/data-raw/setup_current.R @@ -3,8 +3,8 @@ library(tidyverse) library(janitor) # Bulk download from IMF World Economic Outlook Database -# https://www.imf.org/en/Publications/WEO/weo-database/2023/October/download-entire-database -sdmx_file <- "downloads/WEO_PUB_OCT2023.xml" +# https://www.imf.org/en/Publications/WEO/weo-database/2024/April/download-entire-database +sdmx_file <- "downloads/WEO_PUB_APR2024.xml" sdmx <- rsdmx::readSDMX(sdmx_file, isURL = FALSE) @@ -32,8 +32,8 @@ weo_df <- weo_df %>% ) # Download meta data -# https://www.imf.org/en/Publications/WEO/weo-database/2023/October/download-entire-database -meta_file <- "downloads/weooct2023-sdmx-dsd.xlsx" +# https://www.imf.org/en/Publications/WEO/weo-database/2024/April/download-entire-database +meta_file <- "downloads/weopub-dsd-apr2024.xlsx" sheets <- readxl::excel_sheets(meta_file) @@ -123,8 +123,8 @@ names(scales) <- meta_list[[6]]$description names(scales)[3:4] <- "" # make a list -data_2310 <- weo_df %>% - replace_na(list(scale = 1)) # avoid NAs in scale in 2310 +data_2404 <- weo_df %>% + replace_na(list(scale = 1)) # avoid NAs in scale in 2404 menu <- list( a_menu = list( @@ -147,6 +147,6 @@ meta <- list( ) # save -usethis::use_data(data_2310, menu, meta, overwrite = TRUE) +usethis::use_data(data_2404, menu, meta, overwrite = TRUE) diff --git a/data/data_2304_cut.rda b/data/data_2304_cut.rda deleted file mode 100644 index f564957..0000000 Binary files a/data/data_2304_cut.rda and /dev/null differ diff --git a/data/data_2310.rda b/data/data_2310.rda deleted file mode 100644 index 5bfe978..0000000 Binary files a/data/data_2310.rda and /dev/null differ diff --git a/data/data_2310_cut.rda b/data/data_2310_cut.rda new file mode 100644 index 0000000..c0109ff Binary files /dev/null and b/data/data_2310_cut.rda differ diff --git a/data/data_2404.rda b/data/data_2404.rda new file mode 100644 index 0000000..ebd500d Binary files /dev/null and b/data/data_2404.rda differ diff --git a/data/menu.rda b/data/menu.rda index 0829143..d0a9868 100644 Binary files a/data/menu.rda and b/data/menu.rda differ diff --git a/data/meta.rda b/data/meta.rda index 889865d..fe55c75 100644 Binary files a/data/meta.rda and b/data/meta.rda differ diff --git a/man/data_2310.Rd b/man/data_2310_cut.Rd similarity index 78% rename from man/data_2310.Rd rename to man/data_2310_cut.Rd index 5cc5d5d..a54d3d6 100644 --- a/man/data_2310.Rd +++ b/man/data_2310_cut.Rd @@ -1,9 +1,9 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/data.R \docType{data} -\name{data_2310} -\alias{data_2310} -\title{IMF World Economic Outlook data, current} +\name{data_2310_cut} +\alias{data_2310_cut} +\title{IMF World Economic Outlook data, previous} \format{ A tibble. \describe{ @@ -22,9 +22,9 @@ A tibble. https://www.imf.org/en/Publications/WEO/weo-database/2023/October } \usage{ -data_2310 +data_2310_cut } \description{ -Economic data published in October 2023. +Economic data published in October 2023. Cut to since 2020 only. } \keyword{datasets} diff --git a/man/data_2304_cut.Rd b/man/data_2404.Rd similarity index 67% rename from man/data_2304_cut.Rd rename to man/data_2404.Rd index 4dca68b..7552a7b 100644 --- a/man/data_2304_cut.Rd +++ b/man/data_2404.Rd @@ -1,9 +1,9 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/data.R \docType{data} -\name{data_2304_cut} -\alias{data_2304_cut} -\title{IMF World Economic Outlook data, previous} +\name{data_2404} +\alias{data_2404} +\title{IMF World Economic Outlook data, current} \format{ A tibble. \describe{ @@ -19,12 +19,12 @@ A tibble. } } \source{ -https://www.imf.org/en/Publications/WEO/weo-database/2023/April +https://www.imf.org/en/Publications/WEO/weo-database/2024/April } \usage{ -data_2304_cut +data_2404 } \description{ -Economic data published in April 2023. Cut to since 2019 only. +Economic data published in April 2024. } \keyword{datasets} diff --git a/man/menu.Rd b/man/menu.Rd index 10e7384..aa39447 100644 --- a/man/menu.Rd +++ b/man/menu.Rd @@ -30,7 +30,7 @@ A list. } } \source{ -https://www.imf.org/en/Publications/WEO/weo-database/2023/October +https://www.imf.org/en/Publications/WEO/weo-database/2024/April } \usage{ menu diff --git a/man/meta.Rd b/man/meta.Rd index 27c40ad..059165f 100644 --- a/man/meta.Rd +++ b/man/meta.Rd @@ -5,10 +5,6 @@ \alias{meta} \title{Meta data, current} \format{ -A list. -\describe{ -\item{area}{ - A tibble. \describe{ \item{code}{"111"} @@ -21,7 +17,9 @@ A tibble. } } \source{ -https://www.imf.org/en/Publications/WEO/weo-database/2023/April/download-entire-database +https://www.imf.org/en/Publications/WEO/weo-database/2024/April +\describe{ +\item{area}{ } \usage{ meta