Update app.R

app.R

@@ -81,13 +81,13 @@ pitcher_summary <- function(game_pk,date){
            pitchData.coordinates.vY0,pitchData.coordinates.pfxX,pitchData.coordinates.pfxZ,
            pitchData.breaks.breakVerticalInduced,pitchData.breaks.breakHorizontal,
            hitData.launchSpeed,hitData.launchAngle,hitData.totalDistance,details.isInPlay,
-           last.pitch.of.ab,pitchData.breaks.spinDirection,matchup.pitchHand.code)
+           last.pitch.of.ab,pitchData.breaks.spinDirection,matchup.pitchHand.code,matchup.batSide.code,game_pk)
   colnames(tmilb) <- c("Batter Name","Batter ID","Pitcher Name","Pitcher ID",
                        "result","description","pitch_name","des","start_speed",
                        "plateTime","zone","spin_rate","extension","px","pz","x0",
                        "y0","z0","ax","ay","az","vx0","vz0","vy0","pfxX","pfxZ",
                        "IVB","HB","hit_speed","hit_angle","hit_distance","inPlay",
-                       "lastPitch","spinDirection","phand")
+                       "lastPitch","spinDirection","phand","bhand","gamepk")
   tmilb <- is_barrel(tmilb)
   tmilb <- tmilb %>%
     mutate(is_strike_swinging = ifelse(description == "Swinging Strike" |
@@ -106,26 +106,28 @@ break_plot <- function(game){
          title = "Pitch Movement") +
     xlim(-25, 25) +
     ylim(-25, 25) +
-    # scale_x_continuous(breaks = seq(-20, 20, by = 20)) +
-    # scale_y_continuous(breaks = seq(-20, 20, by = 20)) +
     theme_minimal() +
     theme(
       legend.position = "bottom",
       plot.title = element_text(hjust = 0.5, face = "bold"),
       panel.grid.minor = element_line(color = "gray", size = 0.25, linetype = 1),
-      aspect.ratio = 1  # This ensures the plot is square
+      aspect.ratio = 1,  # This ensures the plot is square
     ) +
     guides(color = guide_legend(title = "Pitch Type", nrow = 1))
 }
 
-pitch_plot <- function(game){
+pitch_plot <- function(game, title, bhand = NULL) {
+  # if (!is.null(bhand)) {
+  #   game <- game %>% filter(bhand == bhand)
+  # }
+  # 
   ggplot(game, aes(x = px, y = pz, color = pitch_name)) +
     geom_point(size = 3.5) +
     geom_segment(aes(x = -0.71, xend = 0.71, y = 1.5, yend = 1.5)) +
     geom_segment(aes(x = -0.71, xend = 0.71, y = 3.6, yend = 3.6)) +
     geom_segment(aes(x = 0.71, xend = 0.71, y = 1.5, yend = 3.6)) +
     geom_segment(aes(x = -0.71, xend = -0.71, y = 1.5, yend = 3.6)) +
-    labs(x = NULL, y = NULL, title = "Pitch Location") +
+    labs(x = NULL, y = NULL, title = title) +
     xlim(-3, 3) +
     ylim(0.2, 4) +
     coord_fixed(ratio = 1) +
@@ -139,12 +141,6 @@ pitch_plot <- function(game){
     guides(color = guide_legend(title = "Pitch Type", nrow = 1))
 }
 
-# Load models
-# FB <- xgb.load('FB.model')
-# Off <- xgb.load('Off.model')
-# Break <- xgb.load('Break.model')
-model <- xgb.load('TimStuff2.model')
-
 calculate_VAA <- function(vz0, ay, az, vy0, y0) {
   -atan((vz0+(az*(-sqrt((vy0*vy0)-(2*ay*(y0-(17/12))))-vy0)/
                 ay))/(-sqrt((vy0*vy0)-(2*ay*(y0-(17/12))))))*(180/pi)
@@ -169,8 +165,82 @@ scale_TimStuff <- function(raw_score, model_mean, model_sd) {
   return(result)
 }
 
+# Modify the getBoxScore function
+
+getBoxScore <- function(game_pk, pid) {
+  url <- paste0("https://statsapi.mlb.com/api/v1/game/", game_pk, "/boxscore")
+  bs <- fromJSON(url)
+  
+  t <- as.data.frame(bs[["teams"]][["away"]][["players"]][[paste0("ID", pid)]][["stats"]][["pitching"]])
+  if (nrow(t) == 0) {
+    t <- as.data.frame(bs[["teams"]][["home"]][["players"]][[paste0("ID", pid)]][["stats"]][["pitching"]])
+  }
+  
+  # Define the stats we want and their display names
+  stats <- c("inningsPitched", "battersFaced", "runs", "earnedRuns", "hits", "baseOnBalls", "strikeOuts", "strikePercentage")
+  display_names <- c("IP", "TBF", "R", "ER", "H", "BB", "K", "Strike%")
+  
+  # Create a new data frame with only the stats we want
+  result <- data.frame(matrix(ncol = length(stats), nrow = 1))
+  colnames(result) <- display_names
+  
+  for (i in 1:length(stats)) {
+    value <- t[[stats[i]]]
+    if (is.null(value)) value <- "0"
+    if (stats[i] == "strikePercentage") {
+      value <- paste0(round(as.numeric(value) * 100, 1), "%")
+    }
+    result[1, i] <- as.character(value)
+  }
+  
+  return(result)
+}
+
+# Create a new function for split pitch location plots
+pitch_plot_split <- function(game, title) {
+  game_lhb <- game %>% filter(bhand == "L")
+  game_rhb <- game %>% filter(bhand == "R")
+  
+  plot_lhb <- ggplot(game_lhb, aes(x = px, y = pz, color = pitch_name)) +
+    geom_point(size = 2) +
+    geom_segment(aes(x = -0.71, xend = 0.71, y = 1.5, yend = 1.5)) +
+    geom_segment(aes(x = -0.71, xend = 0.71, y = 3.6, yend = 3.6)) +
+    geom_segment(aes(x = 0.71, xend = 0.71, y = 1.5, yend = 3.6)) +
+    geom_segment(aes(x = -0.71, xend = -0.71, y = 1.5, yend = 3.6)) +
+    labs(x = NULL, y = NULL, title = "LHB (Batter's Perspective)") +
+    xlim(-3, 3) +
+    ylim(0.2, 4) +
+    coord_fixed(ratio = 1) +
+    theme_minimal() +
+    theme(
+      legend.position = "none",
+      plot.title = element_text(hjust = 0.5, face = "bold"),
+      axis.text = element_blank(),
+      axis.ticks = element_blank()
+    )
+  
+  plot_rhb <- ggplot(game_rhb, aes(x = px, y = pz, color = pitch_name)) +
+    geom_point(size = 2) +
+    geom_segment(aes(x = -0.71, xend = 0.71, y = 1.5, yend = 1.5)) +
+    geom_segment(aes(x = -0.71, xend = 0.71, y = 3.6, yend = 3.6)) +
+    geom_segment(aes(x = 0.71, xend = 0.71, y = 1.5, yend = 3.6)) +
+    geom_segment(aes(x = -0.71, xend = -0.71, y = 1.5, yend = 3.6)) +
+    labs(x = NULL, y = NULL, title = "RHB (Batter's Perspective)") +
+    xlim(-3, 3) +
+    ylim(0.2, 4) +
+    coord_fixed(ratio = 1) +
+    theme_minimal() +
+    theme(
+      legend.position = "none",
+      plot.title = element_text(hjust = 0.5, face = "bold"),
+      axis.text = element_blank(),
+      axis.ticks = element_blank()
+    )
+  
+  return(list(lhb = plot_lhb, rhb = plot_rhb))
+}
+
 calculate_timstuff <- function(game) {
- # game <- calculate_primary(game)
   game <- game %>%
     mutate(VAA = calculate_VAA(vz0, ay, az, vy0, y0),
            EAA = calculate_EAA(extension),
@@ -180,7 +250,6 @@ calculate_timstuff <- function(game) {
            is_strike_swinging = ifelse(is_strike_swinging, 1, 0),
            Pitch = pitch_name,
            ishandL = ifelse(phand == "L",1,0))
-  # game <- calculate_primary(game)
   
   feature_vars <- c("ishandL","start_speed", "IVB", "HB", "EAA", "x0", "z0", "spin_rate","SADiff")
   complete_rows <- complete.cases(game[, feature_vars])
@@ -190,10 +259,6 @@ calculate_timstuff <- function(game) {
   
   rhp <- game_complete
   
-  # rhp <- game_complete[game_complete$ishandL == 0]
-  # 
-  # lhp$TimStuff <- scale_TimStuff(predict(model, as.matrix(cbind(lhp$ishandL,lhp$start_speed, lhp$IVB, lhp$HB, lhp$EAA, lhp$x0, lhp$z0, lhp$spin_rate, lhp$SADiff,lhp$primary_speed,lhp$primary_IVB,lhp$primary_HB))), -0.00249975,  0.007566558)
-  
   rhp$TimStuff <- scale_TimStuff(predict(model, as.matrix(cbind(rhp$ishandL,rhp$start_speed, rhp$IVB, rhp$HB, rhp$EAA, rhp$x0, rhp$z0, rhp$spin_rate, rhp$SADiff))),  -0.002549184,  0.006202895)
   
   game_complete <- rbind(rhp,game_na)
@@ -202,7 +267,6 @@ calculate_timstuff <- function(game) {
 
 summary_table <- function(game) {
   rows <- nrow(game)
-  #game <- calculate_primary(game)
   game <- calculate_timstuff(game)
   sumtable <- game %>%
     mutate(team_fielding_id = ifelse(description == "Called Strike" |
@@ -260,7 +324,6 @@ summary_table <- function(game) {
   
   return(result)
 }
-
 # Initialize schedule data
 mlbid <- mlb_schedule(season = 2024, level_ids = "1")
 mlbteamH <- mlbid %>%
@@ -325,19 +388,20 @@ ui <- fluidPage(
       actionButton("update", "Find Pitcher", icon("magnifying-glass"),
                    class = "btn-primary btn-block"),
       selectizeInput("pitcher", "Pitcher Name:", NULL),
-      #textInput("title", "Card Title"),
       actionButton("update1", "Make Card", icon("plus"),
                    class = "btn-success btn-block"),
       downloadButton("downloadPlot", "Download Card", class = "btn-info btn-block")
     ),
     mainPanel(
-      div(style = "width: 1200px; height: 800px; overflow: auto;",  # Fixed size container
+      div(style = "width: 1200px; height: 800px; overflow: auto;",
           plotOutput("combinedPlot", width = "100%", height = "100%")
+      ),
+      tableOutput("boxscoreTable")  # Add this line for the boxscore
     )
   )
 )
-)
 
+# Server Definition
 server <- function(input, output, session) {
   observeEvent(input$level, {
     if(input$level == "AAA"){
@@ -359,6 +423,7 @@ server <- function(input, output, session) {
   })
   
   game_data <- reactiveVal()
+  boxscore_data <- reactiveVal()
   
   observeEvent(input$update, {
     tryCatch({
@@ -410,14 +475,18 @@ server <- function(input, output, session) {
     req(input$update1, game_data())
     game <- game_data() %>% filter(`Pitcher Name` == input$pitcher)
     game <- calculate_timstuff(game)
-    game %>%
+    result <- game %>%
       arrange(date) %>%
       group_by(pitch_name) %>%
-      mutate(rolling_timstuff = rollmean(TimStuff, k = 5, fill = NA, align = "right"),
-             pitch_number = row_number()) %>%
-      ungroup()  # Make sure to ungroup after the grouping operations
+      mutate(
+        TimStuff = as.numeric(TimStuff),
+        rolling_timstuff = if(n() >= 5) rollmean(TimStuff, k = 5, fill = NA, align = "right") else TimStuff,
+        pitch_number = row_number()
+      ) %>%
+      ungroup()
+    
+    return(result)
   })
-  
   combinedPlot <- reactiveVal()
   observeEvent(input$update1, {
     req(game_data())
@@ -432,8 +501,19 @@ server <- function(input, output, session) {
       break_plot <- break_plot(game) +
         theme(legend.position = "none")
       
-      pitch_plot <- pitch_plot(game) +
-        theme(legend.position = "none")
+      # Get boxscore data
+      boxscore_data <- getBoxScore(unique(game$gamepk[1]), unique(game$`Pitcher ID`[1]))
+      boxscore_table <- tableGrob(boxscore_data, rows = NULL, theme = ttheme_minimal(
+        core = list(fg_params = list(hjust = 0.5, x = 0.5), bg_params = list(fill = "white")),
+        colhead = list(fg_params = list(hjust = 0.5, x = 0.5, fontface = "bold"), bg_params = list(fill = "#f0f0f0")),
+        rowhead = list(fg_params = list(hjust = 0.5, x = 0.5), bg_params = list(fill = "white"))
+      ))
+      
+      # Set a fixed total height for the boxscore table
+      boxscore_table$heights <- unit(rep(1/(nrow(boxscore_data) + 1), nrow(boxscore_data) + 1), "npc")
+      
+      # Get split pitch location plots
+      pitch_plots <- pitch_plot_split(game)
       
       # Create a formatted table
       table_data <- summary_table(game)
@@ -474,22 +554,35 @@ server <- function(input, output, session) {
         img_grob <- textGrob("Image not available", gp = gpar(col = "red", fontsize = 20))
       }
       
+      # Create the rolling TimStuff+ graph
+      # Create the rolling TimStuff+ graph
       # Create the rolling TimStuff+ graph
       rolling_data <- rolling_timstuff()
       timstuff_plot <- ggplot(rolling_data, aes(x = pitch_number, y = rolling_timstuff, color = pitch_name)) +
-        geom_line(size = 1) +
-        geom_point(size = 1) +
+        geom_line(size = 1, na.rm = TRUE) +
+        geom_point(size = 1, na.rm = TRUE) +
         theme_minimal() +
-        labs(title = "5-Pitch Rolling TimStuff+",
+        ### Workaround to not show anything but keep graph
+        labs(title = if(any(rolling_data$pitch_number >= 5)) "5-Pitch Rolling TimStuff+" else "5-Pitch Rolling TimStuff+",
              x = "Pitch Number", y = "TimStuff+") +
-        ylim(70, 130) +
-        scale_x_continuous(breaks = seq(5, 55, by = 5), limits = c(5,NA)) +
+        scale_y_continuous(limits = c(70, 130), na.value = NA) +
+        scale_x_continuous(breaks = seq(5, 55, by = 5), limits = c(5, NA)) +
         theme(
           plot.title = element_text(hjust = 0.5, face = "bold"),
           legend.position = "none",
           panel.grid.major.x = element_line(color = "gray", size = 0.5)
         )
       
+      # If there's no data at all, display a message
+      if(nrow(rolling_data) == 0) {
+        timstuff_plot <- ggplot() + 
+          theme_void() +
+          labs(title = "No pitch data available") +
+          theme(
+            plot.title = element_text(hjust = 0.5, face = "bold")
+          )
+      }
+      
       # Create title and data source text
       title_text <- textGrob(
         paste(input$pitcher, format(input$date, "%m/%d/%y"), "Summary Card by @TimStats"),
@@ -504,19 +597,23 @@ server <- function(input, output, session) {
       )
       
       # Create a horizontal legend
-      legend <- get_legend(
-        ggplot(rolling_data, aes(x = pitch_number, y = rolling_timstuff, color = pitch_name)) +
-          geom_point(size = 5) +
-          theme(legend.position = "bottom",
-                legend.title = element_blank(),
-                text = element_text(size = 12.5),
-                #legend.key.size = unit(.5,"cm"),
-                legend.box = "horizontal" ) +
-          guides(color = guide_legend(nrow = 1))
-      )
+      legend <- if(nrow(rolling_data) > 0) {
+        get_legend(
+          ggplot(rolling_data, aes(x = pitch_number, y = rolling_timstuff, color = pitch_name)) +
+            geom_point(size = 5) +
+            theme(legend.position = "bottom",
+                  legend.title = element_blank(),
+                  text = element_text(size = 12.5),
+                  legend.box = "horizontal" ) +
+            guides(color = guide_legend(nrow = 1))
+        )
+      } else {
+        ggplotGrob(ggplot() + theme_void())  # Empty legend if no data
+      }
       
       # Combine all plots
       combined <- grid.arrange(
+        # Row 1: Picture and Rolling TimStuff+ graph
         arrangeGrob(
           arrangeGrob(
             img_grob,
@@ -524,25 +621,43 @@ server <- function(input, output, session) {
             ncol = 1,
             heights = c(4, 1)
           ),
-          pitch_plot,
+          timstuff_plot,
           ncol = 2,
           widths = c(1, 1)
         ),
+        
+        # Row 2: Two location graphs and movement graph
         arrangeGrob(
+          pitch_plots$lhb,
+          pitch_plots$rhb,
           break_plot,
-          timstuff_plot,
-          ncol = 2,
-          widths = c(1, 1)
+          ncol = 3,
+          widths = c(1, 1, 1.2)
         ),
-        #arrangeGrob(
+        
+        # Row 3: Legend
         legend,
-        #),
-        #arrangeGrob(
+        
+        # Row 4: Horizontal boxscore table
+        tableGrob(
+          boxscore_data,
+          rows = NULL,
+          cols = colnames(boxscore_data),
+          theme = ttheme_minimal(
+            core = list(fg_params = list(hjust = 0.5, x = 0.5), bg_params = list(fill = "white")),
+            colhead = list(fg_params = list(hjust = 0.5, x = 0.5, fontface = "bold"), bg_params = list(fill = "#f0f0f0"))
+          )
+        ),
+        
+        # Row 5: Pitch summary table
         table_plot,
-        #),
+        
+        # Row 6: Data source text
         data_source_text,
-        nrow = 5,
-        heights = c(1.2, 1.6, 0.1, 1.1, 0.05)  # Adjusted these values
+        
+        # Layout parameters
+        nrow = 6,
+        heights = c(1.2, 1.5, 0.1, 0.3, 1, 0.05)
       )
       combinedPlot(combined)
       
@@ -558,7 +673,17 @@ server <- function(input, output, session) {
           ggsave(file, plot = combinedPlot(), width = 18, height = 12, dpi = 300, units = "in")
         }
       )
+      
+      # Render the boxscore table
+      output$boxscoreTable <- renderTable({
+        boxscore_data()
+      })
+      
+    }, error = function(e) {
+      showNotification(paste("Error creating plot:", e$message), type = "error")
     })
   })
 }
-shinyApp(ui, server)
+
+# Run the application
+shinyApp(ui = ui, server = server)