Update app.R

app.R

@@ -173,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),
@@ -189,26 +189,29 @@ Catcher2026 <- Catcher2026 %>%
   )
 
 # Classify framing: Strike Added / Strike Lost
-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")
+# Use plate location geometry (converted to feet) to determine zone status
+# Zone: |PlateLocSide/12| <= 0.83083 AND PlateLocHeight/12 between 1.5 and 3.3775
+CALLED_STRIKE <- c("StrikeCalled","Called Strike","strike_called")
+CALLED_BALL   <- c("BallCalled","Ball","ball_called","BallinDirt","BallIntentional",
+                    "HitByPitch","AutomaticBall")
 Catcher2026 <- Catcher2026 %>%
   mutate(
-    StolenStrike = as.integer(in_zone == 0 & PitchCall %in% STRIKE_CALLS),
-    StrikeLost   = as.integer(in_zone == 1 & PitchCall %in% BALL_CALLS),
+    pls_ft = as.numeric(PlateLocSide) / 12,
+    plh_ft = as.numeric(PlateLocHeight) / 12,
+    loc_in_zone = abs(pls_ft) <= 0.83083 & plh_ft >= 1.5 & plh_ft <= 3.3775,
     frame = case_when(
-      in_zone == 1 & PitchCall %in% BALL_CALLS ~ "Strike Lost",
-      in_zone == 0 & PitchCall %in% STRIKE_CALLS ~ "Strike Added",
+      is.na(pls_ft) | is.na(plh_ft) ~ NA_character_,
+      !loc_in_zone & PitchCall %in% CALLED_STRIKE ~ "Strike Added",
+      loc_in_zone & PitchCall %in% CALLED_BALL ~ "Strike Lost",
       TRUE ~ NA_character_
     ),
     frame_numeric = case_when(
-      in_zone == 1 & PitchCall %in% BALL_CALLS ~ -1,
-      in_zone == 0 & PitchCall %in% STRIKE_CALLS ~ 1,
+      frame == "Strike Added" ~ 1,
+      frame == "Strike Lost" ~ -1,
       TRUE ~ NA_real_
     )
-  )
+  ) %>%
+  dplyr::select(-pls_ft, -plh_ft, -loc_in_zone)
 
 # ============================================================
 # PREPARE DEFENSE DATA
@@ -1774,7 +1777,6 @@ server <- function(input, output, session) {
                    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() +
@@ -1837,7 +1839,6 @@ server <- function(input, output, session) {
                   fill=NA, color="gray50", linewidth=.6, inherit.aes=FALSE) +
         geom_polygon(data=plate_oh, aes(x=x,y=y), fill="gray95", 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=ttl, x="Side (ft)", y="Depth (ft)") +
         theme_minimal() + theme(plot.title=element_text(hjust=.5, size=10, face="bold"),
@@ -1853,7 +1854,6 @@ server <- function(input, output, session) {
         annotate("text", x=min(d2$cpz, na.rm=TRUE)-0.1, y=3.3775, label="Zone Top", hjust=1, size=2.5, color="gray40") +
         geom_vline(xintercept=0, color="gray50", linewidth=.4, linetype="dotted") +
         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) +
         labs(title="Strikes Added - Catch Depth (Side)", x="Depth / Z (ft)", y="Height / Y (ft)") +
         theme_minimal() + theme(plot.title=element_text(hjust=.5, size=10, face="bold"),
@@ -1888,7 +1888,6 @@ server <- function(input, output, session) {
                   fill=NA, color="gray50", linewidth=.6, inherit.aes=FALSE) +
         geom_polygon(data=plate_oh, aes(x=x,y=y), fill="gray95", 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=ttl, x="Side (ft)", y="Depth (ft)") +
         theme_minimal() + theme(plot.title=element_text(hjust=.5, size=10, face="bold"),
@@ -1904,7 +1903,6 @@ server <- function(input, output, session) {
         annotate("text", x=min(d2$cpz, na.rm=TRUE)-0.1, y=3.3775, label="Zone Top", hjust=1, size=2.5, color="gray40") +
         geom_vline(xintercept=0, color="gray50", linewidth=.4, linetype="dotted") +
         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) +
         labs(title="Strikes Lost - Catch Depth (Side)", x="Depth / Z (ft)", y="Height / Y (ft)") +
         theme_minimal() + theme(plot.title=element_text(hjust=.5, size=10, face="bold"),
@@ -2298,7 +2296,6 @@ server <- function(input, output, session) {
       geom_segment(aes(x=-bo,xend=-bo,y=bymin,yend=bymax), color="black", linewidth=.8, inherit.aes=FALSE) +
       geom_polygon(data=plate, aes(x,y), fill=NA, color="black", linewidth=.8, inherit.aes=FALSE) +
       geom_point(aes(fill=TaggedPitchType, shape=block_type), size=4, color="black", stroke=.6) +
-      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") +
       scale_shape_manual(values=sv, name=NULL) +
       coord_fixed() + labs(title="Blocking (Overhead View)", x=NULL, y=NULL) +
@@ -2339,7 +2336,6 @@ server <- function(input, output, session) {
       geom_polygon(data=hp_f, 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)) +