Update app.py

app.py

@@ -45,22 +45,40 @@ color_map = {
     'Tropical Depression': 'rgb(173, 216, 230)'
 }
 
-# Classification standards for both Plotly and Matplotlib (HEX for Matplotlib)
+# Classification standards with color names for Matplotlib
 atlantic_standard = {
-    'C5 Super Typhoon': {'wind_speed': 137, 'color': '#FF0000'},
-    'C4 Very Strong Typhoon': {'wind_speed': 113, 'color': '#FF3F00'},
-    'C3 Strong Typhoon': {'wind_speed': 96, 'color': '#FF7F00'},
-    'C2 Typhoon': {'wind_speed': 83, 'color': '#FFBF00'},
-    'C1 Typhoon': {'wind_speed': 64, 'color': '#FFFF00'},
-    'Tropical Storm': {'wind_speed': 34, 'color': '#00FFFF'},
-    'Tropical Depression': {'wind_speed': 0, 'color': '#ADD8E6'}
+    'C5 Super Typhoon': {'wind_speed': 137, 'color': 'Red'},
+    'C4 Very Strong Typhoon': {'wind_speed': 113, 'color': 'Orange-Red'},
+    'C3 Strong Typhoon': {'wind_speed': 96, 'color': 'Orange'},
+    'C2 Typhoon': {'wind_speed': 83, 'color': 'Light Orange'},
+    'C1 Typhoon': {'wind_speed': 64, 'color': 'Yellow'},
+    'Tropical Storm': {'wind_speed': 34, 'color': 'Cyan'},
+    'Tropical Depression': {'wind_speed': 0, 'color': 'Light Blue'}
 }
 
 taiwan_standard = {
-    'Strong Typhoon': {'wind_speed': 51.0, 'color': '#FF0000'},
-    'Medium Typhoon': {'wind_speed': 33.7, 'color': '#FF7F00'},
-    'Mild Typhoon': {'wind_speed': 17.2, 'color': '#FFFF00'},
-    'Tropical Depression': {'wind_speed': 0, 'color': '#ADD8E6'}
+    'Strong Typhoon': {'wind_speed': 51.0, 'color': 'Red'},
+    'Medium Typhoon': {'wind_speed': 33.7, 'color': 'Orange'},
+    'Mild Typhoon': {'wind_speed': 17.2, 'color': 'Yellow'},
+    'Tropical Depression': {'wind_speed': 0, 'color': 'Light Blue'}
+}
+
+# HEX codes for Matplotlib plotting (unchanged)
+atlantic_hex = {
+    'C5 Super Typhoon': '#FF0000',
+    'C4 Very Strong Typhoon': '#FF3F00',
+    'C3 Strong Typhoon': '#FF7F00',
+    'C2 Typhoon': '#FFBF00',
+    'C1 Typhoon': '#FFFF00',
+    'Tropical Storm': '#00FFFF',
+    'Tropical Depression': '#ADD8E6'
+}
+
+taiwan_hex = {
+    'Strong Typhoon': '#FF0000',
+    'Medium Typhoon': '#FF7F00',
+    'Mild Typhoon': '#FFFF00',
+    'Tropical Depression': '#ADD8E6'
 }
 
 # Data loading and preprocessing functions
