Update app.py

app.py

@@ -165,10 +165,10 @@ def get_snow_quality_description(density):
     else:
         return "Dense/settled snow"
 
-def get_animated_snow_forecast():
-    """Get animated snow forecast for the next 12 hours."""
+def get_radar_and_snow_forecasts():
+    """Get current radar and animated snow forecast."""
     try:
-        # Get snow forecast images for different time periods
+        # Get animated snow forecast images
         base_urls = [
             "https://graphical.weather.gov/images/conus/SnowAmt1_conus.gif",
             "https://graphical.weather.gov/images/conus/SnowAmt2_conus.gif",
@@ -222,16 +222,27 @@ def update_weather(lat, lon):
         lat = float(lat)
         lon = float(lon)
         if not (-90 <= lat <= 90 and -180 <= lon <= 180):
-            return "Invalid coordinates. Latitude must be between -90 and 90, longitude between -180 and 180.", None, None, None, create_map()
+            return "Invalid coordinates. Latitude must be between -90 and 90, longitude between -180 and 180.", None, get_map(lat, lon)
         
-        # Get forecast and radar
+        # Get forecast
         forecast = get_noaa_forecast(lat, lon)
-        radar_images = get_radar_images()
         
-        if radar_images is None:
-            return forecast, None, None, None, create_map()
+        # Get animated snow forecast
+        animated_forecast = get_radar_and_snow_forecasts()
         
-        # Create updated map with marker
+        # Create updated map
+        map_html = get_map(lat, lon)
+        
+        return forecast, animated_forecast, map_html
+    except ValueError as e:
+        return f"Error: Invalid coordinate format - {str(e)}", None, get_map(lat, lon)
+    except Exception as e:
+        return f"Error: {str(e)}", None, get_map(lat, lon)
+
+def get_map(lat, lon):
+    """Create a map centered on the given coordinates with markers."""
+    try:
+        # Create map with appropriate zoom level
         m = folium.Map(location=[lat, lon], zoom_start=9)
         
         # Add all Montana peaks
@@ -247,18 +258,10 @@ def update_weather(lat, lon):
             folium.Marker([lat, lon], popup=f"Selected Location<br>Lat: {lat:.4f}, Lon: {lon:.4f}").add_to(m)
         
         m.add_child(folium.ClickForLatLng())  # Enable click events
-        
-        return (
-            forecast,
-            radar_images["current"],
-            radar_images["forecast_6hr"],
-            radar_images["forecast_12hr"],
-            m._repr_html_()
-        )
-    except ValueError as e:
-        return f"Error: Invalid coordinate format - {str(e)}", None, None, None, create_map()
+        return m._repr_html_()
     except Exception as e:
-        return f"Error: {str(e)}", None, None, None, create_map()
+        print(f"Error creating map: {str(e)}")
+        return None
 
 def make_peak_click_handler(peak_name):
     """Creates a click handler for a specific peak."""
@@ -295,36 +298,20 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
             submit_btn = gr.Button("Get Weather", variant="primary")
         
         with gr.Column(scale=2):
-            map_display = gr.HTML(create_map())
-    
-    with gr.Row():
-        forecast_output = gr.Textbox(
-            label="Forecast",
-            lines=12,
-            placeholder="Select a location or mountain peak to see the forecast..."
-        )
+            map_display = gr.HTML(get_map(45.5, -111.0))
     
     with gr.Row():
         with gr.Column():
-            current_radar = gr.Image(
-                label="Current Radar",
-                show_label=True,
-                container=True,
-                type="pil"
-            )
-        with gr.Column():
-            forecast_6hr = gr.Image(
-                label="6-Hour Precipitation Forecast",
-                show_label=True,
-                container=True,
-                type="pil"
+            forecast_output = gr.Textbox(
+                label="Forecast",
+                lines=12,
+                placeholder="Select a location or mountain peak to see the forecast..."
             )
-        with gr.Column():
-            forecast_12hr = gr.Image(
-                label="12-Hour Precipitation Forecast",
+            animated_forecast = gr.Image(
+                label="12-Hour Snow Forecast Animation",
                 show_label=True,
                 container=True,
-                type="pil"
+                type="filepath"
             )
     
     # Handle submit button click
@@ -333,9 +320,7 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
         inputs=[lat_input, lon_input],
         outputs=[
             forecast_output,
-            current_radar,
-            forecast_6hr,
-            forecast_12hr,
+            animated_forecast,
             map_display
         ]
     )
@@ -351,9 +336,7 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
             inputs=[lat_input, lon_input],
             outputs=[
                 forecast_output,
-                current_radar,
-                forecast_6hr,
-                forecast_12hr,
+                animated_forecast,
                 map_display
             ]
         )
@@ -369,6 +352,13 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
     - Sacajawea Peak: 45°53′45″N 110°58′7″W
     - Pioneer Mountain: 45°13′55″N 111°27′2″W
     
+    **Snow Forecast Legend:**
+    The animated snow forecast shows predicted snow accumulation over the next 12 hours:
+    - Frame 1: 0-3 hours
+    - Frame 2: 3-6 hours
+    - Frame 3: 6-9 hours
+    - Frame 4: 9-12 hours
+    
     **Snow Quality Guide:**
     - Ultra-light powder: ≤ 50 kg/m³
     - Light powder: 51-70 kg/m³