Update app.R

app.R

@@ -26,7 +26,7 @@ pitch_type_lookup <- data.frame(
 
 break_plot_Szn <- function(game,data1,sdate,edate) {
   game <- game %>% left_join(pitch_type_lookup, by = c("pitch_name"))
-  
+  game <- game %>% filter(!is.na(pitch_abbr))
   title <- paste0(unique(game$`Pitcher Name`)," ",sdate," to ",edate)
   # Get pitcher's handedness
   pitcher_hand <- unique(game$phand)
@@ -64,19 +64,14 @@ break_plot_Szn <- function(game,data1,sdate,edate) {
   angle_radians <- angle_degrees * (pi / 180)
   
   # Legend location based on handedness
-   if(pitcher_hand == "L") {
+  if(pitcher_hand == "L") {
     leg <- c(0.08, .22)
     factor <- -1
-    if(angle_degrees < 0){
-      leg <- c(0.92, .22)
-    }
   } else {
     leg <- c(0.92, .22)
     factor <- 1
-    if(angle_degrees < 0){
-      leg <- c(0.08, .22)
-    }
   }
+  
   # Calculate the endpoint coordinates
   x_end <- 50 * cos(angle_radians) * factor
   y_end <- 50 * sin(angle_radians)
@@ -92,11 +87,15 @@ break_plot_Szn <- function(game,data1,sdate,edate) {
   game_pitches <- unique(game$pitch_abbr)
   
   # Filter season data for the current arm angle, handedness, and only pitches in the game
-  arm_angle_data <- data1 %>%
-    filter(abs(round(arm_angle) - angle_degrees) <= 2,
-           phand == pitcher_hand) %>%  
-    left_join(pitch_type_lookup, by = c("pitch_name")) %>%
-    filter(pitch_abbr %in% game_pitches)
+arm_angle_data <- data1 %>%
+  # First remove NAs from relevant columns
+  filter(!is.na(arm_angle), !is.na(angle_degrees), !is.na(phand), !is.na(pitcher_hand), !is.na(pitch_name)) %>%
+  # Then proceed with your original filtering
+  filter(abs(round(arm_angle) - angle_degrees) <= 2, phand == pitcher_hand) %>%
+  left_join(pitch_type_lookup, by = c("pitch_name")) %>%
+  # Remove NAs that might have been introduced by the join
+  filter(!is.na(pitch_abbr)) %>%
+  filter(pitch_abbr %in% game_pitches)
   
   ggplot(game, aes(x = HB, y = IVB)) +
     # Base layers
@@ -173,6 +172,7 @@ break_plot_Szn <- function(game,data1,sdate,edate) {
 }
 break_plot_tot <- function(game,data1,sdate,edate) {
   game <- game %>% left_join(pitch_type_lookup, by = c("pitch_name"))
+  game <- game %>% filter(!is.na(pitch_abbr))
   title <- paste0(unique(game$`Pitcher Name`)," ",sdate," to ",edate)
   # Get pitcher's handedness
   pitcher_hand <- unique(game$phand)
@@ -213,15 +213,9 @@ break_plot_tot <- function(game,data1,sdate,edate) {
   if(pitcher_hand == "L") {
     leg <- c(0.08, .22)
     factor <- -1
-    if(angle_degrees < 0){
-      leg <- c(0.92, .22)
-    }
   } else {
     leg <- c(0.92, .22)
     factor <- 1
-    if(angle_degrees < 0){
-      leg <- c(0.08, .22)
-    }
   }
   
   # Calculate the endpoint coordinates
@@ -240,11 +234,16 @@ break_plot_tot <- function(game,data1,sdate,edate) {
   
   # Filter season data for the current arm angle, handedness, and only pitches in the game
   arm_angle_data <- data1 %>%
-    filter(abs(round(arm_angle) - angle_degrees) <= 2,
-           phand == pitcher_hand) %>%  
+    # First remove NAs from relevant columns
+    filter(!is.na(arm_angle), !is.na(angle_degrees), !is.na(phand), !is.na(pitcher_hand), !is.na(pitch_name)) %>%
+    # Then proceed with your original filtering
+    filter(abs(round(arm_angle) - angle_degrees) <= 2, phand == pitcher_hand) %>%
     left_join(pitch_type_lookup, by = c("pitch_name")) %>%
+    # Remove NAs that might have been introduced by the join
+    filter(!is.na(pitch_abbr)) %>%
     filter(pitch_abbr %in% game_pitches)
   
+  game <- game %>% filter(!is.na(pitch_abbr))
   ggplot(game, aes(x = HB, y = IVB)) +
     # Base layers
     geom_vline(xintercept = 0, color = "lightblue", linewidth = 1, linetype = 4) +