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),
@@ -1044,11 +1044,14 @@ app_ui <- fluidPage(
               uiOutput("throw_header_stats"),
               hr(),
               fluidRow(
-                column(6,
-                  selectInput("throw_view_mode", "View Mode:",
-                              choices = c("Points (by Result)","Heatmap","Color by Throw Speed",
-                                          "Release Point (Side)","Release Point (Overhead)"),
-                              selected = "Points (by Result)", width = "100%"))
+                column(4,
+                  selectInput("throw_view_mode", "Base Arrival View:",
+                              choices = c("Points (by Result)","Heatmap","Color by Throw Speed"),
+                              selected = "Points (by Result)", width = "100%")),
+                column(4,
+                  selectInput("throw_release_color", "Release Point Color By:",
+                              choices = c("Result","Throw Speed"),
+                              selected = "Result", width = "100%"))
               ),
               fluidRow(
                 column(6,
@@ -1059,14 +1062,8 @@ app_ui <- fluidPage(
                   plotlyOutput("throw_safe_plot", height = "520px"))
               ),
               hr(),
-              fluidRow(
-                column(6,
-                  h4("Release Point (Side View)", class = "section-header"),
-                  plotlyOutput("throw_release_side", height = "420px")),
-                column(6,
-                  h4("Release Point (Overhead)", class = "section-header"),
-                  plotlyOutput("throw_release_overhead", height = "420px"))
-              ),
+              h4("Catcher Release Point", class = "section-header"),
+              plotlyOutput("throw_release_plot", height = "480px"),
               hr(),
               h4("Throwing Log", class = "section-header"),
               DTOutput("throw_log_table")
@@ -1711,65 +1708,87 @@ server <- function(input, output, session) {
   })
   
   
+  # Pure plotly zone plot helper — no ggplotly conversion issues
+  plotly_zone_shapes <- function() {
+    list(
+      list(type="rect", x0=-.83083, x1=.83083, y0=1.5, y1=3.3775,
+           line=list(color="black", width=2), fillcolor="rgba(0,0,0,0)", layer="above"),
+      list(type="rect", x0=-.9975, x1=.9975, y0=1.3775, y1=3.5,
+           line=list(color="gray", width=1, dash="dot"), fillcolor="rgba(0,0,0,0)", layer="above"),
+      list(type="path",
+           path="M -0.60 0.15 L 0.60 0.15 L 0.60 0.27 L 0 0.42 L -0.60 0.27 Z",
+           line=list(color="gray40", width=1.5), fillcolor="rgba(0,0,0,0)", layer="above")
+    )
+  }
+
   make_recv_plot <- function(data, title_text, view_mode) {
-    if (nrow(data) == 0) return(ggplotly(ggplot() + theme_void() + ggtitle(title_text) +
-        theme(plot.title = element_text(hjust=.5, size=12, face="bold"))))
-    
+    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)))))
+    }
+
     if (view_mode == "Catch Position (Overhead)") {
       data <- data %>% filter(!is.na(CatchPositionX) & !is.na(CatchPositionZ))
-      if (nrow(data) == 0) return(ggplotly(ggplot() + theme_void() + ggtitle("No catch position data")))
-      data <- data %>% mutate(row_num = row_number())
-      bb_l <- data.frame(x=c(-3.5,-3.5,-0.708,-0.708), y=c(-4.5,0.15,0.15,-4.5))
-      bb_r <- data.frame(x=c(0.708,0.708,3.5,3.5), y=c(-4.5,0.15,0.15,-4.5))
-      p <- ggplot(data, aes(x = as.numeric(CatchPositionX), y = as.numeric(CatchPositionZ))) +
-        geom_polygon(data=bb_l, aes(x=x,y=y), fill="gray90", color="black", linewidth=.4, inherit.aes=FALSE) +
-        geom_polygon(data=bb_r, aes(x=x,y=y), fill="gray90", color="black", linewidth=.4, inherit.aes=FALSE) +
-        geom_polygon(data=data.frame(x=c(-.708,.708,.708,0,-.708), y=c(.15,.15,.3,.5,.3)),
-                     aes(x=x,y=y), fill="gray95", color="black", linewidth=.6, inherit.aes=FALSE) +
-        geom_point(aes(fill=TaggedPitchType, text=paste0("#",row_num,"<br>Pitch: ",TaggedPitchType,
-                       "<br>Pitcher: ",Pitcher,"<br>Batter: ",Batter,"<br>Date: ",Date)),
-                   shape=21, size=4, color="black", stroke=.5, alpha=.9) +
-        scale_fill_manual(values=pitch_colors, na.value="grey60", name="Pitch Type") +
-        coord_equal() + xlim(-4, 4) + ylim(-5, 3) +
-        labs(title=paste(title_text, "- Catch Position (Overhead)"), x="X (ft)", y="Z (ft)") +
-        theme_classic() + theme(plot.title=element_text(hjust=.5,size=11,face="bold"), legend.position="bottom")
-      return(ggplotly(p, tooltip="text"))
+      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)
     }
