Update app.R

app.R

@@ -517,7 +517,6 @@ create_bp_pdf <- function(bp_data, batter_name, output_file) {
   invisible(output_file)
 }
  
-
 parse_game_day <- function(df, tz = "America/New_York") {
   stopifnot("Date" %in% names(df))
   if (inherits(df$Date, "Date")) {
@@ -529,7 +528,6 @@ parse_game_day <- function(df, tz = "America/New_York") {
   }
   as.Date(df$Date[1])
 }
-
 create_at_bats_plot <- function(batter_data, player_name, game_key, pitch_colors,
                                 max_lines_per_col = 16L) {
   df <- dplyr::filter(batter_data, Batter == player_name)
@@ -629,7 +627,6 @@ plot_data <- df %>%
       panel.spacing = grid::unit(8, "pt")
     )
 }
-
 create_report_spray_chart <- function(game_data, player_name) {
   spray_data <- game_data %>%
     dplyr::filter(Batter == player_name) %>%
@@ -683,7 +680,6 @@ create_report_spray_chart <- function(game_data, player_name) {
       plot.title  = ggplot2::element_text(hjust = 0.5, size = 9, face = "bold")
     )
 }
-
 create_report_contact_chart <- function(game_data, player_name) {
   contact_data <- game_data %>%
     filter(Batter == player_name) %>%
@@ -746,14 +742,12 @@ create_report_contact_chart <- function(game_data, player_name) {
       legend.key.width  = unit(0.3, "cm")
     )
 }
