Update app.R

app.R

@@ -281,74 +281,72 @@ server <- function(input, output, session){
       mutate(row_key = row_number())
   })
 
-  # ---- Plotly Movement plot ----
-  output$movement_plot <- renderPlotly({
-    d <- pitcher_df()
-    validate(need(nrow(d) > 0, "No data for selected pitcher"))
-    pal <- pitch_colors
-    cols <- pal[d$TaggedPitchType]; cols[is.na(cols)] <- "#D3D3D3"
-
-    plot_ly(
-      data = d, source="mv", type="scatter", mode="markers",
-      x = ~HorzBreak, y = ~InducedVertBreak,
-      text = ~paste0(
-        "<b>", TaggedPitchType, "</b>",
-        "<br>Velo: ", round(RelSpeed,1), " mph",
-        "<br>HB: ", round(HorzBreak,1), " in",
-        "<br>IVB: ", round(InducedVertBreak,1), " in",
-        if ("SpinRate" %in% names(d)) paste0("<br>Spin: ", round(SpinRate), " rpm") else ""
-      ),
-      hoverinfo = "text",
-      key = ~row_key,
-      marker = list(size = 10, color = cols)
-    ) %>%
-      layout(
-        title = paste("Pitch Movement Chart -", input$pitcher_select),
-        xaxis = list(title="Horizontal Break (in)", range=c(-25,25), zeroline=TRUE),
-        yaxis = list(title="Induced Vertical Break (in)", range=c(-25,25), zeroline=TRUE),
-        dragmode = if (input$selection_mode == "drag") "select" else "zoom"
-      ) %>%
-      config(displaylogo = FALSE)
-  })
-
-  # ---- Plotly Location plot (under table) ----
-  output$location_plot <- renderPlotly({
-    d <- pitcher_df()
-    validate(need(nrow(d) > 0, "No data for selected pitcher"))
-    pal <- pitch_colors
-    cols <- pal[d$TaggedPitchType]; cols[is.na(cols)] <- "#D3D3D3"
-
-    p <- plot_ly(
-      data = d, source="loc", type="scatter", mode="markers",
-      x = ~PlateLocSide, y = ~PlateLocHeight,
-      text = ~paste0(
-        "<b>", TaggedPitchType, "</b>",
-        "<br>Velo: ", round(RelSpeed,1), " mph",
-        "<br>X: ", round(PlateLocSide,2),
-        "<br>Z: ", round(PlateLocHeight,2)
-      ),
-      hoverinfo = "text",
-      key = ~row_key,
-      marker = list(size = 9, color = cols)
-    ) %>%
-      layout(
-        title = "Pitch Location (Editable)",
-        xaxis = list(title="Plate X (ft)", range=c(-2,2), zeroline=TRUE),
-        yaxis = list(title="Plate Z (ft)", range=c(0,4.5), zeroline=TRUE),
-        dragmode = if (input$selection_mode == "drag") "select" else "zoom",
-        shapes = list(
-          # strike zone rectangle
-          list(type="rect", x0=-0.8303, x1=0.8303, y0=1.6, y1=3.5,
-               line=list(color="black", width=1), fillcolor="rgba(0,0,0,0)"),
-          # home plate path
-          list(type="path",
-               path = paste0("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=0.8))
-        )
-      ) %>% config(displaylogo = FALSE)
-
-    p
-  })
+output$movement_plot <- renderPlotly({
+  d <- pitcher_df()
+  validate(need(nrow(d) > 0, "No data for selected pitcher"))
+
+  plot_ly(
+    data = d, source = "mv", type = "scatter", mode = "markers",
+    x = ~HorzBreak, y = ~InducedVertBreak,
+    text = ~paste0(
+      "<b>", TaggedPitchType, "</b>",
+      "<br>Velo: ", round(RelSpeed,1), " mph",
+      "<br>IVB: ", round(InducedVertBreak,1), " in",
+      "<br>HB: ", round(HorzBreak,1), " in",
+      if ("SpinRate" %in% names(d)) paste0("<br>Spin: ", round(SpinRate), " rpm") else ""
+    ),
+    hoverinfo = "text",
+    key = ~row_key,
+    color = ~factor(TaggedPitchType),      # <-- data-driven
+    colors = pitch_colors,                 # <-- your palette
+    marker = list(size = 10)
+  ) |>
+    layout(
+      title = paste("Pitch Movement Chart -", input$pitcher_select),
+      xaxis = list(title="Horizontal Break (in)", range=c(-25,25), zeroline=TRUE),
+      yaxis = list(title="Induced Vertical Break (in)", range=c(-25,25), zeroline=TRUE),
+      dragmode = if (input$selection_mode == "drag") "select" else "zoom"
+    ) |>
+    config(displaylogo = FALSE)
+})
+
+output$location_plot <- renderPlotly({
+  d <- pitcher_df()
+  validate(need(nrow(d) > 0, "No data for selected pitcher"))
+
+  plot_ly(
+    data = d, source = "loc", type = "scatter", mode = "markers",
+    x = ~PlateLocSide, y = ~PlateLocHeight,
+    text = ~paste0(
+      "<b>", TaggedPitchType, "</b>",
+      "<br>Velo: ", round(RelSpeed,1), " mph",
+      "<br>X: ", round(PlateLocSide,2),
+      "<br>Z: ", round(PlateLocHeight,2),
+      "<br>IVB: ", round(InducedVertBreak,1), " in",
+      "<br>HB: ", round(HorzBreak,1), " in",
+      if ("SpinRate" %in% names(d)) paste0("<br>Spin: ", round(SpinRate), " rpm") else ""
+    ),
+    hoverinfo = "text",
+    key = ~row_key,
+    color = ~factor(TaggedPitchType),      # <-- data-driven
+    colors = pitch_colors,                 # <-- your palette
+    marker = list(size = 9)
+  ) |>
+    layout(
+      title = "Pitch Location (Editable)",
+      xaxis = list(title="Plate X (ft)", range=c(-2,2), zeroline=TRUE),
+      yaxis = list(title="Plate Z (ft)", range=c(0,4.5), zeroline=TRUE),
+      dragmode = if (input$selection_mode == "drag") "select" else "zoom",
+      shapes = list(
+        list(type="rect", x0=-0.8303, x1=0.8303, y0=1.6, y1=3.5,
+             line=list(color="black", width=1), fillcolor="rgba(0,0,0,0)"),
+        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=0.8))
+      )
+    ) |>
+    config(displaylogo = FALSE)
+})
 
   # ---- Click handlers (single mode) for both plots ----
   show_pitch_modal <- function(hit_row){