Update app.py

app.py

@@ -380,7 +380,22 @@ def perform_longitude_regression(start_year, start_month, end_year, end_month):
 with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
     gr.Markdown("# Typhoon Analysis Dashboard")
     
-    with gr.Tab("Main Analysis"):
+    with gr.Tab("Overview"):
+        gr.Markdown("""
+        ## Welcome to the Typhoon Analysis Dashboard
+        
+        This dashboard allows you to analyze typhoon data in relation to ENSO phases.
+        
+        ### Features:
+        - **Track Visualization**: View typhoon tracks by time period and ENSO phase
+        - **Statistical Analysis**: Examine relationships between ONI values and typhoon characteristics
+        - **Path Animation**: Watch animated typhoon paths with intensity classification
+        - **Regression Analysis**: Perform statistical regression on typhoon data
+        
+        Select a tab above to begin your analysis.
+        """)
+    
+    with gr.Tab("Track Visualization"):
         with gr.Row():
             start_year = gr.Number(label="Start Year", value=2000, minimum=1900, maximum=2024, step=1)
             start_month = gr.Dropdown(label="Start Month", choices=list(range(1, 13)), value=1)
@@ -388,25 +403,177 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
             end_month = gr.Dropdown(label="End Month", choices=list(range(1, 13)), value=6)
             enso_phase = gr.Dropdown(label="ENSO Phase", choices=['all', 'El Nino', 'La Nina', 'Neutral'], value='all')
             typhoon_search = gr.Textbox(label="Typhoon Search")
-        analyze_btn = gr.Button("Analyze")
-        with gr.Row():
-            tracks_plot = gr.Plot(label="Typhoon Tracks")
-            wind_scatter = gr.Plot(label="Wind Speed vs ONI")
-            pressure_scatter = gr.Plot(label="Pressure vs ONI")
-            regression_plot = gr.Plot(label="Regression Analysis")
-        slopes_text = gr.Textbox(label="Regression Slopes")
+        analyze_btn = gr.Button("Generate Tracks")
+        tracks_plot = gr.Plot(label="Typhoon Tracks")
         analyze_btn.click(
-            fn=generate_main_analysis,
+            fn=lambda *args: generate_main_analysis(*args)[0],  # Only return the tracks plot
             inputs=[start_year, start_month, end_year, end_month, enso_phase, typhoon_search],
-            outputs=[tracks_plot, wind_scatter, pressure_scatter, regression_plot, slopes_text]
+            outputs=tracks_plot
+        )
+    
+    with gr.Tab("Wind Analysis"):
+        with gr.Row():
+            wind_start_year = gr.Number(label="Start Year", value=2000, minimum=1900, maximum=2024, step=1)
+            wind_start_month = gr.Dropdown(label="Start Month", choices=list(range(1, 13)), value=1)
+            wind_end_year = gr.Number(label="End Year", value=2024, minimum=1900, maximum=2024, step=1)
+            wind_end_month = gr.Dropdown(label="End Month", choices=list(range(1, 13)), value=6)
+            wind_enso_phase = gr.Dropdown(label="ENSO Phase", choices=['all', 'El Nino', 'La Nina', 'Neutral'], value='all')
+            wind_typhoon_search = gr.Textbox(label="Typhoon Search")
+        wind_analyze_btn = gr.Button("Generate Wind Analysis")
+        wind_scatter = gr.Plot(label="Wind Speed vs ONI")
+        wind_regression_results = gr.Textbox(label="Wind Regression Results")
+        wind_analyze_btn.click(
+            fn=lambda *args: [generate_main_analysis(*args)[1], perform_wind_regression(args[0], args[1], args[2], args[3])],
+            inputs=[wind_start_year, wind_start_month, wind_end_year, wind_end_month, wind_enso_phase, wind_typhoon_search],
+            outputs=[wind_scatter, wind_regression_results]
+        )
+    
+    with gr.Tab("Pressure Analysis"):
+        with gr.Row():
+            pressure_start_year = gr.Number(label="Start Year", value=2000, minimum=1900, maximum=2024, step=1)
+            pressure_start_month = gr.Dropdown(label="Start Month", choices=list(range(1, 13)), value=1)
+            pressure_end_year = gr.Number(label="End Year", value=2024, minimum=1900, maximum=2024, step=1)
+            pressure_end_month = gr.Dropdown(label="End Month", choices=list(range(1, 13)), value=6)
+            pressure_enso_phase = gr.Dropdown(label="ENSO Phase", choices=['all', 'El Nino', 'La Nina', 'Neutral'], value='all')
+            pressure_typhoon_search = gr.Textbox(label="Typhoon Search")
+        pressure_analyze_btn = gr.Button("Generate Pressure Analysis")
+        pressure_scatter = gr.Plot(label="Pressure vs ONI")
+        pressure_regression_results = gr.Textbox(label="Pressure Regression Results")
+        pressure_analyze_btn.click(
+            fn=lambda *args: [generate_main_analysis(*args)[2], perform_pressure_regression(args[0], args[1], args[2], args[3])],
+            inputs=[pressure_start_year, pressure_start_month, pressure_end_year, pressure_end_month, pressure_enso_phase, pressure_typhoon_search],
+            outputs=[pressure_scatter, pressure_regression_results]
+        )
+    
+    with gr.Tab("Longitude Analysis"):
+        with gr.Row():
+            lon_start_year = gr.Number(label="Start Year", value=2000, minimum=1900, maximum=2024, step=1)
+            lon_start_month = gr.Dropdown(label="Start Month", choices=list(range(1, 13)), value=1)
+            lon_end_year = gr.Number(label="End Year", value=2024, minimum=1900, maximum=2024, step=1)
+            lon_end_month = gr.Dropdown(label="End Month", choices=list(range(1, 13)), value=6)
+            lon_enso_phase = gr.Dropdown(label="ENSO Phase", choices=['all', 'El Nino', 'La Nina', 'Neutral'], value='all')
+        lon_analyze_btn = gr.Button("Generate Longitude Analysis")
+        regression_plot = gr.Plot(label="Longitude vs ONI")
+        slopes_text = gr.Textbox(label="Regression Slopes")
+        lon_regression_results = gr.Textbox(label="Longitude Regression Results")
+        lon_analyze_btn.click(
+            fn=lambda *args: [generate_main_analysis(*args)[3], generate_main_analysis(*args)[4], 
+                             perform_longitude_regression(args[0], args[1], args[2], args[3])],
+            inputs=[lon_start_year, lon_start_month, lon_end_year, lon_end_month, lon_enso_phase, ""],
+            outputs=[regression_plot, slopes_text, lon_regression_results]
         )
     
     with gr.Tab("Typhoon Path Animation"):
