Update app.R

app.R

@@ -5296,8 +5296,9 @@ create_count_usage_plot <- function(data, pitcher_name, pitch_colors) {
 create_location_by_result_plot <- function(data, player_name, batter_side, pitch_colors) {
   data <- normalize_columns(data)
   
-  # Fixed facet levels
+  # Fixed facet levels ("Overall" = every pitch to that side)
   result_levels <- c(
+    "Overall",
     "Whiffs",
     "Balls Called",
     "Strikes Called",
@@ -5305,7 +5306,7 @@ create_location_by_result_plot <- function(data, player_name, batter_side, pitch
     "2 Strikes"
   )
   
-  pitcher_data <- data %>%
+  base_data <- data %>%
     dplyr::filter(
       Pitcher == player_name,
       BatterSide == batter_side,
@@ -5313,7 +5314,10 @@ create_location_by_result_plot <- function(data, player_name, batter_side, pitch
       TaggedPitchType != "Other",
       !is.na(PlateLocSide),
       !is.na(PlateLocHeight)
-    ) %>%
+    )
+  
+  # Result-specific facets
+  result_data <- base_data %>%
     dplyr::mutate(
       ResultType = dplyr::case_when(
         PitchCall == "StrikeSwinging"                                        ~ "Whiffs",
@@ -5326,8 +5330,13 @@ create_location_by_result_plot <- function(data, player_name, batter_side, pitch
     ) %>%
     dplyr::filter(!is.na(ResultType))
   
+  # Overall facet = every pitch, uncategorized
+  overall_data <- base_data %>% dplyr::mutate(ResultType = "Overall")
+  
+  pitcher_data <- dplyr::bind_rows(overall_data, result_data)
+  
   if (nrow(pitcher_data) == 0) {
-    # Dummy data frame so we still draw 5 facets + zones
+    # Dummy data frame so we still draw all facets + zones
     plot_df <- data.frame(
       PlateLocSide   = NA_real_,
       PlateLocHeight = NA_real_,
@@ -5346,7 +5355,7 @@ create_location_by_result_plot <- function(data, player_name, batter_side, pitch
     ) +
     facet_wrap(
       ~ ResultType,
-      ncol = 5,
+      ncol = 6,
       labeller = labeller(ResultType = label_value),
       drop = FALSE              # <- keep empty facets
     ) +
@@ -5380,9 +5389,78 @@ create_location_by_side_plot <- function(data, player_name, batter_side, pitch_c
   create_location_by_result_plot(data, player_name, batter_side, pitch_colors)
 }
 
+create_release_consistency_plot <- function(data, player_name, pitch_colors) {
+  data <- normalize_columns(data)
 
-create_location_by_side_plot <- function(data, player_name, batter_side, pitch_colors) {
-  create_location_by_result_plot(data, player_name, batter_side, pitch_colors)
+  df <- data %>%
+    dplyr::filter(
+      Pitcher == player_name,
+      !is.na(RelSide), !is.na(RelHeight),
+      !is.na(TaggedPitchType), TaggedPitchType != "Other"
+    )
+
+  # Ring geometry (inches)
+  circ <- function(r) {
+    th <- seq(0, 2 * pi, length.out = 100)
+    data.frame(x = r * cos(th), y = r * sin(th), r = r)
+  }
+  ring_df <- do.call(rbind, lapply(c(3, 6, 9, 12), circ))
+  lim <- 13
+
+  base_plot <- ggplot() +
+    geom_path(data = ring_df, aes(x, y, group = r),
+              color = "gray75", linewidth = 0.4) +
+    geom_path(data = circ(3), aes(x, y), color = "#c0392b",
+              linewidth = 0.9, linetype = "longdash") +
+    annotate("text", x = 0, y = 3.6, label = "3\" = hitter-detectable",
+             size = 3, color = "#c0392b") +
+    geom_hline(yintercept = 0, color = "gray80", linewidth = 0.3) +
+    geom_vline(xintercept = 0, color = "gray80", linewidth = 0.3)
+
+  if (nrow(df) == 0) {
+    return(
+      base_plot +
+        coord_fixed(xlim = c(-lim, lim), ylim = c(-lim, lim)) +
+        labs(x = NULL, y = NULL) +
+        ggtitle("Release Consistency") +
+        theme_void(base_size = 12) +
+        theme(plot.title = element_text(size = 12, face = "bold", hjust = 0.5))
+    )
+  }
+
+  # Anchor = average release of the fastball if present, else most-thrown pitch
+  counts <- df %>% dplyr::count(TaggedPitchType, sort = TRUE)
+  anchor_type <- if (any(counts$TaggedPitchType == "Fastball")) {
+    "Fastball"
+  } else {
+    as.character(counts$TaggedPitchType[1])
+  }
+  anchor <- df %>%
+    dplyr::filter(TaggedPitchType == anchor_type) %>%
+    dplyr::summarise(RelSide   = mean(RelSide,   na.rm = TRUE),
+                     RelHeight = mean(RelHeight, na.rm = TRUE))
+
+  # Per-pitch averages, in INCHES relative to the anchor
+  avg <- df %>%
+    dplyr::group_by(TaggedPitchType) %>%
+    dplyr::summarise(RelSide   = mean(RelSide,   na.rm = TRUE),
+                     RelHeight = mean(RelHeight, na.rm = TRUE),
+                     .groups = "drop") %>%
+    dplyr::mutate(dx = (RelSide   - anchor$RelSide)   * 12,
+                  dy = (RelHeight - anchor$RelHeight) * 12)
+
+  base_plot +
+    geom_point(data = avg, aes(dx, dy, fill = TaggedPitchType),
+               shape = 21, size = 7, color = "black", stroke = 0.6) +
+    scale_fill_manual(values = pitch_colors, name = "Pitch") +
+    coord_fixed(xlim = c(-lim, lim), ylim = c(-lim, lim)) +
+    labs(x = NULL, y = NULL,
+         caption = sprintf("Center = avg %s release", anchor_type)) +
+    ggtitle("Release Consistency") +
+    theme_void(base_size = 12) +
+    theme(legend.position = "bottom",
+          plot.title   = element_text(size = 12, face = "bold", hjust = 0.5),
+          plot.caption = element_text(hjust = 0.5, color = "gray45"))
 }
 
 get_team_logo_path <- function(team_name, logo_dir = "logos") {
@@ -5625,9 +5703,9 @@ if (!is.null(team_master) && !is.na(pitcher_team_abbr)) {
     create_movement_plot(pitcher_df, pitcher_name, pitch_colors),
     error = function(e) ggplot2::ggplot() + ggplot2::theme_void() + ggplot2::ggtitle("Movement Plot Error")
   )
-  velo_plot <- tryCatch(
-    create_velocity_distribution_plot(pitcher_df, pitcher_name, pitch_colors),
-    error = function(e) ggplot2::ggplot() + ggplot2::theme_void() + ggplot2::ggtitle("Velocity Plot Error")
+  release_consistency_plot <- tryCatch(
+    create_release_consistency_plot(pitcher_df, pitcher_name, pitch_colors),
+    error = function(e) ggplot2::ggplot() + ggplot2::theme_void() + ggplot2::ggtitle("Release Consistency Error")
   )
   location_lhb <- tryCatch(
     create_location_by_result_plot(pitcher_df, pitcher_name, "Left", pitch_colors),
@@ -5652,27 +5730,27 @@ if (!is.null(team_master) && !is.na(pitcher_team_abbr)) {
   })
   
   # Start PDF
-  pdf(output_file, width = 11, height = 15)
+  pdf(output_file, width = 12, height = 18)
   on.exit(try(dev.off(), silent = TRUE), add = TRUE)
   grid::grid.newpage()
   
   header_y_top    <- 0.98
-  charts_y_top    <- 0.85
-  charts_height   <- 0.30
+  charts_y_top    <- 0.86
+  charts_height   <- 0.22
   charts_y_bottom <- charts_y_top - charts_height
   
   # --- BIGGER TABLES: taller rows, larger text ---
   row_h_char   <- 0.0235   # pitch characteristics row height
   hdr_cex      <- 0.72     # table header text size
   cell_cex     <- 0.72     # table cell text size
-  summary_cex  <- 1.15     # summary/header block text size
+  summary_cex  <- 0.78     # summary/header block text size
   section_cex  <- 1.35     # section title size
   
   rows_including_header <- num_rows + 1
   
   # ----- Row 2: Count Leverage TABLE (left) | Release plot (right) -----
-  row2_y_top     <- charts_y_bottom - 0.02
-  release_height <- 0.24
+  row2_y_top     <- charts_y_bottom - 0.018
+  release_height <- 0.18
   
   lev_rows  <- if (!is.null(lev_result)) nrow(lev_result$by_pitch) + 1L else 0L  # +1 overall row
   lev_row_h <- row_h_char
@@ -5681,13 +5759,15 @@ if (!is.null(team_master) && !is.na(pitcher_team_abbr)) {
   lev_block_bottom <- y_top_lev - (lev_rows + 1) * lev_row_h  # +1 for header row
   
   row2_bottom <- min(lev_block_bottom, row2_y_top - release_height)
+  # Never let the tables push the location charts off the page
+  row2_bottom <- max(row2_bottom, 0.40)
   
   # Pitch characteristics table below row 2
-  y_top_char <- row2_bottom - 0.045
+  y_top_char <- row2_bottom - 0.038
   char_block_bottom <- y_top_char - rows_including_header * row_h_char
   
   # Location plots at the BOTTOM of the report
-  y_loc_top <- char_block_bottom - 0.030
+  y_loc_top <- char_block_bottom - 0.026
   
   # ===== HEADER WITH LOGO =====
   grid::pushViewport(grid::viewport(x = 0.5, y = header_y_top, width = 1, height = 0.06, just = c("center","top")))
@@ -5699,7 +5779,7 @@ if (!is.null(team_master) && !is.na(pitcher_team_abbr)) {
   
  grid::grid.text(paste(pitcher_name, "- Advanced Pitcher Report"),
                   x = 0.5, y = 0.5,
-                  gp = grid::gpar(fontface = "bold", cex = 2.2, col = report_color_primary))
+                  gp = grid::gpar(fontface = "bold", cex = 1.5, col = report_color_primary))
   
   
   # Add team logo on the right if available (mirror)
@@ -5717,12 +5797,12 @@ if (!is.null(team_master) && !is.na(pitcher_team_abbr)) {
   
   summary_headers <- names(summary_stats)
   summary_values  <- as.numeric(summary_stats[1, ])
-  summary_widths  <- rep(0.095, length(summary_headers))
+  summary_widths  <- rep(0.070, length(summary_headers))
   
   x_start <- 0.5 - sum(summary_widths)/2
   x_pos   <- c(x_start, x_start + cumsum(summary_widths[-length(summary_widths)]))
-  y_top   <- 0.912
-  row_h   <- 0.032
+  y_top   <- 0.905
+  row_h   <- 0.022
   
   for (i in seq_along(summary_headers)) {
     grid::grid.rect(x = x_pos[i], y = y_top, width = summary_widths[i]*0.985, height = row_h,
@@ -5745,7 +5825,7 @@ if (!is.null(team_master) && !is.na(pitcher_team_abbr)) {
   grid::popViewport()
   
   grid::pushViewport(grid::viewport(x = 0.75, y = charts_y_top, width = 0.45, height = charts_height, just = c("center","top")))
-  tryCatch(print(velo_plot, newpage = FALSE), error = function(e) NULL)
+  tryCatch(print(release_consistency_plot, newpage = FALSE), error = function(e) NULL)
   grid::popViewport()
   
   # Row 2: Count Leverage TABLE (left) | Release side plot (right)
@@ -5922,12 +6002,23 @@ if (!is.null(team_master) && !is.na(pitcher_team_abbr)) {
     }
   }
   
-  # Location plots
-  grid::pushViewport(grid::viewport(x = 0.25, y = y_loc_top, width = 0.45, height = 0.24, just = c("center","top")))
+  # Location plots (stacked full-width so all 6 facets stay legible).
+  # Height is derived from whatever vertical space is actually left so the
+  # bottom panel never runs off the page on deep pitch mixes.
+  footer_y   <- 0.02
+  loc_gap    <- 0.010
+  loc_avail  <- y_loc_top - (footer_y + 0.022) - loc_gap
+  loc_row_h  <- max(0.085, min(0.150, loc_avail / 2))
+  
+  grid::pushViewport(grid::viewport(x = 0.5, y = y_loc_top,
+                                    width = 0.96, height = loc_row_h,
+                                    just = c("center","top")))
   tryCatch(print(location_lhb, newpage = FALSE), error = function(e) NULL)
   grid::popViewport()
   
-  grid::pushViewport(grid::viewport(x = 0.75, y = y_loc_top, width = 0.45, height = 0.24, just = c("center","top")))
+  grid::pushViewport(grid::viewport(x = 0.5, y = y_loc_top - loc_row_h - loc_gap,
+                                    width = 0.96, height = loc_row_h,
+                                    just = c("center","top")))
   tryCatch(print(location_rhb, newpage = FALSE), error = function(e) NULL)
   grid::popViewport()