Update app.R

app.R

@@ -2,28 +2,23 @@ library(shiny)
 library(dplyr)
 library(ggplot2)
 library(utils)
+library(ggiraph)
+library(htmlwidgets)
 
 data1 <- read.csv("data1.csv", header = TRUE, check.names = FALSE, fileEncoding = "UTF-8")
 data1 <- data1[,2:54]
 
-AAaveragePT <- data1 %>%
-mutate(arm_angle = round(arm_angle, digits = 0)) %>%
-group_by(arm_angle, phand, pitch_name) %>%
-summarise(
-  AvgIVB = mean(IVB, na.rm = TRUE),
-  AvgHB = mean(HB, na.rm = TRUE),
-  .groups = 'drop'
-  )
-
+# Sample pitch type lookup - modify if needed
 pitch_type_lookup <- data.frame(
-    pitch_name = c("Changeup", "Curveball", "Cutter", "Eephus", "Forkball", 
-                   "Four-Seam Fastball", "Knuckle Ball", "Knuckle Curve", 
-                   "Screwball", "Sinker", "Slider", "Slurve", "Splitter", "Sweeper"),
-    pitch_abbr = c("CH", "CU", "FC", "EP", "FO", "FF", "KN", "KC", 
-                   "SC", "SI", "SL", "SV", "FS", "ST"),
-    stringsAsFactors = FALSE
+  pitch_name = c("Changeup", "Curveball", "Cutter", "Eephus", "Forkball", 
+                 "Four-Seam Fastball", "Knuckle Ball", "Knuckle Curve", 
+                 "Screwball", "Sinker", "Slider", "Slurve", "Splitter", "Sweeper"),
+  pitch_abbr = c("CH", "CU", "FC", "EP", "FO", "FF", "KN", "KC", 
+                 "SC", "SI", "SL", "SV", "FS", "ST"),
+  stringsAsFactors = FALSE
 )
 