-        year_dropdown = gr.Dropdown(label="Year", choices=[str(y) for y in range(1950, 2025)], value="2024")
-        typhoon_dropdown = gr.Dropdown(label="Typhoon")
-        standard_dropdown = gr.Dropdown(label="Classification Standard", choices=['atlantic', 'taiwan'], value='atlantic')
+        with gr.Row():
+            year_dropdown = gr.Dropdown(label="Year", choices=[str(y) for y in range(1950, 2025)], value="2024")
+            typhoon_dropdown = gr.Dropdown(label="Typhoon")
+            standard_dropdown = gr.Dropdown(label="Classification Standard", 
+                                          choices=['atlantic', 'taiwan'], value='atlantic')
+        
+        # Fix the animation with modified function
+        def generate_fixed_path_animation(year, typhoon, standard):
+            typhoon_id = typhoon.split('(')[-1].strip(')')
+            storm = ibtracs.get_storm(typhoon_id)
+            
+            # Create better frames for animation
+            frames = []
+            for i in range(len(storm.time)):
+                category, color = categorize_typhoon_by_standard(storm.vmax[i], standard)
+                frames.append(
+                    go.Frame(
+                        data=[
+                            go.Scattergeo(
+                                lon=storm.lon[:i+1], lat=storm.lat[:i+1], 
+                                mode='lines', line=dict(width=2, color='blue'),
+                                name="Path"
+                            ),
+                            go.Scattergeo(
+                                lon=[storm.lon[i]], lat=[storm.lat[i]], 
+                                mode='markers', 
+                                marker=dict(size=10, color=color),
+                                name=f"Position at {storm.time[i].strftime('%Y-%m-%d %H:%M')}",
+                                text=f"Wind: {storm.vmax[i]} kt<br>Category: {category}"
+                            )
+                        ],
+                        name=f"frame{i}"
+                    )
+                )
+            
+            # Initial plot
+            fig = go.Figure(
+                data=[
+                    go.Scattergeo(
+                        lon=[storm.lon[0]], lat=[storm.lat[0]],
+                        mode='markers', marker=dict(size=10, color='green'),
+                        name="Start Position"
+                    )
+                ],
+                frames=frames
+            )
+            
+            # Update layout with better animation controls
+            fig.update_layout(
+                title=f"{year} {storm.name} Typhoon Path",
+                geo=dict(
+                    projection_type='natural earth',
+                    showland=True,
+                    showcoastlines=True,
+                    landcolor='rgb(243, 243, 243)',
+                    countrycolor='rgb(204, 204, 204)',
+                    coastlinecolor='rgb(204, 204, 204)',
+                    lataxis={'range': [min(storm.lat)-5, max(storm.lat)+5]},
+                    lonaxis={'range': [min(storm.lon)-10, max(storm.lon)+10]}
+                ),
+                updatemenus=[{
+                    "buttons": [
+                        {
+                            "args": [None, {"frame": {"duration": 200, "redraw": True}, "fromcurrent": True}],
+                            "label": "Play",
+                            "method": "animate"
+                        },
+                        {
+                            "args": [[None], {"frame": {"duration": 0, "redraw": True}, "mode": "immediate"}],
+                            "label": "Pause",
+                            "method": "animate"
+                        }
+                    ],
+                    "direction": "left",
+                    "pad": {"r": 10, "t": 10},
+                    "type": "buttons",
+                    "x": 0.1,
+                    "y": 0
+                }],
+                sliders=[{
+                    "active": 0,
+                    "steps": [
+                        {
+                            "args": [[f.name], {
+                                "frame": {"duration": 0, "redraw": True},
+                                "mode": "immediate"
+                            }],
+                            "label": str(i),
+                            "method": "animate"
+                        } for i, f in enumerate(frames)
+                    ],
+                    "x": 0.1,
+                    "y": 0,
+                    "len": 0.9
+                }]
+            )
+            
+            return fig
+        
+        animate_btn = gr.Button("Generate Animation")
         path_plot = gr.Plot(label="Typhoon Path Animation")
