Update app.R

app.R

@@ -341,12 +341,48 @@ server <- function(input, output, session) {
     )
     
     # Construct a label/popup-like text
+    # Construct an indicator function for clarity
+    starIfSelected <- function(colName) {
+      if (index_col == colName) "*" else ""
+    }
+    
+    # Build a label/popup to show all columns
     labels <- sprintf(
-      "<strong>Country:</strong> %s<br/>
-       <strong>%s Index:</strong> %s",
-      plot_data$Country,
-      index_col,
-      ifelse(is.na(plot_data[[index_col]]), "N/A", plot_data[[index_col]])
+      paste0(
+        "<strong>Country:</strong> %s<br/>",
+        "<strong>%sOverall:</strong> %s<br/>",
+        "<strong>%sRepresentation Gap:</strong> %s<br/>",
+        "<strong>%sEthnicity:</strong> %s<br/>",
+        "<strong>%sGender:</strong> %s<br/>",
+        "<strong>%sReligion:</strong> %s<br/>",
+        "<strong>%sLanguage:</strong> %s"
+      ),
+      # 1. Country
+      ifelse(is.na(plot_data$Country), "N/A", plot_data$Country),
+      
+      # 2. Overall
+      starIfSelected("Overall"),
+      ifelse(is.na(plot_data$Overall), "N/A", plot_data$Overall),
+      
+      # 3. RepresentationGap
+      starIfSelected("RepresentationGap"),
+      ifelse(is.na(plot_data$RepresentationGap), "N/A", plot_data$RepresentationGap),
+      
+      # 4. Ethnicity
+      starIfSelected("Ethnicity"),
+      ifelse(is.na(plot_data$Ethnicity), "N/A", plot_data$Ethnicity),
+      
+      # 5. Gender
+      starIfSelected("Gender"),
+      ifelse(is.na(plot_data$Gender), "N/A", plot_data$Gender),
+      
+      # 6. Religion
+      starIfSelected("Religion"),
+      ifelse(is.na(plot_data$Religion), "N/A", plot_data$Religion),
+      
+      # 7. Language
+      starIfSelected("Language"),
+      ifelse(is.na(plot_data$Language), "N/A", plot_data$Language)
     ) %>% lapply(htmltools::HTML)
     
     leafletProxy("cartogramPlot", data = plot_data) %>%
@@ -417,3 +453,4 @@ server <- function(input, output, session) {
 #   Launch the Shiny App
 # =============================
 shinyApp(ui = ui, server = server)
+