+# Define pitch colors
 pitch_colors <- c(
   "FF" = "#FF4136", 
   "SI" = "#FF851B", 
@@ -43,8 +38,6 @@ pitch_colors <- c(
 )
 
 break_plot_Szn <- function(game, data1, sdate, edate) {
-  # Calculate pitch usage percentages
-  
   game <- game %>% filter(between(as.Date(date), sdate, edate))
   total_pitches <- nrow(game)
   usage_stats <- game %>%
@@ -58,7 +51,6 @@ break_plot_Szn <- function(game, data1, sdate, edate) {
     left_join(pitch_type_lookup, by = c("pitch_name")) %>%
     left_join(usage_stats, by = "pitch_name")
   
-  
   game <- game %>% filter(!is.na(pitch_abbr))
   title <- paste0(unique(game$`Pitcher Name`)," ",sdate," to ",edate)
   pitcher_hand <- unique(game$phand)
@@ -77,24 +69,21 @@ break_plot_Szn <- function(game, data1, sdate, edate) {
   x_end <- 50 * cos(angle_radians) * factor
   y_end <- 50 * sin(angle_radians)
   
-  # Create the base color mapping
   game_pitches <- unique(game$pitch_abbr)
   used_colors <- pitch_colors[game_pitches]
   
-  # Add usage to the game data
   avg_locations <- game %>%
     group_by(pitch_abbr) %>%
     summarize(
       avg_HB = mean(HB, na.rm = TRUE),
       avg_IVB = mean(IVB, na.rm = TRUE),
-      usage = first(usage)  # Keep the usage info
+      avg_velo = mean(start_speed, na.rm = TRUE),
+      usage = first(usage)
     )
   
-  # Create labels with percentages
   legend_labels <- paste0(names(used_colors), " (", 
                           avg_locations$usage[match(names(used_colors), avg_locations$pitch_abbr)], ")")
   
-  # Create the color scale with usage labels
   fill_values <- used_colors
   names(fill_values) <- legend_labels
   
@@ -105,10 +94,9 @@ break_plot_Szn <- function(game, data1, sdate, edate) {
     filter(!is.na(pitch_abbr)) %>%
     filter(pitch_abbr %in% game_pitches)
   
-  ggplot(game, aes(x = HB, y = IVB)) +
+  p <- ggplot(game, aes(x = HB, y = IVB)) +
     geom_vline(xintercept = 0, color = "lightblue", linewidth = 1, linetype = 4) +
     geom_hline(yintercept = 0, color = "lightblue", linewidth = 1, linetype = 4) +
-    # Ellipses
     stat_ellipse(
       data = arm_angle_data,
       aes(fill = paste0(pitch_abbr, " (", 
@@ -118,17 +106,17 @@ break_plot_Szn <- function(game, data1, sdate, edate) {
       level = 0.68,
       show.legend = FALSE
     ) +
-    # Average points
-    geom_point(
+    geom_point_interactive(
       data = avg_locations,
       aes(x = avg_HB, y = avg_IVB, 
-          fill = paste0(pitch_abbr, " (", usage, ")")),
+          fill = paste0(pitch_abbr, " (", usage, ")"),
+          tooltip = sprintf("Avg Velo: %.1f mph\nAvg IVB: %.1f in\nAvg HB: %.1f in",
+                            avg_velo, avg_IVB, avg_HB)),
       color = "black", 
       size = 6, 
       stroke = .5, 
       shape = 21
     ) +
-    # Arm angle line
     geom_segment(x = 0, y = 0, xend = x_end, yend = y_end, 
                  color = "red", linewidth = 1, linetype = 5) +
     scale_fill_manual(values = fill_values) +
@@ -159,16 +147,14 @@ break_plot_Szn <- function(game, data1, sdate, edate) {
       axis.ticks = element_line(color = "white"),
       panel.grid = element_blank(),
       legend.key = element_blank(),
-      plot.caption = element_text(
-        color = "white",
-        hjust = 0.5
-      ),
+      plot.caption = element_text(color = "white", hjust = 0.5),
       panel.border = element_blank()
     )
+  
+  return(p)
 }
 
 break_plot_tot <- function(game, data1, sdate, edate) {
-  # Calculate pitch usage percentages
   game <- game %>% filter(between(as.Date(date), sdate, edate))
   total_pitches <- nrow(game)
   usage_stats <- game %>%
@@ -177,11 +163,11 @@ break_plot_tot <- function(game, data1, sdate, edate) {
       count = n(),
       usage = sprintf("%.1f%%", (count/total_pitches) * 100)
     )
-
+  
   game <- game %>% 
     left_join(pitch_type_lookup, by = c("pitch_name")) %>%
     left_join(usage_stats, by = "pitch_name")
-
+  
   game <- game %>% filter(!is.na(pitch_abbr))
   title <- paste0(unique(game$`Pitcher Name`)," ",sdate," to ",edate)
   pitcher_hand <- unique(game$phand)
@@ -200,24 +186,21 @@ break_plot_tot <- function(game, data1, sdate, edate) {
   x_end <- 50 * cos(angle_radians) * factor
   y_end <- 50 * sin(angle_radians)
   
-  # Create the base color mapping
   game_pitches <- unique(game$pitch_abbr)
   used_colors <- pitch_colors[game_pitches]
   
-  # Add usage to the game data
   avg_locations <- game %>%
     group_by(pitch_abbr) %>%
     summarize(
       avg_HB = mean(HB, na.rm = TRUE),
       avg_IVB = mean(IVB, na.rm = TRUE),
-      usage = first(usage)  # Keep the usage info
+      avg_velo = mean(start_speed, na.rm = TRUE),
+      usage = first(usage)
     )
   
-  # Create labels with percentages
   legend_labels <- paste0(names(used_colors), " (", 
                           avg_locations$usage[match(names(used_colors), avg_locations$pitch_abbr)], ")")
   
-  # Create the color scale with usage labels
   fill_values <- used_colors
   names(fill_values) <- legend_labels
   
@@ -228,10 +211,9 @@ break_plot_tot <- function(game, data1, sdate, edate) {
     filter(!is.na(pitch_abbr)) %>%
     filter(pitch_abbr %in% game_pitches)
   
-  ggplot(game, aes(x = HB, y = IVB)) +
+  p <- ggplot(game, aes(x = HB, y = IVB)) +
     geom_vline(xintercept = 0, color = "lightblue", linewidth = 1, linetype = 4) +
     geom_hline(yintercept = 0, color = "lightblue", linewidth = 1, linetype = 4) +
-    # Ellipses
     stat_ellipse(
       data = arm_angle_data,
       aes(fill = paste0(pitch_abbr, " (", 
@@ -241,25 +223,26 @@ break_plot_tot <- function(game, data1, sdate, edate) {
       level = 0.68,
       show.legend = FALSE
     ) +
-    # Individual points
-    geom_point(
-      aes(fill = paste0(pitch_abbr, " (", usage, ")")), 
+    geom_point_interactive(
+      aes(fill = paste0(pitch_abbr, " (", usage, ")"),
+          tooltip = sprintf("Velo: %.1f mph\nIVB: %.1f in\nHB: %.1f in", 
+                            start_speed, IVB, HB)), 
       color = "#c6c6c6", 
       size = 3, 
       stroke = .5, 
       shape = 21
     ) +
-    # Average points
-    geom_point(
+    geom_point_interactive(
       data = avg_locations,
       aes(x = avg_HB, y = avg_IVB, 
-          fill = paste0(pitch_abbr, " (", usage, ")")),
+          fill = paste0(pitch_abbr, " (", usage, ")"),
+          tooltip = sprintf("Avg Velo: %.1f mph\nAvg IVB: %.1f in\nAvg HB: %.1f in",
+                            avg_velo, avg_IVB, avg_HB)),
       color = "black", 
       size = 6, 
       stroke = .5, 
       shape = 21
     ) +
-    # Arm angle line
     geom_segment(x = 0, y = 0, xend = x_end, yend = y_end, 
                  color = "red", linewidth = 1, linetype = 5) +
     scale_fill_manual(values = fill_values) +
@@ -290,53 +273,51 @@ break_plot_tot <- function(game, data1, sdate, edate) {
       axis.ticks = element_line(color = "white"),
       panel.grid = element_blank(),
       legend.key = element_blank(),
-      plot.caption = element_text(
-        color = "white",
-        hjust = 0.5
-      ),
+      plot.caption = element_text(color = "white", hjust = 0.5),
       panel.border = element_blank()
     )
+  
+  return(p)
 }
+
 ui <- fluidPage(
-  # Application title
+  # Remove useGirafe() line and just have girafeOutput in mainPanel
+  
   titlePanel("2020-2024 MLB Pitch Plots"),
   
   sidebarLayout(
     sidebarPanel(
-      width = 3,  
-      selectInput("player", "Select Player:", choices = unique(data1$`Pitcher Name`),
-                  width = "100%"),  
-      dateRangeInput("date1", "Dates: (Be wary of multi year plots as arm angles may vary over years)", 
+      width = 3,
+      selectInput("player", "Select Player:", 
+                  choices = unique(data1$`Pitcher Name`),
+                  width = "100%"),
+      dateRangeInput("date1", 
+                     "Dates: (Be wary of multi year plots as arm angles may vary over years)", 
                      start = "2024-03-20", 
                      end = "2024-10-01",
-                     width = "100%"),  
+                     width = "100%"),
       radioButtons("type", "Plot Type", 
-                   choices = c("Season Average","All Pitches")),
+                   choices = c("Season Average", "All Pitches")),
       actionButton("submit", "Update Plot", 
-                   class = "btn btn-primary btn-block",  
-                   style = "margin-bottom: 10px"), 
-      downloadButton("download", "Download Plot", 
-                     class = "btn btn-success btn-block") 
+                   class = "btn btn-primary btn-block",
+                   style = "margin-bottom: 10px"),
+      downloadButton("download", "Download Plot",
+                     class = "btn btn-success btn-block")
     ),
     
-    
     mainPanel(
-      width = 9, 
-      plotOutput("Plot")
+      width = 9,
+      girafeOutput("Plot", width = "750px", height = "750px")
     )
   )
 )
-
-# Define server
 server <- function(input, output, session) {
-  # Create a reactive value to store current plot settings
   plotSettings <- reactiveVal(list(
     player = NULL,
     type = "Season Average",
     dates = c(as.Date("2024-03-20"), as.Date("2024-10-01"))
   ))
   
-  # Update settings only when submit is clicked
   observeEvent(input$submit, {
     plotSettings(list(
       player = input$player,
@@ -345,28 +326,44 @@ server <- function(input, output, session) {
     ))
   })
   
-  output$Plot <- renderPlot({
+  output$Plot <- renderGirafe({
     settings <- plotSettings()
-    req(settings$player)  # Wait until we have a player selected
+    req(settings$player)
     
     game <- data1 %>%
       filter(`Pitcher Name` == settings$player)
     
     if(nrow(game) == 0) {
-      return(ggplot() + 
-               annotate("text", x = 0.5, y = 0.5, 
-                        label = "No data available for selected date range", 
-                        color = "white") +
-               theme_void() +
-               theme(plot.background = element_rect(fill = "#333333", color = NA)))
+      return(girafe(ggobj = ggplot() + 
+                      annotate("text", x = 0.5, y = 0.5, 
+                               label = "No data available for selected date range", 
+                               color = "white") +
+                      theme_void() +
+                      theme(plot.background = element_rect(fill = "#333333", color = NA))))
     }
     
-    if(settings$type == "Season Average"){
+    plot <- if(settings$type == "Season Average") {
       break_plot_Szn(game, data1, settings$dates[1], settings$dates[2])
-    } else{
+    } else {
       break_plot_tot(game, data1, settings$dates[1], settings$dates[2])
     }
-  }, width = 750, height = 750)
+    
+    girafe(ggobj = plot,
+           width_svg = 10,
+           height_svg = 10,
+           options = list(
+             opts_tooltip(
+               opacity = 0.8,
+               css = "background-color: #333333; color: white; padding: 5px; border-radius: 3px;"
+             ),
+             opts_hover(
+               css = "fill-opacity: 1; stroke: #FFF; stroke-width: 2;"
+             ),
+             opts_selection(
+               type = "none"
+             )
+           ))
+  })
   
   output$download <- downloadHandler(
     filename = function() {
@@ -383,9 +380,9 @@ server <- function(input, output, session) {
       game <- data1 %>%
         filter(`Pitcher Name` == settings$player)
       
-      plot <- if(settings$type == "Season Average"){
+      plot <- if(settings$type == "Season Average") {
         break_plot_Szn(game, data1, settings$dates[1], settings$dates[2])
-      } else{
+      } else {
         break_plot_tot(game, data1, settings$dates[1], settings$dates[2])
       }
       
@@ -394,9 +391,10 @@ server <- function(input, output, session) {
              width = 10,
              height = 10,
              dpi = 300,
-             bg = "#333333") 
+             bg = "#333333")
     }
   )
 }
 
+# Run the application
 shinyApp(ui = ui, server = server)