Update app.R

app.R

@@ -780,58 +780,36 @@ server <- function(input, output, session) {
           TRUE ~ TaggedPitchType
         ),
         # Create necessary indicator variables if they don't exist
-        in_zone = case_when(
-          "StrikeZoneIndicator" %in% names(.) ~ StrikeZoneIndicator,
-          !is.na(PlateLocSide) & !is.na(PlateLocHeight) & 
-            PlateLocSide >= -0.95 & PlateLocSide <= 0.95 &
-            PlateLocHeight >= 1.6 & PlateLocHeight <= 3.5 ~ 1,
-          TRUE ~ 0
-        ),
-        is_swing = case_when(
-          !is.na(PitchCall) & PitchCall %in% c("StrikeSwinging", "FoulBall", "FoulBallNotFieldable", "FoulBallFieldable", "InPlay") ~ 1,
-          TRUE ~ 0
-        ),
-        is_whiff = case_when(
-          "WhiffIndicator" %in% names(.) ~ WhiffIndicator,
-          !is.na(PitchCall) & PitchCall == "StrikeSwinging" ~ 1,
-          TRUE ~ 0
-        ),
-        chase = case_when(
-          "Chaseindicator" %in% names(.) ~ Chaseindicator,
-          !is.na(PitchCall) & !is.na(PlateLocSide) & !is.na(PlateLocHeight) &
-            PitchCall %in% c("StrikeSwinging", "FoulBallNotFieldable", "FoulBall", "InPlay") &
-            (PlateLocSide < -0.95 | PlateLocSide > 0.95 | PlateLocHeight < 1.6 | PlateLocHeight > 3.5) ~ 1,
-          TRUE ~ 0
-        )
+        in_zone = if ("StrikeZoneIndicator" %in% names(.)) StrikeZoneIndicator else 
+          ifelse(!is.na(PlateLocSide) & !is.na(PlateLocHeight) & 
+                   PlateLocSide >= -0.95 & PlateLocSide <= 0.95 &
+                   PlateLocHeight >= 1.6 & PlateLocHeight <= 3.5, 1, 0),
+        is_whiff = if ("WhiffIndicator" %in% names(.)) WhiffIndicator else 
+          ifelse(!is.na(PitchCall) & PitchCall == "StrikeSwinging", 1, 0),
+        chase = if ("Chaseindicator" %in% names(.)) Chaseindicator else
+          ifelse(!is.na(PitchCall) & !is.na(PlateLocSide) & !is.na(PlateLocHeight) &
+                   PitchCall %in% c("StrikeSwinging", "FoulBallNotFieldable", "FoulBall", "InPlay") &
+                   (PlateLocSide < -0.95 | PlateLocSide > 0.95 | PlateLocHeight < 1.6 | PlateLocHeight > 3.5), 1, 0)
       )
     
     # Calculate total pitches for usage percentage
     total_pitches <- nrow(movement_stats)
     
-    # Check if required columns exist
-    has_extension <- "Extension" %in% names(movement_stats)
-    has_spinrate <- "SpinRate" %in% names(movement_stats)
-    has_relheight <- "RelHeight" %in% names(movement_stats)
-    
     summary_stats <- movement_stats %>%
       group_by(`Pitch Type` = pitch_group) %>%
       summarise(
         Count = n(),
         `Usage%` = sprintf("%.1f%%", (n() / total_pitches) * 100),
-        `Ext.` = if (has_extension) sprintf("%.1f", mean(Extension, na.rm = TRUE)) else "—",
+        `Ext.` = if ("Extension" %in% names(.)) sprintf("%.1f", mean(Extension, na.rm = TRUE)) else "—",
         `Avg Velo` = sprintf("%.1f mph", mean(RelSpeed, na.rm = TRUE)),
         `90th Velo` = sprintf("%.1f mph", quantile(RelSpeed, 0.9, na.rm = TRUE)),
         `Max Velo` = sprintf("%.1f mph", max(RelSpeed, na.rm = TRUE)),
         `Avg IVB` = sprintf("%.1f in", mean(InducedVertBreak, na.rm = TRUE)),
         `Avg HB` = sprintf("%.1f in", mean(HorzBreak, na.rm = TRUE)),
-        `Avg Spin` = if (has_spinrate) sprintf("%.0f rpm", mean(SpinRate, na.rm = TRUE)) else "—",
-        `Rel Height` = if (has_relheight) sprintf("%.1f", mean(RelHeight, na.rm = TRUE)) else "—",
+        `Avg Spin` = if ("SpinRate" %in% names(.)) sprintf("%.0f rpm", mean(SpinRate, na.rm = TRUE)) else "—",
+        `Rel Height` = if ("RelHeight" %in% names(.)) sprintf("%.1f", mean(RelHeight, na.rm = TRUE)) else "—",
         `Zone%` = sprintf("%.1f%%", round(mean(in_zone, na.rm = TRUE) * 100, 1)),
-        `Whiff%` = if(sum(is_swing, na.rm = TRUE) > 0) {
-          sprintf("%.1f%%", round(sum(is_whiff, na.rm = TRUE) / sum(is_swing, na.rm = TRUE) * 100, 1))
-        } else {
-          "—"
-        },
+        `Whiff%` = sprintf("%.1f%%", round(mean(is_whiff, na.rm = TRUE) * 100, 1)),
         `Chase%` = sprintf("%.1f%%", round(mean(chase, na.rm = TRUE) * 100, 1)),
         .groups = "drop"
       ) %>%
@@ -851,9 +829,6 @@ server <- function(input, output, session) {
       
       info_text <- paste(
         paste("Pitcher:", pitch_info$pitcher),
-        if ("PitchNo" %in% names(pitch_data) && !is.na(pitch_data$PitchNo)) {
-          paste("Pitch Number:", pitch_data$PitchNo)
-        } else "",
         paste("Current Type:", pitch_data$TaggedPitchType),
         paste("Velocity:", round(pitch_data$RelSpeed, 1), "mph"),
         paste("Horizontal Break:", round(pitch_data$HorzBreak, 1), "inches"),