Update app.R

app.R

@@ -2942,11 +2942,36 @@ create_pitcher_pdf <- function(game_df, pitcher_name, output_file, pitch_colors)
   invisible(output_file)
 }
 
+# --- NCAA CONSTANTS (all in feet) ---
+BALL_RADIUS_FT   <- 1.47 / 12         # 0.1225 ft (half of 2.94" diameter)
+PLATE_HALF_FT    <- 8.5 / 12          # 0.70833 ft
+
+# Raw zone: true plate + ball radius on all sides
+RAW_SIDE         <- PLATE_HALF_FT + BALL_RADIUS_FT   # 0.83083 ft
+RAW_BOTTOM       <- (18.00 / 12) - BALL_RADIUS_FT    # 1.3775 ft  (was 1.5)
+RAW_TOP          <- (40.53 / 12) + BALL_RADIUS_FT    # 3.5 ft     (was 3.3775)
+
+# Buffer zone: raw zone + 2" buffer (NCAA document values)
+BUFFER           <- 2.0 / 12                          # 0.1667 ft
+BUFFER_SIDE      <- RAW_SIDE + BUFFER                 # 0.9975 ft
+BUFFER_BOTTOM    <- RAW_BOTTOM - BUFFER               # 1.2108 ft  (was 1.3775)
+BUFFER_TOP       <- RAW_TOP + BUFFER                  # 3.6667 ft  (was 3.5)
+
+# Strike zone rectangles for plotting (center-of-ball comparison)
+STRIKE_ZONE_RECT <- data.frame(xmin = -RAW_SIDE, xmax = RAW_SIDE,
+                               ymin = RAW_BOTTOM, ymax = RAW_TOP)
+BUFFER_ZONE_RECT <- data.frame(xmin = -BUFFER_SIDE, xmax = BUFFER_SIDE,
+                               ymin = BUFFER_BOTTOM, ymax = BUFFER_TOP)
+
+HOME_PLATE <- data.frame(
+  x = c(-0.708,  0.708,  0.708,  0.000, -0.708),
+  y = c( 0.150,  0.150,  0.300,  0.500,  0.300)
+)
 
-# =====================================================================
-# ======================  UMPIRE CODE  ================================
-# =====================================================================
 
+# ============================================================
+# Data processing (unchanged)
+# ============================================================
 umpire_process_data <- function(df) {
   df <- df %>%
     filter(PitchCall %in% c("StrikeCalled", "BallCalled", "BallinDirt"))
@@ -2961,6 +2986,10 @@ umpire_process_data <- function(df) {
   df
 }
 
+
+# ============================================================
+# PDF Report Generator
+# ============================================================
 umpire_create_report_pdf <- function(data,
                                      output_file,
                                      left_logo_path = NULL,
@@ -2970,31 +2999,48 @@ umpire_create_report_pdf <- function(data,
                                      rows_per_page = 30) {
   
   suppressPackageStartupMessages({
-    library(dplyr); library(grid); library(gridExtra); library(ggplot2); library(stringr)
+    library(dplyr); library(grid); library(gridExtra)
+    library(ggplot2); library(stringr); library(ggforce)
   })
   `%||%` <- function(a, b) if (!is.null(a)) a else b
   
+  # ---------------------------------------------------------------
+  # RAW SCORE — uses raw zone (plate + ball radius, all 4 sides)
+  # "Does any edge of the ball touch the true strike zone?"
+  # ---------------------------------------------------------------
   raw_strike_miss <- data %>%
     filter(PitchCall == "StrikeCalled") %>%
-    filter(PlateLocSide < -0.83083 | PlateLocSide > 0.83083 |
-             PlateLocHeight > 3.37750 | PlateLocHeight < 1.5) %>% nrow()
+    filter(PlateLocSide < -RAW_SIDE | PlateLocSide > RAW_SIDE |
+             PlateLocHeight > RAW_TOP | PlateLocHeight < RAW_BOTTOM) %>%
+    nrow()
   
   raw_ball_miss <- data %>%
     filter(PitchCall %in% c("BallCalled", "BallinDirt")) %>%
-    filter(PlateLocSide > -0.83083 & PlateLocSide < 0.83083 &
-             PlateLocHeight < 3.37750 & PlateLocHeight > 1.5) %>% nrow()
+    filter(PlateLocSide > -RAW_SIDE & PlateLocSide < RAW_SIDE &
+             PlateLocHeight < RAW_TOP & PlateLocHeight > RAW_BOTTOM) %>%
+    nrow()
   
   total_called <- nrow(data)
   total_missed <- raw_strike_miss + raw_ball_miss
   correct      <- total_called - total_missed
   overall_pct  <- paste0(sprintf("%.0f", 100 * (correct / total_called)), "%")
   
+  # ---------------------------------------------------------------
+  # ADJUSTED / BUFFER SCORE — raw zone + 2" buffer on all sides
+  # ---------------------------------------------------------------
   buffer_strike_miss <- data %>%
     filter(PitchCall == "StrikeCalled") %>%
-    filter(PlateLocSide < -0.9975 | PlateLocSide > 0.9975 |
-             PlateLocHeight > 3.5 | PlateLocHeight < 1.3775) %>% nrow()
+    filter(PlateLocSide < -BUFFER_SIDE | PlateLocSide > BUFFER_SIDE |
+             PlateLocHeight > BUFFER_TOP | PlateLocHeight < BUFFER_BOTTOM) %>%
+    nrow()
   
-  buffer_total_missed <- raw_ball_miss + buffer_strike_miss
+  buffer_ball_miss <- data %>%
+    filter(PitchCall %in% c("BallCalled", "BallinDirt")) %>%
+    filter(PlateLocSide > -RAW_SIDE & PlateLocSide < RAW_SIDE &
+             PlateLocHeight < RAW_TOP & PlateLocHeight > RAW_BOTTOM) %>%
+    nrow()
+  
+  buffer_total_missed <- buffer_ball_miss + buffer_strike_miss
   buffer_correct      <- total_called - buffer_total_missed
   buffer_pct          <- paste0(sprintf("%.0f", 100 * (buffer_correct / total_called)), "%")
   
@@ -3007,24 +3053,18 @@ umpire_create_report_pdf <- function(data,
     paste("Umpire Report —", umpire_name)
   } else "Umpire Report"
   
-  strike_zone_rect <- data.frame(xmin = -0.83083, xmax = 0.83083, ymin = 1.5, ymax = 3.37750)
-  buffer_zone_rect <- data.frame(xmin = -0.9975, xmax = 0.9975, ymin = 1.3775, ymax = 3.5)
-  
-  home_plate <- data.frame(
-    x = c(-0.708,  0.708,  0.708,  0.000, -0.708),
-    y = c( 0.150,  0.150,  0.300,  0.500,  0.300)
-  )
-  
   # ---------------------------------------------------------------
-  # BUILD MISSED CALLS TABLE EARLY (before plots) so we can number them
+  # BUILD MISSED CALLS TABLE
   # ---------------------------------------------------------------
   MissedCalls <- dplyr::bind_rows(
+    # Balls called inside the raw zone (should have been strikes)
     data %>% filter(PitchCall %in% c("BallCalled", "BallinDirt"),
-                    PlateLocSide > -0.83083, PlateLocSide < 0.83083,
-                    PlateLocHeight < 3.37750, PlateLocHeight > 1.5),
+                    PlateLocSide > -RAW_SIDE, PlateLocSide < RAW_SIDE,
+                    PlateLocHeight < RAW_TOP, PlateLocHeight > RAW_BOTTOM),
+    # Strikes called outside the raw zone (should have been balls)
     data %>% filter(PitchCall == "StrikeCalled") %>%
-      filter(PlateLocSide < -0.83083 | PlateLocSide > 0.83083 |
-               PlateLocHeight > 3.37750 | PlateLocHeight < 1.5)
+      filter(PlateLocSide < -RAW_SIDE | PlateLocSide > RAW_SIDE |
+               PlateLocHeight > RAW_TOP | PlateLocHeight < RAW_BOTTOM)
   ) %>%
     arrange(PitchNo) %>%
     mutate(CallNo = row_number()) %>%
@@ -3033,21 +3073,18 @@ umpire_create_report_pdf <- function(data,
       Height = paste0(sprintf("%.0f", PlateLocHeight * 12), '"')
     )
   
-  # Keep PlateLocSide/PlateLocHeight/BatterSide/BatterTeam available for plot filtering
-  # but select display columns for the table at the end
-  
   # ---------------------------------------------------------------
-  # BASE ZONE HELPER
+  # BASE ZONE HELPER — draws both raw and buffer rectangles
   # ---------------------------------------------------------------
   base_zone <- function() {
     ggplot() +
-      geom_rect(data = buffer_zone_rect,
+      geom_rect(data = BUFFER_ZONE_RECT,
                 aes(xmin = xmin, xmax = xmax, ymin = ymin, ymax = ymax),
                 fill = NA, color = "gray50", linewidth = 0.6, linetype = "dotted") +
-      geom_rect(data = strike_zone_rect,
+      geom_rect(data = STRIKE_ZONE_RECT,
                 aes(xmin = xmin, xmax = xmax, ymin = ymin, ymax = ymax),
                 fill = NA, color = "black", linewidth = 0.8) +
-      geom_polygon(data = home_plate, aes(x = x, y = y),
+      geom_polygon(data = HOME_PLATE, aes(x = x, y = y),
                    fill = NA, color = "gray40", linewidth = 0.5) +
       coord_equal() +
       scale_x_continuous(limits = c(-1.8, 1.8)) +
@@ -3066,17 +3103,18 @@ umpire_create_report_pdf <- function(data,
   }
   
   # ---------------------------------------------------------------
-  # PLOT HELPERS — now use MissedCalls with CallNo labels
+  # PLOT HELPERS — ggforce::geom_circle for to-scale ball rendering
   # ---------------------------------------------------------------
   umpire_create_ball_plot <- function(mc, side_label, title_label) {
     pts <- mc %>%
       filter(BatterSide == side_label,
              PitchCall %in% c("BallCalled", "BallinDirt"),
-             PlateLocSide > -0.83083, PlateLocSide < 0.83083,
-             PlateLocHeight < 3.37750, PlateLocHeight > 1.5)
+             PlateLocSide > -RAW_SIDE, PlateLocSide < RAW_SIDE,
+             PlateLocHeight < RAW_TOP, PlateLocHeight > RAW_BOTTOM)
     base_zone() +
-      geom_point(data = pts, aes(x = PlateLocSide, y = PlateLocHeight),
-                 pch = 21, fill = "#006F71", color = "black", size = 5) +
+      ggforce::geom_circle(data = pts,
+                           aes(x0 = PlateLocSide, y0 = PlateLocHeight, r = BALL_RADIUS_FT),
+                           fill = "#006F71", color = "black", linewidth = 0.3, alpha = 0.85) +
       geom_text(data = pts, aes(x = PlateLocSide, y = PlateLocHeight, label = CallNo),
                 color = "white", size = 2.2, fontface = "bold") +
       ggtitle(title_label)
@@ -3085,11 +3123,12 @@ umpire_create_report_pdf <- function(data,
   umpire_create_strike_plot <- function(mc, side_label, title_label) {
     pts <- mc %>%
       filter(BatterSide == side_label, PitchCall == "StrikeCalled") %>%
-      filter(PlateLocSide < -0.83083 | PlateLocSide > 0.83083 |
-               PlateLocHeight > 3.37750 | PlateLocHeight < 1.5)
+      filter(PlateLocSide < -RAW_SIDE | PlateLocSide > RAW_SIDE |
+               PlateLocHeight > RAW_TOP | PlateLocHeight < RAW_BOTTOM)
     base_zone() +
-      geom_point(data = pts, aes(x = PlateLocSide, y = PlateLocHeight),
-                 pch = 21, fill = "#006F71", color = "black", size = 5) +
+      ggforce::geom_circle(data = pts,
+                           aes(x0 = PlateLocSide, y0 = PlateLocHeight, r = BALL_RADIUS_FT),
+                           fill = "#006F71", color = "black", linewidth = 0.3, alpha = 0.85) +
       geom_text(data = pts, aes(x = PlateLocSide, y = PlateLocHeight, label = CallNo),
                 color = "white", size = 2.2, fontface = "bold") +
       ggtitle(title_label)
@@ -3099,11 +3138,12 @@ umpire_create_report_pdf <- function(data,
     pts <- mc %>%
       filter(if (is_ccu) BatterTeam == "COA_CHA" else BatterTeam != "COA_CHA",
              PitchCall %in% c("BallCalled", "BallinDirt"),
-             PlateLocSide > -0.83083, PlateLocSide < 0.83083,
-             PlateLocHeight < 3.37750, PlateLocHeight > 1.5)
+             PlateLocSide > -RAW_SIDE, PlateLocSide < RAW_SIDE,
+             PlateLocHeight < RAW_TOP, PlateLocHeight > RAW_BOTTOM)
     base_zone() +
-      geom_point(data = pts, aes(x = PlateLocSide, y = PlateLocHeight),
-                 pch = 21, fill = "#006F71", color = "black", size = 5) +
+      ggforce::geom_circle(data = pts,
+                           aes(x0 = PlateLocSide, y0 = PlateLocHeight, r = BALL_RADIUS_FT),
+                           fill = "#006F71", color = "black", linewidth = 0.3, alpha = 0.85) +
       geom_text(data = pts, aes(x = PlateLocSide, y = PlateLocHeight, label = CallNo),
                 color = "white", size = 2.2, fontface = "bold") +
       ggtitle(title_label)
@@ -3113,18 +3153,19 @@ umpire_create_report_pdf <- function(data,
     pts <- mc %>%
       filter(if (is_ccu) BatterTeam == "COA_CHA" else BatterTeam != "COA_CHA",
              PitchCall == "StrikeCalled") %>%
-      filter(PlateLocSide < -0.83083 | PlateLocSide > 0.83083 |
-               PlateLocHeight > 3.37750 | PlateLocHeight < 1.5)
+      filter(PlateLocSide < -RAW_SIDE | PlateLocSide > RAW_SIDE |
+               PlateLocHeight > RAW_TOP | PlateLocHeight < RAW_BOTTOM)
     base_zone() +
-      geom_point(data = pts, aes(x = PlateLocSide, y = PlateLocHeight),
-                 pch = 21, fill = "#006F71", color = "black", size = 5) +
+      ggforce::geom_circle(data = pts,
+                           aes(x0 = PlateLocSide, y0 = PlateLocHeight, r = BALL_RADIUS_FT),
+                           fill = "#006F71", color = "black", linewidth = 0.3, alpha = 0.85) +
       geom_text(data = pts, aes(x = PlateLocSide, y = PlateLocHeight, label = CallNo),
                 color = "white", size = 2.2, fontface = "bold") +
       ggtitle(title_label)
   }
   
   # ---------------------------------------------------------------
-  # CREATE ALL PLOTS (pass MissedCalls instead of data)
+  # CREATE ALL PLOTS
   # ---------------------------------------------------------------
   plot_ball_lhb   <- umpire_create_ball_plot(MissedCalls, "Left",  "Ball Called v LHB")
   plot_ball_rhb   <- umpire_create_ball_plot(MissedCalls, "Right", "Ball Called v RHB")
@@ -3137,7 +3178,7 @@ umpire_create_report_pdf <- function(data,
   plot_strike_opp <- umpire_create_strike_plot_team(MissedCalls, FALSE, "Strike Called v Opp Hitters")
   
   # ---------------------------------------------------------------
-  # PREPARE DISPLAY TABLE (select only display columns, CallNo first)
+  # PREPARE DISPLAY TABLE
   # ---------------------------------------------------------------
   MissedCallsDisplay <- MissedCalls %>%
     select(dplyr::any_of(c("CallNo","PitchNo","Inning","Top/Bottom","TopBottom",
@@ -3181,61 +3222,41 @@ umpire_create_report_pdf <- function(data,
     })
     
     draw_logo_url <- function(url, x, just) {
-      img <- try(
-        magick::image_read(url),
-        silent = TRUE
-      )
-      
+      img <- try(magick::image_read(url), silent = TRUE)
       if (inherits(img, "try-error")) return(NULL)
-      
       img <- magick::image_resize(img, "x130")
-      
       grid.draw(
         grid::rasterGrob(
           as.raster(img),
           interpolate = TRUE,
           vp = viewport(
-            x = x,
-            y = 0.96,
-            width = 0.13,
-            height = 0.08,
+            x = x, y = 0.96,
+            width = 0.13, height = 0.08,
             just = c(just, "center")
           )
         )
       )
     }
     
-    ## --- EMBEDDED LOGO LINKS ---
     left_logo_url  <- "https://i.imgur.com/zjTu3JS.png"
     right_logo_url <- "https://i.ibb.co/Q3kFXXd9/8acd1b8a-7920-403a-8e9d-86742634effb.png"
     
     draw_logo_url(left_logo_url,  0.05, "left")
     draw_logo_url(right_logo_url, 0.95, "right")
     
-    ## --- HEADER TEXT ---
-    grid.text(
-      title_text,
-      y = 0.975,
-      gp = gpar(fontsize = 16, fontface = "bold")
-    )
-    
-    grid.text(
-      subhead_text,
-      y = 0.948,
-      gp = gpar(fontsize = 12, fontface = "bold")
-    )
-    
+    grid.text(title_text,   y = 0.975, gp = gpar(fontsize = 16, fontface = "bold"))
+    grid.text(subhead_text, y = 0.948, gp = gpar(fontsize = 12, fontface = "bold"))
     if (!is.na(game_date)) {
-      grid.text(
-        game_date,
-        y = 0.925,
-        gp = gpar(fontsize = 9)
-      )
+      grid.text(game_date, y = 0.925, gp = gpar(fontsize = 9))
     }
   }
   
+  # ---------------------------------------------------------------
+  # RENDER PDF
+  # ---------------------------------------------------------------
   grDevices::pdf(output_file, width = 8.5, height = 11)
   
+  # --- PAGE 1: Header + Raw Score + LHB/RHB plots + Adjusted Score ---
   grid.newpage()
   draw_header()
   
@@ -3253,6 +3274,7 @@ umpire_create_report_pdf <- function(data,
   grid.table(buffer_table, rows = NULL, theme = ttheme_green)
   popViewport()
   
+  # --- PAGE 2: Team plots + Missed Calls table ---
   grid.newpage()
   
   grid::grid.text("Data: TrackMan | Report Generated: Coastal Carolina Baseball Analytics",
@@ -3264,23 +3286,19 @@ umpire_create_report_pdf <- function(data,
   pushViewport(viewport(x = 0.72, y = 0.60, width = 0.47, height = 0.27)); print(plot_strike_opp, newpage = FALSE); popViewport()
   
   if (nrow(MissedCallsDisplay) > 0) {
-    # First page can fit 15 rows in the bottom half
     first_page_rows <- 15
-    remaining_page_rows <- rows_per_page  # 30 rows per full page
+    remaining_page_rows <- rows_per_page
     
     if (nrow(MissedCallsDisplay) <= first_page_rows) {
-      # Fits on current page
       pushViewport(viewport(x = 0.5, y = 0.30, width = 0.92, height = 0.50))
       grid.table(MissedCallsDisplay, rows = NULL, theme = ttheme_green_small)
       popViewport()
     } else {
-      # First batch on current page
       first_chunk <- MissedCallsDisplay[1:first_page_rows, , drop = FALSE]
       pushViewport(viewport(x = 0.5, y = 0.30, width = 0.92, height = 0.50))
       grid.table(first_chunk, rows = NULL, theme = ttheme_green_small)
       popViewport()
       
-      # Remaining rows paginated onto new pages
       remaining <- MissedCallsDisplay[(first_page_rows + 1):nrow(MissedCallsDisplay), , drop = FALSE]
       remaining_chunks <- split(remaining, ceiling(seq_len(nrow(remaining)) / remaining_page_rows))
       
@@ -3299,7 +3317,6 @@ umpire_create_report_pdf <- function(data,
   invisible(output_file)
 }
 
-
 # Advanced Pitcher Functions
 `%||%` <- function(a, b) if (!is.null(a)) a else b