Deploy from GitHub Actions

analysis.py

@@ -1224,39 +1224,75 @@ def plot_do_temp_relationship(df: pd.DataFrame) -> Figure:
         .dropna(subset=["Dissolved Oxygen", "Temperature, Water"])
     )
 
-    sns.set_palette("muted")
+    # Create custom color palette matching DO timeseries
+    custom_palette = {"Surface": "#5AA4D8", "Bottom": "#1B4B8A"}
 
-    # Create plot with regression line
+    # Create plot with regression line and adjust the hue order
     g = sns.lmplot(
         data=do_temp_data,
         x="Temperature, Water",
         y="Dissolved Oxygen",
         hue="Sample_Position",
-        hue_order=["Surface", "Bottom"],
-        scatter_kws={"alpha": 0.6},
+        hue_order=["Bottom", "Surface"],  # Plot 'Bottom' first
+        palette=custom_palette,
+        scatter_kws={"alpha": 0.5, "zorder": 2, "s": 20},  # Scatter plots at zorder=2
+        line_kws={"zorder": 3, "linewidth": 1},  # Trend lines at zorder=3
         height=8,
         aspect=1.5,
         legend=False,
     )
 
-    # Add DO threshold and customize plot
+    # Add DO threshold and set z-order
     ax = g.axes[0, 0]
-    ax.axhline(y=5, color="red", linestyle=":", alpha=0.5)
+    ax.axhline(
+        y=4.8, color="#FF8C00", linestyle="--", alpha=0.9, zorder=1, linewidth=1
+    )  # Threshold line at zorder=1
     ax.text(
         ax.get_xlim()[0],
-        5.1,
-        " 5 mg/L DO threshold",
+        4.9,
+        " 4.8 mg/L DO threshold",
         ha="left",
         va="bottom",
-        color="red",
-        alpha=0.5,
+        color="#FF8C00",
+        alpha=0.9,
     )
 
+    # Customize spines - only show bottom spine
+    ax.spines["top"].set_visible(False)
+    ax.spines["right"].set_visible(False)
+    ax.spines["left"].set_visible(False)
+    ax.spines["bottom"].set_color("black")
+    ax.spines["bottom"].set_linewidth(0.5)
+
     g.set_axis_labels("Water Temperature (°C)", "Dissolved Oxygen (mg/L)")
     ax.set_title("Dissolved Oxygen vs Water Temperature", pad=20, fontsize=16)
-    ax.legend(title="Sample Position", bbox_to_anchor=(1.05, 1), loc="upper left")
-    # Add grid
-    ax.grid(True, alpha=0.3)
+
+    # Adjust legend to show 'Surface' first
+    handles, labels = ax.get_legend_handles_labels()
+    # Reverse the order of handles and labels
+    handles = handles[::-1]
+    labels = labels[::-1]
+    ax.legend(
+        handles,
+        labels,
+        bbox_to_anchor=(1.0, 1.0),
+        loc="upper right",
+        frameon=False,
+        handletextpad=0.5,
+    )
+
+    # Add grid with matching style
+    ax.grid(True, axis="y", alpha=0.15, linestyle="-", color="gray")
+
+    # Remove tick marks but keep labels
+    ax.tick_params(axis="y", which="both", length=0)
+
+    # Set y-axis limits with some padding
+    ymin = max(int(min(do_temp_data["Dissolved Oxygen"].min(), 4.8) * 0.9) - 1, 0)
+    ymax = do_temp_data["Dissolved Oxygen"].max() * 1.1
+    ax.set_ylim(ymin, ymax)
+    yticks = np.arange(ymin, ymax, 2)
+    ax.set_yticks(yticks)
 
     return g.figure
 
@@ -1348,16 +1384,16 @@ def plotly_plot_do_temp_relationship(df: pd.DataFrame) -> go.Figure:
 
     # Add DO threshold line
     fig.add_hline(
-        y=5,
-        line=dict(color="red", width=1, dash="dot"),
+        y=4.8,
+        line=dict(color="#FF8C00", width=1, dash="dash"),
         opacity=0.5,
-        annotation_text="5 mg/L DO threshold",
+        annotation_text="4.8 mg/L DO threshold",
         annotation_position="left",
         annotation=dict(
-            font=dict(color="red", size=12),
+            font=dict(color="#FF8C00", size=12),
             xanchor="left",
             yanchor="bottom",
-            opacity=0.5,
+            opacity=0.8,
         ),
     )
 

pages.py

@@ -332,16 +332,20 @@ def data_summary_section():
 @log_page_visit()
 def do_temp_relationship_section():
     st.sidebar.toggle("Interactive Plots", key="ENABLE_ALTAIR")
-    st.title("DO/Temp Relationship")
-    st.markdown(
-        "This plot shows the relationship between dissolved oxygen and water temperature for all data."
-    )
-    if st.session_state.ENABLE_ALTAIR:
-        fig = plotly_plot_do_temp_relationship(st.session_state.data["raw_df"])
-        st.plotly_chart(fig, use_container_width=True)  # type: ignore
-    else:
-        fig = plot_do_temp_relationship(st.session_state.data["raw_df"])
-        st.pyplot(fig)
+
+    container = st.container()
+    with container:
+        left_spacer, content, right_spacer = st.columns([1, 8, 1])
+        with content:
+            if st.session_state.ENABLE_ALTAIR:
+                fig = plotly_plot_do_temp_relationship(st.session_state.data["raw_df"])
+                st.plotly_chart(fig, use_container_width=True)  # type: ignore
+            else:
+                fig = plot_do_temp_relationship(st.session_state.data["raw_df"])
+                st.pyplot(fig)
+            st.info(
+                "This plot shows the relationship between dissolved oxygen and water temperature for all data."
+            )
 
 
 @log_page_visit()

ui/pages/dissolved_oxygen.py

@@ -20,12 +20,20 @@ def dissolved_oxygen():
     return plot_do_timeseries(filtered_df, period=period)
 
 
-st.info(
-    """
-    This is a half-baked attempt to replicate the Hudson River Estuary Program's excellent
-    [Long Term Findings chart for dissolved oxygen](https://www.hudsonriver.org/ccmp/soe/water-quality/do).
-    The EPA threshold is copied from the reference image and not specific to the water quality standards for our area.
-    """
-)
-fig = dissolved_oxygen()
-st.pyplot(fig)
+# Create a centered container with custom width
+container = st.container()
+with container:
+    # Create three columns with ratios 1:8:1 (10% : 80% : 10%)
+    left_spacer, content, right_spacer = st.columns([1, 8, 1])
+
+    # Put content in middle column
+    with content:
+        st.info(
+            """
+            :material/info: This is a half-baked attempt to replicate the Hudson River Estuary Program's excellent
+            [Long Term Findings chart](https://www.hudsonriver.org/ccmp/soe/water-quality/do) for dissolved oxygen.
+            The EPA threshold is copied from the reference image and not specific to the water quality standards for our area.
+            """
+        )
+        fig = dissolved_oxygen()
+        st.pyplot(fig)