-
 calculate_leaderboards <- function(df, team_meta_df = team_meta) {
   
   format_name <- function(name) {
     if (is.na(name)) return(name)
     stringr::str_replace(name, "^\\s*(\\w+)\\s*,\\s*(\\w+)\\s*$", "\\2 \\1")
   }
-
   get_logo <- function(team_abbr) {
     if (is.null(team_meta_df) || is.null(team_abbr) || is.na(team_abbr)) return("")
     team_abbr <- trimws(as.character(team_abbr))
@@ -781,7 +775,6 @@ calculate_leaderboards <- function(df, team_meta_df = team_meta) {
   # Game Info
   stadium <- if ("Stadium" %in% names(df)) unique(na.omit(df$Stadium))[1] else "Unknown"
   level <- if ("Level" %in% names(df)) unique(na.omit(df$Level))[1] else ""
-
   league <- if ("League" %in% names(df)) unique(na.omit(df$League))[1] else ""
   
 game_date <- if ("Date" %in% names(df)) {
@@ -806,7 +799,6 @@ game_date <- if ("Date" %in% names(df)) {
   
   if (is.na(parsed)) "N/A" else format(parsed, "%m/%d/%Y")
 } else "N/A"
-
   # Calculate final score from RunsScored
   teams <- unique(c(df$BatterTeam, df$PitcherTeam))
   teams <- teams[!is.na(teams)]
@@ -882,7 +874,6 @@ game_date <- if ("Date" %in% names(df)) {
     whiffs = top_whiffs
   )
 }
-
 create_simple_header <- function(player_name, game_date, bio_data = NULL) {
   if (!is.null(bio_data) && nrow(bio_data) > 0) {
     player_bio <- bio_data %>% filter(Batter == player_name)
@@ -918,6 +909,21 @@ grid::textGrob(
 )
 }
 
+# Helper function to check if bat tracking data is available
+has_bat_tracking <- function(df) {
+  bat_cols <- c("BatSpeed", "VerticalAttackAngle", "HorizontalAttackAngle")
+  cols_present <- bat_cols %in% names(df)
+  if (!all(cols_present)) return(FALSE)
+  
+  # Check if there's at least some non-NA data in any of these columns
+  any_data <- any(
+    !is.na(df$BatSpeed) | 
+    !is.na(df$VerticalAttackAngle) | 
+    !is.na(df$HorizontalAttackAngle)
+  )
+  return(any_data)
+}
+
 create_postgame_pdf <- function(game_df, player_name, output_file, bio_data = NULL) {
   if (length(dev.list()) > 0) { try(dev.off(), silent = TRUE) }
   
@@ -931,6 +937,9 @@ create_postgame_pdf <- function(game_df, player_name, output_file, bio_data = NU
   game_day  <- parse_game_day(batter_df, tz = "America/New_York")
   game_key  <- format(game_day, "%Y-%m-%d")
   
+  # Check if bat tracking data is available
+  bat_tracking_available <- has_bat_tracking(batter_df)
+  
   game_stats <- batter_df %>%
     summarise(
       PA = sum(PAindicator, na.rm = TRUE),
@@ -962,6 +971,8 @@ create_postgame_pdf <- function(game_df, player_name, output_file, bio_data = NU
   spray_plot   <- create_report_spray_chart(game_df, player_name)
   contact_plot <- create_report_contact_chart(game_df, player_name)
   
+  # Build pitch log with conditional bat tracking columns
+  # New order: Inning, Pitcher, Count, Pitch, Velo, IVB, HB, VAA, EV, LA, Dist, Bat Speed, AA, HAA
   pitch_log <- pitch_sequence %>%
     filter(PitchCall == "InPlay") %>%
     mutate(
@@ -969,11 +980,44 @@ create_postgame_pdf <- function(game_df, player_name, output_file, bio_data = NU
       event = dplyr::case_when(
         !is.na(PlayResult) & PlayResult != "Undefined" ~ PlayResult, TRUE ~ "Out"
       ),
-      EV = round(ExitSpeed), LA = round(Angle),
+      Count = paste0(Balls, "-", Strikes),
+      EV = round(ExitSpeed),
+      LA = round(Angle),
       Dist = ifelse(!is.na(Distance), round(Distance), NA),
-      Velo = round(RelSpeed, 1)
-    ) %>%
-    select(PitchNumber, Pitcher, Throws, Balls, Strikes, TaggedPitchType, Velo, event, EV, LA, Dist)
+      Velo = round(RelSpeed, 1),
+      # Pitch movement metrics
+      IVB = ifelse("InducedVertBreak" %in% names(.) & !is.na(InducedVertBreak), 
+                   round(InducedVertBreak, 1), NA),
+      HB = ifelse("HorzBreak" %in% names(.) & !is.na(HorzBreak), 
+                  round(HorzBreak, 1), NA),
+      # Vertical Approach Angle (pitch)
+      VAA = ifelse("VertApprAngle" %in% names(.) & !is.na(VertApprAngle), 
+                   round(VertApprAngle, 1), NA)
+    )
+  
+  # Add bat tracking columns if available
+  if (bat_tracking_available) {
+    pitch_log <- pitch_log %>%
+      mutate(
+        BatSpd = ifelse("BatSpeed" %in% names(.) & !is.na(BatSpeed), 
+                        round(BatSpeed, 1), NA),
+        AA = ifelse("VerticalAttackAngle" %in% names(.) & !is.na(VerticalAttackAngle), 
+                    round(VerticalAttackAngle, 1), NA),
+        HAA = ifelse("HorizontalAttackAngle" %in% names(.) & !is.na(HorizontalAttackAngle), 
+                     round(HorizontalAttackAngle, 1), NA)
+      )
+  }
+  
+  # Select columns based on availability
+  if (bat_tracking_available) {
+    pitch_log <- pitch_log %>%
+      select(PitchNumber, Inning, Pitcher, Count, TaggedPitchType, Velo, IVB, HB, VAA, 
+             event, EV, LA, Dist, BatSpd, AA, HAA)
+  } else {
+    pitch_log <- pitch_log %>%
+      select(PitchNumber, Inning, Pitcher, Count, TaggedPitchType, Velo, IVB, HB, VAA,
+             event, EV, LA, Dist)
+  }
   
   chart_y       <- 0.36
   chart_h       <- 0.22
@@ -981,26 +1025,70 @@ create_postgame_pdf <- function(game_df, player_name, output_file, bio_data = NU
   table_title_y <- 0.13
   table_y       <- 0.11
   
-  draw_pitch_table <- function(df, y_top, row_height = 0.0135, cex = 0.58) {
-    headers <- c("#","Pitcher","T","B","S","Pitch","Velo", "Event","EV","LA","Dist")
-    widths  <- c(0.03,0.15,0.03,0.04,0.04,0.09,0.05,0.06,0.20,0.05,0.05,0.06)
+  # Updated draw function with bat tracking support
+  draw_pitch_table <- function(df, y_top, row_height = 0.0135, cex = 0.58, include_bat_tracking = FALSE) {
+    if (include_bat_tracking) {
+      # Headers with bat tracking: #, Inn, Pitcher, Count, Pitch, Velo, IVB, HB, VAA, Event, EV, LA, Dist, BatSpd, AA, HAA
+      headers <- c("#", "Inn", "Pitcher", "Count", "Pitch", "Velo", "IVB", "HB", "VAA", "Event", "EV", "LA", "Dist", "BatSpd", "AA", "HAA")
+      widths  <- c(0.025, 0.03, 0.12, 0.04, 0.065, 0.04, 0.04, 0.04, 0.04, 0.065, 0.035, 0.035, 0.04, 0.045, 0.04, 0.04)
+    } else {
+      # Headers without bat tracking: #, Inn, Pitcher, Count, Pitch, Velo, IVB, HB, VAA, Event, EV, LA, Dist
+      headers <- c("#", "Inn", "Pitcher", "Count", "Pitch", "Velo", "IVB", "HB", "VAA", "Event", "EV", "LA", "Dist")
+      widths  <- c(0.03, 0.035, 0.15, 0.05, 0.08, 0.05, 0.05, 0.05, 0.05, 0.08, 0.045, 0.045, 0.05)
+    }
+    
     x_start <- 0.5 - sum(widths)/2
     x_pos   <- c(x_start, x_start + cumsum(widths[-length(widths)]))
+    
+    # Draw headers
     for (i in seq_along(headers)) {
       grid.rect(x = x_pos[i], y = y_top, width = widths[i]*0.985, height = row_height,
                 just = c("left","top"), gp = gpar(fill = "#006F71", col = "black", lwd = 0.4))
       grid.text(headers[i], x = x_pos[i] + widths[i]*0.49, y = y_top - row_height*0.5,
                 gp = gpar(col = "white", cex = cex, fontface = "bold"))
     }
+    
+    # Draw rows
     for (r in seq_len(nrow(df))) {
       y_row <- y_top - r*row_height
-      row_vals <- c(
-        df$PitchNumber[r], df$Pitcher[r], df$Throws[r], df$Balls[r], df$Strikes[r],
-        df$TaggedPitchType[r], df$Velo[r], df$event[r],
-        ifelse(is.na(df$EV[r]), "-", df$EV[r]),
-        ifelse(is.na(df$LA[r]), "-", df$LA[r]),
-        ifelse(is.na(df$Dist[r]), "-", df$Dist[r])
-      )
+      
+      if (include_bat_tracking) {
+        row_vals <- c(
+          df$PitchNumber[r],
+          ifelse(is.na(df$Inning[r]), "-", df$Inning[r]),
+          df$Pitcher[r],
+          df$Count[r],
+          df$TaggedPitchType[r],
+          ifelse(is.na(df$Velo[r]), "-", df$Velo[r]),
+          ifelse(is.na(df$IVB[r]), "-", df$IVB[r]),
+          ifelse(is.na(df$HB[r]), "-", df$HB[r]),
+          ifelse(is.na(df$VAA[r]), "-", df$VAA[r]),
+          df$event[r],
+          ifelse(is.na(df$EV[r]), "-", df$EV[r]),
+          ifelse(is.na(df$LA[r]), "-", df$LA[r]),
+          ifelse(is.na(df$Dist[r]), "-", df$Dist[r]),
+          ifelse(is.na(df$BatSpd[r]), "-", df$BatSpd[r]),
+          ifelse(is.na(df$AA[r]), "-", df$AA[r]),
+          ifelse(is.na(df$HAA[r]), "-", df$HAA[r])
+        )
+      } else {
+        row_vals <- c(
+          df$PitchNumber[r],
+          ifelse(is.na(df$Inning[r]), "-", df$Inning[r]),
+          df$Pitcher[r],
+          df$Count[r],
+          df$TaggedPitchType[r],
+          ifelse(is.na(df$Velo[r]), "-", df$Velo[r]),
+          ifelse(is.na(df$IVB[r]), "-", df$IVB[r]),
+          ifelse(is.na(df$HB[r]), "-", df$HB[r]),
+          ifelse(is.na(df$VAA[r]), "-", df$VAA[r]),
+          df$event[r],
+          ifelse(is.na(df$EV[r]), "-", df$EV[r]),
+          ifelse(is.na(df$LA[r]), "-", df$LA[r]),
+          ifelse(is.na(df$Dist[r]), "-", df$Dist[r])
+        )
+      }
+      
       for (i in seq_along(row_vals)) {
         grid.rect(x = x_pos[i], y = y_row, width = widths[i]*0.985, height = row_height, just = c("left","top"),
                   gp = gpar(fill = ifelse(r %% 2 == 0, "#f7f7f7", "white"), col = "grey80", lwd = 0.3))
@@ -1048,23 +1136,24 @@ create_postgame_pdf <- function(game_df, player_name, output_file, bio_data = NU
   print(contact_plot, newpage = FALSE)
   popViewport()
   
-  grid.text(paste(player_name, "-", game_key), x = 0.5, y = 0.13,
+  grid.text(paste(player_name, "-", game_key, "- Batted Ball Log"), x = 0.5, y = 0.13,
             gp = gpar(fontface = "bold", cex = 0.98))
   
   rows_total <- nrow(pitch_log)
   max_rows_first <- floor((0.11 - 0.02) / 0.0130)
   rows_first <- min(rows_total, max_rows_first)
   if (rows_first > 0) {
-    draw_pitch_table(pitch_log[1:rows_first, , drop = FALSE], y_top = 0.11, row_height = 0.0130, cex = 0.58)
+    draw_pitch_table(pitch_log[1:rows_first, , drop = FALSE], y_top = 0.11, row_height = 0.0130, 
+                     cex = 0.52, include_bat_tracking = bat_tracking_available)
   }
   next_row <- rows_first + 1
   if (next_row <= rows_total) {
     grid::grid.newpage()
-    draw_pitch_table(pitch_log[next_row:rows_total, , drop = FALSE], y_top = 0.97, row_height = 0.0175, cex = 0.62)
+    draw_pitch_table(pitch_log[next_row:rows_total, , drop = FALSE], y_top = 0.97, row_height = 0.0175, 
+                     cex = 0.56, include_bat_tracking = bat_tracking_available)
   }
 }
 
-
 # ============================================================
 # PITCHER POST-GAME PDF (Tableau-style)
 # Fixes: