Update app.R

app.R

@@ -17,7 +17,6 @@ library(tidyr)
 library(stringr)
 library(ggplot2)
 library(scales)
-library(jsonlite)
 
 # ============================================================
 # READ IN DATA
@@ -174,7 +173,7 @@ spring26_ncaa <- download_master_dataset("CoastalBaseball/2026MasterDataset", "n
 college_join  <- download_private_csv("CoastalBaseball/DefenseAppDataset", "college_join.csv")
 
 # Load Catcher 2026 data
-Catcher2026 <- read_parquet("Catcher2026.parquet")
+Catcher2026 <- download_private_parquet("CoastalBaseball/DefenseAppDataset", "Catcher2026.parquet")
 Catcher2026 <- Catcher2026 %>%
   mutate(
     Date = as.Date(Date),
@@ -190,14 +189,24 @@ Catcher2026 <- Catcher2026 %>%
   )
 
 # Classify framing: Strike Added / Strike Lost
-# Use broader matching for PitchCall values
+STRIKE_CALLS <- c("StrikeCalled","Called Strike","strike_called","StrikeSwinging",
+                   "FoulBall","InPlay","Foul","FoulBallNotFieldable",
+                   "FoulBallFieldable","FoulTip","Foul Tip")
+BALL_CALLS <- c("BallCalled","Ball","ball_called","BallinDirt","BallIntentional",
+                "HitByPitch","ball","AutomaticBall")
 Catcher2026 <- Catcher2026 %>%
   mutate(
+    StolenStrike = as.integer(in_zone == 0 & PitchCall %in% STRIKE_CALLS),
+    StrikeLost   = as.integer(in_zone == 1 & PitchCall %in% BALL_CALLS),
     frame = case_when(
-      is_swing == 1 ~ NA_character_,
-      grepl("ball", PitchCall, ignore.case = TRUE) & in_zone == 1 ~ "Strike Lost",
-      grepl("strike", PitchCall, ignore.case = TRUE) & !grepl("foul|swing", PitchCall, ignore.case = TRUE) & in_zone == 0 ~ "Strike Added",
+      in_zone == 1 & PitchCall %in% BALL_CALLS ~ "Strike Lost",
+      in_zone == 0 & PitchCall %in% STRIKE_CALLS ~ "Strike Added",
       TRUE ~ NA_character_
+    ),
+    frame_numeric = case_when(
+      in_zone == 1 & PitchCall %in% BALL_CALLS ~ -1,
+      in_zone == 0 & PitchCall %in% STRIKE_CALLS ~ 1,
+      TRUE ~ NA_real_
     )
   )
 
@@ -1030,10 +1039,10 @@ app_ui <- fluidPage(
               fluidRow(
                 column(6,
                   h4("Strikes Added", class = "section-header"),
-                  plotlyOutput("recv_strikes_added", height = "480px")),
+                  plotOutput("recv_strikes_added", height = "480px")),
                 column(6,
                   h4("Strikes Lost", class = "section-header"),
-                  plotlyOutput("recv_strikes_lost", height = "480px"))
+                  plotOutput("recv_strikes_lost", height = "480px"))
               ),
               hr(),
               h4("Framing Log", class = "section-header"),
@@ -1086,7 +1095,7 @@ app_ui <- fluidPage(
                   plotlyOutput("block_ground_plot", height = "500px")),
                 column(6,
                   h4("Blocking (Zone View)", class = "section-header"),
-                  plotlyOutput("block_zone_plot", height = "500px"))
+                  plotOutput("block_zone_plot", height = "500px"))
               ),
               hr(),
               h4("Blocking Log", class = "section-header"),
@@ -1709,7 +1718,12 @@ server <- function(input, output, session) {
   })
   
   
-  # Pure plotly zone plot helper — no ggplotly conversion issues
+  # Zone plot geometry
+  szr <- data.frame(xmin=-.83083, xmax=.83083, ymin=1.5, ymax=3.3775)
+  bzr <- data.frame(xmin=-.9975, xmax=.9975, ymin=1.3775, ymax=3.5)
+  hp_recv <- data.frame(x=c(-.60,.60,.60,0,-.60), y=c(.15,.15,.27,.42,.27))
+
+  # Plotly zone shapes for catch position overhead
   plotly_zone_shapes <- function() {
     list(
       list(type="rect", x0=-.83083, x1=.83083, y0=1.5, y1=3.3775,
@@ -1722,87 +1736,111 @@ server <- function(input, output, session) {
     )
   }
 
-  make_recv_plot <- function(data, title_text, view_mode) {
-    if (nrow(data) == 0) {
-      return(plot_ly() %>% layout(title=list(text=title_text, font=list(size=14)),
-             xaxis=list(visible=FALSE), yaxis=list(visible=FALSE),
-             annotations=list(list(text="No data", showarrow=FALSE, font=list(size=16)))))
-    }
+  # Core zone plot function (ggplot, NO plotly)
+  make_zone_plot <- function(data, title) {
+    if (!nrow(data)) return(
+      ggplot() + theme_void() + ggtitle(title) +
+        theme(plot.title = element_text(hjust=.5, size=10, face="bold")))
+    apt <- unique(data$TaggedPitchType[!is.na(data$TaggedPitchType)])
+    ggplot(data, aes(PlateLocSide, PlateLocHeight)) +
+      geom_rect(data=bzr, aes(xmin=xmin,xmax=xmax,ymin=ymin,ymax=ymax),
+                fill=NA, color="gray50", linewidth=.5, linetype="dotted", inherit.aes=FALSE) +
+      geom_rect(data=szr, aes(xmin=xmin,xmax=xmax,ymin=ymin,ymax=ymax),
+                fill=NA, color="black", linewidth=.7, inherit.aes=FALSE) +
+      geom_polygon(data=hp_recv, aes(x=x,y=y),
+                   fill=NA, color="gray40", linewidth=.4, inherit.aes=FALSE) +
+      geom_point(aes(fill=TaggedPitchType), shape=21, size=5,
+                 color="black", stroke=.6, alpha=.95, na.rm=TRUE) +
+      geom_text(aes(label=row_num), size=2.0, fontface="bold", color="white", na.rm=TRUE) +
+      scale_fill_manual(values=pitch_colors, na.value="grey60",
+                        name="Pitch Type", drop=FALSE, limits=apt) +
+      coord_equal() +
+      scale_x_continuous(limits=c(-1.8,1.8)) +
+      scale_y_continuous(limits=c(0,4.5)) +
+      labs(title=title) + theme_classic() +
+      theme(axis.title=element_blank(), axis.text=element_blank(),
+            axis.ticks=element_blank(), axis.line=element_blank(),
+            panel.grid=element_blank(),
+            plot.title=element_text(hjust=.5, size=10, face="bold"),
+            plot.margin=margin(2,2,2,2), legend.position="none")
+  }
 
-    if (view_mode == "Catch Position (Overhead)") {
-      data <- data %>% filter(!is.na(CatchPositionX) & !is.na(CatchPositionZ))
-      if (nrow(data) == 0) return(plot_ly() %>% layout(title="No catch position data"))
-      data <- data %>% mutate(row_num = row_number(), cpx = as.numeric(CatchPositionX), cpz = as.numeric(CatchPositionZ))
-      pt_colors <- sapply(data$TaggedPitchType, function(pt) {
-        if (!is.na(pt) && pt %in% names(pitch_colors)) pitch_colors[pt] else "grey60"
-      })
-      p <- plot_ly(data, x=~cpx, y=~cpz, type="scatter", mode="markers",
-                   marker=list(size=10, color=pt_colors, line=list(color="black", width=1)),
-                   text=~paste0("#",row_num,"<br>Pitch: ",TaggedPitchType,
-                                "<br>Pitcher: ",Pitcher,"<br>Batter: ",Batter,"<br>Date: ",Date),
-                   hoverinfo="text") %>%
-        layout(title=list(text=paste(title_text,"- Catch Position"), font=list(size=14)),
-               xaxis=list(title="X (ft)", range=c(-4,4), scaleanchor="y"),
-               yaxis=list(title="Z (ft)", range=c(-5,3)),
-               shapes=list(
-                 list(type="rect", x0=-3.5, x1=-0.708, y0=-4.5, y1=0.15,
-                      line=list(color="black",width=1), fillcolor="rgba(200,200,200,0.3)"),
-                 list(type="rect", x0=0.708, x1=3.5, y0=-4.5, y1=0.15,
-                      line=list(color="black",width=1), fillcolor="rgba(200,200,200,0.3)"),
-                 list(type="path",
-                      path="M -0.708 0.15 L 0.708 0.15 L 0.708 0.3 L 0 0.5 L -0.708 0.3 Z",
-                      line=list(color="black",width=1.5), fillcolor="rgba(240,240,240,0.5)"))
-        )
-      return(p)
-    }
+  # Heatmap zone plot function (ggplot, NO plotly)
+  make_zone_heatmap <- function(data, title) {
+    if (nrow(data) < 3) return(
+      ggplot() + theme_void() + ggtitle(paste(title, "- Not enough data")) +
+        theme(plot.title = element_text(hjust=.5, size=10, face="bold")))
+    ggplot(data, aes(x=PlateLocSide, y=PlateLocHeight)) +
+      stat_density_2d(aes(fill=after_stat(density)), geom="raster", contour=FALSE) +
+      scale_fill_gradientn(colours=c("white","#0551bc","#02fbff","#03ff00",
+                                     "#fbff00","#ffa503","#ff1f02","#dc1100"),
+                           name="Density") +
+      geom_rect(data=szr, aes(xmin=xmin,xmax=xmax,ymin=ymin,ymax=ymax),
+                fill=NA, color="black", linewidth=1, inherit.aes=FALSE) +
+      geom_polygon(data=hp_recv, aes(x=x,y=y),
+                   fill=NA, color="black", linewidth=.8, inherit.aes=FALSE) +
+      coord_fixed(ratio=1) + xlim(-2,2) + ylim(0,4.5) +
+      ggtitle(title) + theme_void() +
+      theme(legend.position="right", plot.margin=margin(3,3,3,3),
+            plot.title=element_text(hjust=0.5, size=12, face="bold"))
+  }
 
-    if (view_mode == "Heatmap") {
-      data <- data %>% filter(!is.na(PlateLocSide) & !is.na(PlateLocHeight))
-      if (nrow(data) < 3) return(plot_ly() %>% layout(title=paste(title_text,"- Not enough data")))
-      p <- plot_ly(data, x=~PlateLocSide, y=~PlateLocHeight, type="histogram2dcontour",
-                   colorscale=list(c(0,"white"),c(0.25,"#0551bc"),c(0.5,"#03ff00"),c(0.75,"#fbff00"),c(1,"#dc1100")),
-                   contours=list(showlabels=FALSE), showscale=FALSE) %>%
-        layout(title=list(text=title_text, font=list(size=14)),
-               xaxis=list(title="", range=c(-2,2), scaleanchor="y", showticklabels=FALSE),
-               yaxis=list(title="", range=c(0,4.5), showticklabels=FALSE),
-               shapes=plotly_zone_shapes())
-      return(p)
+  output$recv_strikes_added <- renderPlot({
+    d <- recv_data() %>% filter(frame == "Strike Added") %>% mutate(row_num = row_number())
+    vm <- input$recv_view_mode
+    if (vm == "Heatmap") {
+      make_zone_heatmap(d, "Strikes Added")
+    } else if (vm == "Catch Position (Overhead)") {
+      # Render as ggplot with batters box
+      d2 <- d %>% filter(!is.na(CatchPositionX) & !is.na(CatchPositionZ)) %>%
+        mutate(cpx = as.numeric(CatchPositionX), cpz = as.numeric(CatchPositionZ))
+      if (nrow(d2) == 0) return(ggplot() + theme_void() + ggtitle("No catch position data"))
+      bi <- 1; bo <- 4; bymin <- -2.5; bymax <- 3.7
+      plate <- data.frame(x=c(-.708,.708,.708,0,-.708), y=c(1.417,1.417,.708,0,.708))
+      apt <- unique(d2$TaggedPitchType[!is.na(d2$TaggedPitchType)])
+      ggplot(d2, aes(x=cpx, y=cpz)) +
+        annotate("rect", xmin=bi, xmax=bo, ymin=bymin, ymax=bymax, fill=NA, color="black", linewidth=.8) +
+        annotate("rect", xmin=-bo, xmax=-bi, ymin=bymin, ymax=bymax, fill=NA, color="black", linewidth=.8) +
+        geom_polygon(data=plate, aes(x=x,y=y), fill=NA, color="black", linewidth=.8, inherit.aes=FALSE) +
+        geom_point(aes(fill=TaggedPitchType), shape=21, size=4, color="black", stroke=.6, alpha=.95) +
+        geom_text(aes(label=row_num), size=2.0, fontface="bold", color="white") +
+        scale_fill_manual(values=pitch_colors, na.value="grey60", name="Pitch Type", drop=FALSE, limits=apt) +
+        coord_fixed() + labs(title="Strikes Added - Catch Position") +
+        theme_void() + theme(plot.title=element_text(hjust=.5, size=10, face="bold"),
+                             legend.position="bottom")
+    } else {
+      make_zone_plot(d, "Strikes Added")
     }
-
-    # Default: Points mode — pure plotly
-    data <- data %>% mutate(row_num = row_number())
-    pt_colors <- sapply(data$TaggedPitchType, function(pt) {
-      if (!is.na(pt) && pt %in% names(pitch_colors)) pitch_colors[pt] else "grey60"
-    })
-    p <- plot_ly(data, x=~PlateLocSide, y=~PlateLocHeight, type="scatter", mode="markers+text",
-                 marker=list(size=14, color=pt_colors, line=list(color="black", width=1.2)),
-                 text=~as.character(row_num), textfont=list(size=8, color="white"),
-                 textposition="middle center",
-                 hovertext=~paste0("#",row_num,"<br>Pitch: ",TaggedPitchType,
-                                   "<br>Pitcher: ",Pitcher,"<br>Batter: ",Batter,
-                                   "<br>Velo: ",round(RelSpeed,1)," mph",
-                                   "<br>Count: ",Balls,"-",Strikes,
-                                   "<br>RV: ",round(mean_DRE,3),"<br>Date: ",Date),
-                 hoverinfo="text") %>%
-      layout(title=list(text=title_text, font=list(size=14)),
-             xaxis=list(title="", range=c(-1.8,1.8), zeroline=FALSE, showticklabels=FALSE, scaleanchor="y"),
-             yaxis=list(title="", range=c(0,4.5), zeroline=FALSE, showticklabels=FALSE),
-             shapes=plotly_zone_shapes(),
-             showlegend=FALSE)
-    p
-  }
-  
-    output$recv_strikes_added <- renderPlotly({
-    d <- recv_data() %>% filter(frame == "Strike Added")
-    make_recv_plot(d, "Strikes Added", input$recv_view_mode)
   })
-  
-  output$recv_strikes_lost <- renderPlotly({
-    d <- recv_data() %>% filter(frame == "Strike Lost")
-    make_recv_plot(d, "Strikes Lost", input$recv_view_mode)
+
+  output$recv_strikes_lost <- renderPlot({
+    d <- recv_data() %>% filter(frame == "Strike Lost") %>% mutate(row_num = row_number())
+    vm <- input$recv_view_mode
+    if (vm == "Heatmap") {
+      make_zone_heatmap(d, "Strikes Lost")
+    } else if (vm == "Catch Position (Overhead)") {
+      d2 <- d %>% filter(!is.na(CatchPositionX) & !is.na(CatchPositionZ)) %>%
+        mutate(cpx = as.numeric(CatchPositionX), cpz = as.numeric(CatchPositionZ))
+      if (nrow(d2) == 0) return(ggplot() + theme_void() + ggtitle("No catch position data"))
+      bi <- 1; bo <- 4; bymin <- -2.5; bymax <- 3.7
+      plate <- data.frame(x=c(-.708,.708,.708,0,-.708), y=c(1.417,1.417,.708,0,.708))
+      apt <- unique(d2$TaggedPitchType[!is.na(d2$TaggedPitchType)])
+      ggplot(d2, aes(x=cpx, y=cpz)) +
+        annotate("rect", xmin=bi, xmax=bo, ymin=bymin, ymax=bymax, fill=NA, color="black", linewidth=.8) +
+        annotate("rect", xmin=-bo, xmax=-bi, ymin=bymin, ymax=bymax, fill=NA, color="black", linewidth=.8) +
+        geom_polygon(data=plate, aes(x=x,y=y), fill=NA, color="black", linewidth=.8, inherit.aes=FALSE) +
+        geom_point(aes(fill=TaggedPitchType), shape=21, size=4, color="black", stroke=.6, alpha=.95) +
+        geom_text(aes(label=row_num), size=2.0, fontface="bold", color="white") +
+        scale_fill_manual(values=pitch_colors, na.value="grey60", name="Pitch Type", drop=FALSE, limits=apt) +
+        coord_fixed() + labs(title="Strikes Lost - Catch Position") +
+        theme_void() + theme(plot.title=element_text(hjust=.5, size=10, face="bold"),
+                             legend.position="bottom")
+    } else {
+      make_zone_plot(d, "Strikes Lost")
+    }
   })
-  
-  output$recv_log_table <- renderDT({
+
+    output$recv_log_table <- renderDT({
     d <- recv_data() %>%
       filter(!is.na(frame)) %>%
       dplyr::select(Date, Inning, Pitcher, Batter, TaggedPitchType,
@@ -2149,48 +2187,43 @@ server <- function(input, output, session) {
     ggplotly(p, tooltip="text")
   })
   
-  output$block_zone_plot <- renderPlotly({
+  output$block_zone_plot <- renderPlot({
     bd <- block_data() %>%
       filter(!is.na(PlateLocSide) & !is.na(PlateLocHeight)) %>%
       mutate(row_num = row_number())
-
     view_mode <- input$block_view_mode
-
-    if (nrow(bd) == 0) {
-      return(plot_ly() %>% layout(title="Blocking (Zone)", xaxis=list(visible=FALSE), yaxis=list(visible=FALSE)))
-    }
-
+    if (nrow(bd) == 0) return(
+      ggplot() + theme_void() + ggtitle("Blocking (Zone)") +
+        theme(plot.title = element_text(hjust=.5, size=10, face="bold")))
     if (view_mode == "Heatmap" && nrow(bd) >= 3) {
-      p <- plot_ly(bd, x=~PlateLocSide, y=~PlateLocHeight, type="histogram2dcontour",
-                   colorscale=list(c(0,"white"),c(0.25,"#0551bc"),c(0.5,"#03ff00"),c(0.75,"#fbff00"),c(1,"#dc1100")),
-                   showscale=FALSE) %>%
-        layout(title=list(text="Blocking (Zone) - Heatmap", font=list(size=14)),
-               xaxis=list(title="", range=c(-2.5,2.5), scaleanchor="y", showticklabels=FALSE),
-               yaxis=list(title="", range=c(-1,4.5), showticklabels=FALSE),
-               shapes=plotly_zone_shapes())
-      return(p)
+      return(make_zone_heatmap(bd, "Blocking (Zone) - Heatmap"))
     }
-
-    # Points mode — pure plotly
-    pt_colors <- sapply(bd$TaggedPitchType, function(pt) {
-      if (!is.na(pt) && pt %in% names(pitch_colors)) pitch_colors[pt] else "grey60"
-    })
-    symbols <- ifelse(bd$block_type == "PB/WP", "triangle-up", "circle")
-    p <- plot_ly(bd, x=~PlateLocSide, y=~PlateLocHeight, type="scatter", mode="markers+text",
-                 marker=list(size=14, color=pt_colors, symbol=symbols, line=list(color="black", width=1.2)),
-                 text=~as.character(row_num), textfont=list(size=8, color="white"),
-                 textposition="middle center",
-                 hovertext=~paste0("#",row_num,"<br>Pitch: ",TaggedPitchType,
-                                   "<br>Type: ",block_type,
-                                   "<br>Pitcher: ",Pitcher,"<br>Batter: ",Batter,
-                                   "<br>Velo: ",round(RelSpeed,1)," mph",
-                                   "<br>RV: ",round(mean_DRE,3),"<br>Date: ",Date),
-                 hoverinfo="text") %>%
-      layout(title=list(text="Blocking (Zone)", font=list(size=14)),
-             xaxis=list(title="", range=c(-2.5,2.5), scaleanchor="y", showticklabels=FALSE),
-             yaxis=list(title="", range=c(-1,4.5), showticklabels=FALSE),
-             shapes=plotly_zone_shapes(), showlegend=FALSE)
-    p
+    sl <- unique(bd$block_type)
+    sv <- c("Block"=21, "PB/WP"=24)[sl]
+    slb <- c("Block"="Block", "PB/WP"="PB/WP")[sl]
+    tc <- bd %>% count(TaggedPitchType) %>% mutate(label=paste0(TaggedPitchType,": ",n))
+    cl <- setNames(tc$label, tc$TaggedPitchType)
+    ggplot(bd, aes(PlateLocSide, PlateLocHeight)) +
+      geom_rect(data=bzr, aes(xmin=xmin,xmax=xmax,ymin=ymin,ymax=ymax),
+                fill=NA, color="gray50", linewidth=.6, linetype="dotted", inherit.aes=FALSE) +
+      geom_rect(data=szr, aes(xmin=xmin,xmax=xmax,ymin=ymin,ymax=ymax),
+                fill=NA, color="black", linewidth=.8, inherit.aes=FALSE) +
+      geom_polygon(data=hp_recv, aes(x=x,y=y),
+                   fill=NA, color="gray40", linewidth=.5, inherit.aes=FALSE) +
+      geom_point(aes(fill=TaggedPitchType, shape=block_type), size=4, color="black", stroke=.6, na.rm=TRUE) +
+      geom_text(aes(label=row_num), size=2.0, fontface="bold", color="white", na.rm=TRUE) +
+      scale_fill_manual(values=pitch_colors, na.value="grey60", name="Pitch Type", labels=cl) +
+      scale_shape_manual(values=sv, name=NULL, labels=slb) +
+      coord_equal(xlim=c(-2.5,2.5), ylim=c(-1,4.5)) +
+      labs(title="Blocking (Zone)") + theme_void() +
+      theme(plot.title=element_text(hjust=.5, size=10, face="bold"),
+            legend.position="bottom", legend.box="vertical",
+            legend.spacing.y=unit(2,"pt"),
+            legend.title=element_text(size=7, face="bold"),
+            legend.text=element_text(size=6),
+            legend.key.size=unit(.5,"lines")) +
+      guides(fill=guide_legend(order=1, nrow=2, override.aes=list(size=3, shape=21)),
+             shape=guide_legend(order=2, nrow=1, override.aes=list(size=3, fill="#4472C4")))
   })
   
   output$block_log_table <- renderDT({