@@ -302,31 +320,31 @@ def generate_main_analysis(start_year, start_month, end_year, end_month, enso_ph
     
     return tracks_fig, wind_scatter, pressure_scatter, regression_fig, slopes_text
 
-# Video animation function with explicit sidebar and color legend
+# Video animation function with adjusted size, color names, and sidebar
 def categorize_typhoon_by_standard(wind_speed, standard):
     if standard == 'taiwan':
         wind_speed_ms = wind_speed * 0.514444
         if wind_speed_ms >= 51.0:
-            return 'Strong Typhoon', taiwan_standard['Strong Typhoon']['color']
+            return 'Strong Typhoon', taiwan_hex['Strong Typhoon']
         elif wind_speed_ms >= 33.7:
-            return 'Medium Typhoon', taiwan_standard['Medium Typhoon']['color']
+            return 'Medium Typhoon', taiwan_hex['Medium Typhoon']
         elif wind_speed_ms >= 17.2:
-            return 'Mild Typhoon', taiwan_standard['Mild Typhoon']['color']
-        return 'Tropical Depression', taiwan_standard['Tropical Depression']['color']
+            return 'Mild Typhoon', taiwan_hex['Mild Typhoon']
+        return 'Tropical Depression', taiwan_hex['Tropical Depression']
     else:
         if wind_speed >= 137:
-            return 'C5 Super Typhoon', atlantic_standard['C5 Super Typhoon']['color']
+            return 'C5 Super Typhoon', atlantic_hex['C5 Super Typhoon']
         elif wind_speed >= 113:
-            return 'C4 Very Strong Typhoon', atlantic_standard['C4 Very Strong Typhoon']['color']
+            return 'C4 Very Strong Typhoon', atlantic_hex['C4 Very Strong Typhoon']
         elif wind_speed >= 96:
-            return 'C3 Strong Typhoon', atlantic_standard['C3 Strong Typhoon']['color']
+            return 'C3 Strong Typhoon', atlantic_hex['C3 Strong Typhoon']
         elif wind_speed >= 83:
-            return 'C2 Typhoon', atlantic_standard['C2 Typhoon']['color']
+            return 'C2 Typhoon', atlantic_hex['C2 Typhoon']
         elif wind_speed >= 64:
-            return 'C1 Typhoon', atlantic_standard['C1 Typhoon']['color']
+            return 'C1 Typhoon', atlantic_hex['C1 Typhoon']
         elif wind_speed >= 34:
-            return 'Tropical Storm', atlantic_standard['Tropical Storm']['color']
-        return 'Tropical Depression', atlantic_standard['Tropical Depression']['color']
+            return 'Tropical Storm', atlantic_hex['Tropical Storm']
+        return 'Tropical Depression', atlantic_hex['Tropical Depression']
 
 def generate_track_video(year, typhoon, standard):
     if not typhoon:
@@ -341,9 +359,9 @@ def generate_track_video(year, typhoon, standard):
     lat_padding = max((max_lat - min_lat) * 0.3, 5)
     lon_padding = max((max_lon - min_lon) * 0.3, 5)
 
-    # Set up the figure with Gradio-friendly scale (1000x700 pixels at 100 DPI)
-    fig = plt.figure(figsize=(10, 7), dpi=100)  # 10x7 inches = 1000x700 pixels
-    ax = plt.axes([0.05, 0.05, 0.65, 0.9], projection=ccrs.PlateCarree())  # Map on left 65% of figure
+    # Set up the figure with adjusted size to fit Gradio (900x700 pixels at 100 DPI)
+    fig = plt.figure(figsize=(9, 7), dpi=100)  # 9x7 inches = 900x700 pixels
+    ax = plt.axes([0.05, 0.15, 0.60, 0.80], projection=ccrs.PlateCarree())  # Map on left 60%, adjusted for legend space
     ax.set_extent([min_lon - lon_padding, max_lon + lon_padding, min_lat - lat_padding, max_lat + lat_padding], crs=ccrs.PlateCarree())
 
     # Add world map features
@@ -358,17 +376,17 @@ def generate_track_video(year, typhoon, standard):
     # Initialize the line and point
     line, = ax.plot([], [], 'b-', linewidth=2, transform=ccrs.PlateCarree())
     point, = ax.plot([], [], 'o', markersize=8, transform=ccrs.PlateCarree())
-    date_text = ax.text(0.02, 0.02, '', transform=ax.transAxes, fontsize=12, bbox=dict(facecolor='white', alpha=0.8))
+    date_text = ax.text(0.02, 0.02, '', transform=ax.transAxes, fontsize=10, bbox=dict(facecolor='white', alpha=0.8))
 
     # Add sidebar with typhoon details on the right
-    details_title = fig.text(0.75, 0.65, "Typhoon Details", fontsize=14, fontweight='bold', verticalalignment='top', horizontalalignment='left')
-    details_text = fig.text(0.75, 0.60, '', fontsize=12, verticalalignment='top', horizontalalignment='left',
+    details_title = fig.text(0.70, 0.90, "Typhoon Details", fontsize=12, fontweight='bold', verticalalignment='top', horizontalalignment='left')
+    details_text = fig.text(0.70, 0.85, '', fontsize=10, verticalalignment='top', horizontalalignment='left',
                             bbox=dict(facecolor='white', alpha=0.8, boxstyle='round,pad=0.5'))
 
     # Add color legend below the details
     standard_dict = atlantic_standard if standard == 'atlantic' else taiwan_standard
     color_legend_text = "\n".join([f"{cat}: {details['color']}" for cat, details in standard_dict.items()])
-    color_legend = fig.text(0.75, 0.35, f"Color Legend\n{color_legend_text}", fontsize=12, verticalalignment='top', horizontalalignment='left',
+    color_legend = fig.text(0.70, 0.60, f"Color Legend\n{color_legend_text}", fontsize=10, verticalalignment='top', horizontalalignment='left',
                             bbox=dict(facecolor='white', alpha=0.8, boxstyle='round,pad=0.5'))
 
     def init():
@@ -621,7 +639,7 @@ with gr.Blocks(title="Typhoon Analysis Dashboard") as demo:
         5. The animation shows the typhoon track growing over a world map, with:
            - Date on the bottom left
            - Sidebar on the right showing typhoon details (name, date, wind speed, category)
-           - Color legend below the sidebar explaining what each color represents
+           - Color legend below the sidebar using color names (e.g., "Red: C5 Super Typhoon")
         """)
         
         def update_typhoon_options(year):