-    
+
     if (view_mode == "Heatmap") {
       data <- data %>% filter(!is.na(PlateLocSide) & !is.na(PlateLocHeight))
-      if (nrow(data) < 3) return(ggplotly(ggplot() + theme_void() + ggtitle(paste(title_text, "- Not enough data"))))
-      p <- ggplot(data, aes(x=PlateLocSide, y=PlateLocHeight)) +
-        geom_density_2d_filled(alpha=0.7) +
-        scale_fill_viridis_d(option="inferno", name="Density") +
-        sz_segments() +
-        geom_polygon(data=hp_polygon, aes(x=x,y=y), fill=NA, color="white", linewidth=.8, inherit.aes=FALSE) +
-        coord_fixed(ratio=1) + xlim(-2,2) + ylim(0,4.5) + ggtitle(title_text) +
-        theme_void() + theme(legend.position="none", plot.margin=margin(3,3,3,3),
-                             plot.title=element_text(hjust=0.5, size=12, face="bold"))
-      return(ggplotly(p))
+      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)
     }
-    
-    # Default: Points
+
+    # Default: Points mode — pure plotly
     data <- data %>% mutate(row_num = row_number())
-    apt <- unique(data$TaggedPitchType[!is.na(data$TaggedPitchType)])
-    p <- ggplot(data, aes(PlateLocSide, PlateLocHeight)) +
-      bz_segments() + sz_segments() +
-      geom_polygon(data=hp_polygon, aes(x=x,y=y), fill=NA, color="gray40", linewidth=.4, inherit.aes=FALSE) +
-      geom_point(aes(fill=TaggedPitchType, text=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)),
-                 shape=21, size=5, 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_equal() + scale_x_continuous(limits=c(-1.8,1.8)) + scale_y_continuous(limits=c(0,4.5)) +
-      labs(title=title_text) + 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=12,face="bold"), legend.position="bottom",
-            legend.title=element_text(size=8,face="bold"))
-    ggplotly(p, tooltip="text")
+    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({
@@ -1867,23 +1886,19 @@ server <- function(input, output, session) {
     
     if (view_mode == "Heatmap") {
       data <- data %>% filter(!is.na(BasePositionZ) & !is.na(BasePositionY))
-      if (nrow(data) == 0) return(ggplotly(ggplot() + theme_void() + ggtitle("No data")))
-      p <- ggplot() +
-        geom_polygon(data=grass, aes(x,y), fill='darkcyan', color='darkcyan') +
-        geom_polygon(data=sky, aes(x,y), fill='yellow', color='yellow') +
-        geom_polygon(data=dirt, aes(x,y), fill='brown', color='brown') +
-        geom_polygon(data=ground, aes(x,y), fill='darkgreen', color='darkgreen') +
-        geom_polygon(data=base_w, aes(x,y), fill='white', color='black') +
-        geom_polygon(data=base_b, aes(x,y), fill='lightgrey', color='black') +
-        geom_density_2d_filled(data=data, aes(x=BasePositionZ,y=BasePositionY), alpha=0.6) +
-        scale_fill_viridis_d(option="inferno", name="Density") +
-        scale_x_continuous(limits=c(-10,10)) + scale_y_continuous(limits=c(-5,9)) +
-        theme_bw() + coord_fixed() +
-        theme(legend.position="bottom", axis.title=element_blank(), axis.text=element_blank(),
-              axis.ticks=element_blank(), panel.grid=element_blank(),
-              plot.title=element_text(size=11,face='bold',hjust=.5)) +
-        ggtitle(title_text)
-      return(ggplotly(p))
+      if (nrow(data) < 3) return(plot_ly() %>% layout(title="Not enough data for heatmap"))
+      p <- plot_ly(data, x=~BasePositionZ, y=~BasePositionY, type="histogram2dcontour",
+                   colorscale=list(c(0,"rgba(0,0,0,0)"),c(0.25,"#02fbff"),c(0.5,"#03ff00"),c(0.75,"#fbff00"),c(1,"#dc1100")),
+                   showscale=FALSE) %>%
+        layout(title=list(text=title_text, font=list(size=14)),
+               xaxis=list(title="", range=c(-10,10)),
+               yaxis=list(title="", range=c(-5,9), scaleanchor="x"),
+               shapes=list(
+                 list(type="rect", x0=-10,x1=10,y0=0.25,y1=8, fillcolor="rgba(0,139,139,0.15)", line=list(width=0), layer="below"),
+                 list(type="rect", x0=-10,x1=10,y0=8,y1=9, fillcolor="rgba(255,255,0,0.2)", line=list(width=0), layer="below"),
+                 list(type="rect", x0=-10,x1=10,y0=-2,y1=0.25, fillcolor="rgba(139,69,19,0.2)", line=list(width=0), layer="below"),
+                 list(type="rect", x0=-1,x1=1,y0=0,y1=0.45, fillcolor="white", line=list(color="black",width=1), layer="above")))
+      return(p)
     }
     
     if (view_mode == "Color by Throw Speed") {
@@ -1977,38 +1992,45 @@ server <- function(input, output, session) {
     make_throw_base_plot(td, paste0(input$ct_catcher, " - Safe"), input$throw_view_mode)
   })
   
-  output$throw_release_side <- renderPlotly({
+  output$throw_release_plot <- renderPlotly({
     td <- throw_data() %>%
       filter(!is.na(ThrowPositionX) & !is.na(ThrowPositionY))
-    if (nrow(td) == 0) return(ggplotly(ggplot() + theme_void() + ggtitle("No release point data") +
-                        theme(plot.title=element_text(hjust=.5,size=11,face="bold"))))
-    throw_color_map <- c('2B Out'='#339a1d','2B Safe'='red','3B Out'='#1a5d1a','3B Safe'='#ff6b6b')
-    p <- ggplot(td, aes(x=as.numeric(ThrowPositionX), y=as.numeric(ThrowPositionY),
-                        text=paste0("Result: ",throw_label,"<br>Speed: ",round(ThrowSpeed,1)," mph",
-                                    "<br>Pop: ",round(PopTime,3),"s","<br>Date: ",Date))) +
-      geom_point(aes(color=throw_label), size=4, alpha=.85) +
-      scale_color_manual(values=throw_color_map, name="Result") +
-      labs(title=paste0(input$ct_catcher," - Release Point (Side)"), x="X (ft)", y="Y (ft)") +
-      theme_minimal() +
-      theme(plot.title=element_text(hjust=.5,size=12,face='bold'), legend.position="bottom")
-    ggplotly(p, tooltip="text")
-  })
-  
-  output$throw_release_overhead <- renderPlotly({
-    td <- throw_data() %>%
-      filter(!is.na(ThrowPositionX) & !is.na(ThrowPositionZ))
-    if (nrow(td) == 0) return(ggplotly(ggplot() + theme_void() + ggtitle("No release point data") +
-                        theme(plot.title=element_text(hjust=.5,size=11,face="bold"))))
-    throw_color_map <- c('2B Out'='#339a1d','2B Safe'='red','3B Out'='#1a5d1a','3B Safe'='#ff6b6b')
-    p <- ggplot(td, aes(x=as.numeric(ThrowPositionX), y=as.numeric(ThrowPositionZ),
-                        text=paste0("Result: ",throw_label,"<br>Speed: ",round(ThrowSpeed,1)," mph",
-                                    "<br>Date: ",Date))) +
-      geom_point(aes(color=throw_label), size=4, alpha=.85) +
-      scale_color_manual(values=throw_color_map, name="Result") +
-      labs(title=paste0(input$ct_catcher," - Release Point (Overhead)"), x="X (ft)", y="Z (ft)") +
-      theme_minimal() +
-      theme(plot.title=element_text(hjust=.5,size=12,face='bold'), legend.position="bottom")
-    ggplotly(p, tooltip="text")
+    if (nrow(td) == 0) {
+      return(plot_ly() %>% layout(title="No release point data",
+             xaxis=list(visible=FALSE), yaxis=list(visible=FALSE)))
+    }
+    td <- td %>% mutate(tpx = as.numeric(ThrowPositionX), tpy = as.numeric(ThrowPositionY))
+    color_by <- input$throw_release_color
+
+    if (color_by == "Throw Speed") {
+      p <- plot_ly(td, x=~tpx, y=~tpy, type="scatter", mode="markers",
+                   marker=list(size=12, color=~ThrowSpeed,
+                               colorscale=list(c(0,"#0551bc"),c(0.25,"#02fbff"),c(0.5,"#03ff00"),c(0.75,"#fbff00"),c(1,"#ff1f02")),
+                               colorbar=list(title="Velo (mph)"),
+                               line=list(color="black", width=1)),
+                   text=~paste0("Result: ",throw_label,"<br>Speed: ",round(ThrowSpeed,1)," mph",
+                                "<br>Pop: ",round(PopTime,3),"s","<br>Exchange: ",round(ExchangeTime,3),"s",
+                                "<br>Date: ",Date),
+                   hoverinfo="text")
+    } else {
+      throw_color_map <- c('2B Out'='#339a1d','2B Safe'='red','3B Out'='#1a5d1a','3B Safe'='#ff6b6b')
+      td$pt_color <- sapply(td$throw_label, function(tl) {
+        if (!is.na(tl) && tl %in% names(throw_color_map)) throw_color_map[tl] else "gray"
+      })
+      p <- plot_ly(td, x=~tpx, y=~tpy, type="scatter", mode="markers",
+                   marker=list(size=12, color=~pt_color, line=list(color="black", width=1)),
+                   text=~paste0("Result: ",throw_label,"<br>Speed: ",round(ThrowSpeed,1)," mph",
+                                "<br>Pop: ",round(PopTime,3),"s","<br>Exchange: ",round(ExchangeTime,3),"s",
+                                "<br>Date: ",Date),
+                   hoverinfo="text", name=~throw_label)
+    }
+    p %>% layout(
+      title=list(text=paste0(input$ct_catcher," - Catcher Release Point"), font=list(size=15)),
+      xaxis=list(title="Release X (ft)", range=c(-8,8), zeroline=TRUE,
+                 zerolinecolor="gray80", gridcolor="gray90"),
+      yaxis=list(title="Release Y (ft)", range=c(-8,8), zeroline=TRUE,
+                 zerolinecolor="gray80", gridcolor="gray90", scaleanchor="x"),
+      showlegend=(color_by == "Result"))
   })
   
     output$throw_log_table <- renderDT({
@@ -2081,22 +2103,18 @@ server <- function(input, output, session) {
     bi <- 1; bo <- 4; bymin <- -2.5; bymax <- 3.7
     
     if (view_mode == "Heatmap" && nrow(bd) >= 3) {
-      p <- ggplot() +
-        geom_segment(aes(x=bi,xend=bo,y=bymin,yend=bymin), color="black", linewidth=.8, inherit.aes=FALSE) +
-        geom_segment(aes(x=bi,xend=bo,y=bymax,yend=bymax), color="black", linewidth=.8, inherit.aes=FALSE) +
-        geom_segment(aes(x=bi,xend=bi,y=bymin,yend=bymax), color="black", linewidth=.8, inherit.aes=FALSE) +
-        geom_segment(aes(x=bo,xend=bo,y=bymin,yend=bymax), color="black", linewidth=.8, inherit.aes=FALSE) +
-        geom_segment(aes(x=-bi,xend=-bo,y=bymin,yend=bymin), color="black", linewidth=.8, inherit.aes=FALSE) +
-        geom_segment(aes(x=-bi,xend=-bo,y=bymax,yend=bymax), color="black", linewidth=.8, inherit.aes=FALSE) +
-        geom_segment(aes(x=-bi,xend=-bi,y=bymin,yend=bymax), color="black", linewidth=.8, inherit.aes=FALSE) +
-        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) +
-        geom_density_2d_filled(data=bd, aes(x=plot_x, y=plot_y), alpha=0.7) +
-        scale_fill_viridis_d(option="inferno", name="Density") +
-        coord_fixed() + labs(title="Blocking (Overhead) - Heatmap", x=NULL, y=NULL) +
-        theme_void(base_size=9) +
-        theme(plot.title=element_text(size=11,face="bold",hjust=.5), legend.position="bottom")
-      return(ggplotly(p))
+      p <- plot_ly(bd, x=~plot_x, y=~plot_y, 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 (Overhead) - Heatmap", font=list(size=14)),
+               xaxis=list(title=""), yaxis=list(title="", scaleanchor="x"),
+               shapes=list(
+                 list(type="rect", x0=bi,x1=bo,y0=bymin,y1=bymax, line=list(color="black",width=2), fillcolor="rgba(0,0,0,0)"),
+                 list(type="rect", x0=-bo,x1=-bi,y0=bymin,y1=bymax, line=list(color="black",width=2), fillcolor="rgba(0,0,0,0)"),
+                 list(type="path",
+                      path="M -0.708 1.417 L 0.708 1.417 L 0.708 0.708 L 0 0 L -0.708 0.708 Z",
+                      line=list(color="black",width=2), fillcolor="rgba(0,0,0,0)")))
+      return(p)
     }
     
     # Points mode
@@ -2134,48 +2152,44 @@ server <- function(input, output, session) {
     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(ggplotly(ggplot() + theme_void() + ggtitle("Blocking (Zone)") +
-                        theme(plot.title=element_text(hjust=.5,size=11,face="bold"))))
+      return(plot_ly() %>% layout(title="Blocking (Zone)", xaxis=list(visible=FALSE), yaxis=list(visible=FALSE)))
     }
-    
+
     if (view_mode == "Heatmap" && nrow(bd) >= 3) {
-      p <- ggplot(bd, aes(x=PlateLocSide, y=PlateLocHeight)) +
-        geom_density_2d_filled(alpha=0.7) +
-        scale_fill_viridis_d(option="inferno", name="Density") +
-        sz_segments() +
-        geom_polygon(data=hp_polygon, aes(x=x,y=y), fill=NA, color="white", linewidth=.8, inherit.aes=FALSE) +
-        coord_fixed(ratio=1) + xlim(-2.5,2.5) + ylim(-1,4.5) +
-        ggtitle("Blocking (Zone) - Heatmap") +
-        theme_void() + theme(legend.position="none", plot.margin=margin(3,3,3,3),
-                             plot.title=element_text(hjust=0.5, size=11, face="bold"))
-      return(ggplotly(p))
+      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)
     }
-    
-    sl <- unique(bd$block_type)
-    sv <- c("Block"=21,"PB/WP"=24)[sl]
-    
-    p <- ggplot(bd, aes(PlateLocSide, PlateLocHeight,
-                text=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))) +
-      bz_segments() + sz_segments() +
-      geom_polygon(data=hp_polygon, 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) +
-      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_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=11,face="bold"),
-            legend.position="bottom", legend.box="vertical")
-    ggplotly(p, tooltip="text")
+
+    # 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
   })
   
   output$block_log_table <- renderDT({