Update app.R

app.R

@@ -8,7 +8,7 @@ library(rnaturalearth)
 library(rnaturalearthdata)
 library(countrycode)
 library(ggplot2)
-library(ggiraph)       # <-- for interactive tooltips
+library(ggiraph)  # For interactive hover tooltips
 
 # =============================
 #            UI
@@ -55,12 +55,11 @@ ui <- dashboardPage(
         .sidebar-menu, .sidebar-menu li a, .sidebar-menu .fa {
           font-family: 'OCR A Extended', monospace !important;
         }
-
+        
         /* Header gradient background */
         .main-header .navbar {
           background: linear-gradient(to right, #3b6978, #204051) !important;
         }
-
         /* Logo area (left corner of the header) */
         .main-header .logo {
           background: #1b2a2f !important;
@@ -69,12 +68,10 @@ ui <- dashboardPage(
           font-size: 18px;
           font-weight: 600;
         }
-
         /* Sidebar background */
         .main-sidebar {
           background-color: #1b2a2f !important;
         }
-
         /* Active or hovered tab in the sidebar */
         .sidebar-menu > li.active > a,
         .sidebar-menu > li:hover > a {
@@ -82,19 +79,19 @@ ui <- dashboardPage(
           border-left-color: #78cdd7 !important;
           color: #ffffff !important;
         }
-
+        
         /* Sidebar menu item icons */
         .sidebar-menu .fa {
           color: #78cdd7 !important;
         }
-
+        
         /* Sidebar menu item text */
         .sidebar-menu > li > a {
           color: #b8c7ce !important;
           font-size: 15px;
           font-weight: 500;
         }
-
+        
         /* Customize the boxes */
         .box {
           border-top: none !important;
@@ -106,12 +103,10 @@ ui <- dashboardPage(
           color: #fff;
           border-radius: 6px 6px 0 0;
         }
-
         /* Plot box spacing */
         .box .box-body {
           padding: 0 !important;
         }
-
         /* Footer text styling (plot captions, etc.) */
         .small, small {
           font-size: 75%;
@@ -127,7 +122,7 @@ ui <- dashboardPage(
             width = 12,
             title = strong("Global Leadership Project (GLP)"),
             solidHeader = TRUE,
-            # Instead of plotOutput, we use girafeOutput for interactive tooltips
+            # Use girafeOutput instead of plotOutput
             div(
               style = "height: 80vh; padding: 10px;",
               girafeOutput("cartogramPlot", width = "100%", height = "100%")
@@ -144,37 +139,45 @@ ui <- dashboardPage(
 # =============================
 server <- function(input, output, session) {
   
-  # ---- Read CSV data and create ISO3 codes ----
+  # 1. Custom matches for countries not recognized by default in 'countrycode'
+  custom_iso_matches <- c("Kosovo" = "XKX",
+                          "Somaliland" = "SOM")  # or any valid code you prefer
+  
+  # 2. Read CSV data and create ISO3 codes with custom matches
   rankings_data <- reactive({
-    read_csv("CountryRepresentationRankings.csv") %>%
-      mutate(iso_a3 = countrycode(Country, origin = "country.name", destination = "iso3c"))
+    read_csv("CountryRepresentationRankings.csv", show_col_types = FALSE) %>%
+      mutate(iso_a3 = countrycode(
+        sourcevar     = Country,
+        origin        = "country.name",
+        destination   = "iso3c",
+        custom_match  = custom_iso_matches
+      ))
   })
   
-  # ---- Read/prepare world map shapefile ----
+  # 3. Read/prepare world map shapefile
   world_sf <- reactive({
     ne_countries(scale = "medium", returnclass = "sf") %>%
       dplyr::select(name, iso_a3, pop_est, geometry) %>%
       st_transform(crs = "ESRI:54009")  # Mollweide projection
   })
   
-  # ---- Create cartogram (currently a regular map) ----
+  # 4. Create the joined sf object (currently just a regular map)
   cartogram_sf <- reactive({
     merged_sf <- world_sf() %>%
       left_join(rankings_data(), by = "iso_a3")
-    # Filter out NA values in 'Overall' (or whichever main column) to avoid missing countries
+    # Filter out rows with missing 'Overall', if you want to exclude them
     merged_sf <- merged_sf[!is.na(merged_sf$Overall),]
-    return(merged_sf)
+    merged_sf
   })
   
-  # ---- Plot output (using ggiraph for tooltips) ----
+  # 5. Render the interactive map with ggiraph
   output$cartogramPlot <- renderGirafe({
     req(input$indexChoice)
     
     plot_data <- cartogram_sf()
     index_col <- input$indexChoice
     
-    # Build a tooltip string showing some key columns for each country.
-    # Modify this as desired to include more (or fewer) details.
+    # Build a tooltip string: customize to your preference
     plot_data$tooltip_text <- paste0(
       "<b>Country:</b> ", plot_data$Country, "<br/>",
       "<b>Overall:</b> ", ifelse(!is.na(plot_data$Overall), plot_data$Overall, "N/A"), "<br/>",
@@ -185,20 +188,21 @@ server <- function(input, output, session) {
       "<b>Language:</b> ", ifelse(!is.na(plot_data$Language), plot_data$Language, "N/A")
     )
     
-    # Create a ggplot with geom_sf_interactive so we can assign tooltips
+    # Use geom_sf_interactive with aes() + get() instead of aes_string()
     p <- ggplot(plot_data) +
       geom_sf_interactive(
-        aes_string(
-          fill = index_col,
-          tooltip = "tooltip_text",
-          data_id = "iso_a3"    # required for hover/click tracking
+        aes(
+          fill = get(index_col),
+          tooltip = tooltip_text,
+          data_id = iso_a3
         ),
         color = "grey20",
         size = 0.1
       ) +
       scale_fill_viridis_c(option = "D", na.value = "white") +
       coord_sf(expand = FALSE) +
-      theme_void(base_size = 14, base_family = "Courier New") +
+      # Use a generic base_family to avoid font errors
+      theme_void(base_size = 14, base_family = "sans") +
       labs(
         fill = paste(index_col, "Index"),
         title = "Country Representation Rankings",
@@ -214,14 +218,17 @@ server <- function(input, output, session) {
         legend.key.width = unit(2, "cm")
       )
     
-    # Wrap the ggplot in a girafe object
+    # Wrap the ggplot in a girafe object, including tooltip styling
     girafe(
       ggobj = p,
       width_svg  = 10,
       height_svg = 6,
       options = list(
-        # You can style the tooltip background here
-        opts_tooltip(css = "background-color: white; font-family: 'OCR A Extended', monospace;")
+        opts_tooltip(
+          css = "background-color: white; 
+                 font-family: 'OCR A Extended', monospace; 
+                 color: black;"
+        )
       )
     )
   })
@@ -230,4 +237,4 @@ server <- function(input, output, session) {
 # =============================
 #   Launch the Shiny App
 # =============================
-shinyApp(ui = ui, server = server)
+shinyApp(ui = ui, server = server)