+        animation_info = gr.Markdown("""
+        ### Animation Instructions
+        1. Select a year and typhoon from the dropdowns
+        2. Click "Generate Animation"
+        3. Use the play button to start the animation
+        4. Use the slider to scrub through different positions
+        """)
         
+        # Year dropdown change function
         def update_typhoon_options(year):
             season = ibtracs.get_season(int(year))
             storm_summary = season.summary()
@@ -414,20 +581,10 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
             return gr.update(choices=options, value=options[0] if options else None)
         
         year_dropdown.change(fn=update_typhoon_options, inputs=year_dropdown, outputs=typhoon_dropdown)
-        gr.Button("Generate Animation").click(
-            fn=generate_path_animation,
+        animate_btn.click(
+            fn=generate_fixed_path_animation,
             inputs=[year_dropdown, typhoon_dropdown, standard_dropdown],
             outputs=path_plot
         )
-    
-    with gr.Tab("Logistic Regressions"):
-        with gr.Row():
-            wind_btn = gr.Button("Wind Speed Regression")
-            pressure_btn = gr.Button("Pressure Regression")
-            longitude_btn = gr.Button("Longitude Regression")
-        regression_results = gr.Textbox(label="Regression Results", lines=10)
-        wind_btn.click(fn=perform_wind_regression, inputs=[start_year, start_month, end_year, end_month], outputs=regression_results)
-        pressure_btn.click(fn=perform_pressure_regression, inputs=[start_year, start_month, end_year, end_month], outputs=regression_results)
-        longitude_btn.click(fn=perform_longitude_regression, inputs=[start_year, start_month, end_year, end_month], outputs=regression_results)
 
 demo.launch()