Update app.py

app.py

@@ -14,7 +14,132 @@ MONTANA_PEAKS = {
     "Pioneer Mountain": (45.231835, -111.450505)  # 45°13′55″N 111°27′2″W
 }
 
-[previous code remains the same until the peak_button_click function]
+def download_image(url):
+    """Download image from URL and return as PIL Image."""
+    try:
+        response = requests.get(url, timeout=10)
+        response.raise_for_status()
+        image = Image.open(io.BytesIO(response.content))
+        return image
+    except Exception as e:
+        print(f"Error downloading image from {url}: {str(e)}")
+        return None
+
+def get_noaa_forecast(lat, lon):
+    """Get NOAA forecast data for given coordinates."""
+    points_url = f"https://api.weather.gov/points/{lat},{lon}"
+    
+    try:
+        # Get the forecast URL for the coordinates
+        response = requests.get(points_url, timeout=10)
+        response.raise_for_status()
+        forecast_url = response.json()['properties']['forecast']
+        
+        # Get the actual forecast
+        forecast_response = requests.get(forecast_url, timeout=10)
+        forecast_response.raise_for_status()
+        forecast_data = forecast_response.json()
+        
+        # Format the forecast text
+        periods = forecast_data['properties']['periods']
+        forecast_text = ""
+        for period in periods[:6]:  # Show next 3 days (day and night)
+            forecast_text += f"\n{period['name']}:\n"
+            forecast_text += f"Temperature: {period['temperature']}°{period['temperatureUnit']}\n"
+            forecast_text += f"Wind: {period['windSpeed']} {period['windDirection']}\n"
+            forecast_text += f"{period['detailedForecast']}\n"
+        
+        return forecast_text.strip()
+    except requests.exceptions.RequestException as e:
+        return f"Error fetching forecast: {str(e)}"
+
+def get_radar_images():
+    """Get current radar and forecast radar images."""
+    try:
+        # Current radar - National composite
+        current_radar_url = "https://radar.weather.gov/ridge/standard/CONUS_0.gif"
+        current_radar = download_image(current_radar_url)
+        
+        # Get forecast time for NDFD products
+        now = datetime.utcnow()
+        forecast_date = now.strftime("%Y%m%d")
+        
+        # Alternative URLs that might be more reliable
+        forecast_6hr_url = "https://graphical.weather.gov/images/conus/QPF06_conus.png"
+        forecast_12hr_url = "https://graphical.weather.gov/images/conus/QPF12_conus.png"
+        
+        forecast_6hr = download_image(forecast_6hr_url)
+        forecast_12hr = download_image(forecast_12hr_url)
+        
+        return {
+            "current": current_radar,
+            "forecast_6hr": forecast_6hr,
+            "forecast_12hr": forecast_12hr
+        }
+    except Exception as e:
+        print(f"Error getting radar images: {str(e)}")
+        return None
+
+def create_map():
+    """Create a folium map centered on Montana with optional markers."""
+    # Center on Montana
+    m = folium.Map(location=[45.5, -111.0], zoom_start=7)
+    
+    # Add markers for Montana peaks
+    for peak_name, coords in MONTANA_PEAKS.items():
+        folium.Marker(
+            coords,
+            popup=f"{peak_name}<br>Lat: {coords[0]:.4f}, Lon: {coords[1]:.4f}",
+            tooltip=peak_name
+        ).add_to(m)
+    
+    m.add_child(folium.ClickForLatLng())  # Enable click events
+    return m._repr_html_()
+
+def update_weather(lat, lon):
+    """Update weather information based on coordinates."""
+    try:
+        # Validate coordinates
+        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()
+        
+        # Get forecast and radar
+        forecast = get_noaa_forecast(lat, lon)
+        radar_images = get_radar_images()
+        
+        if radar_images is None:
+            return forecast, None, None, None, create_map()
+        
+        # Create updated map with marker
+        m = folium.Map(location=[lat, lon], zoom_start=9)
+        
+        # Add all Montana peaks
+        for peak_name, coords in MONTANA_PEAKS.items():
+            folium.Marker(
+                coords,
+                popup=f"{peak_name}<br>Lat: {coords[0]:.4f}, Lon: {coords[1]:.4f}",
+                tooltip=peak_name
+            ).add_to(m)
+        
+        # Add current location marker if not a peak
+        if (lat, lon) not in MONTANA_PEAKS.values():
+            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()
+    except Exception as e:
+        return f"Error: {str(e)}", None, None, None, create_map()
 
 def make_peak_click_handler(peak_name):
     """Creates a click handler for a specific peak."""
@@ -44,23 +169,9 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
             
             # Quick access buttons for Montana peaks
             gr.Markdown("### Quick Access - Montana Peaks")
+            peak_buttons = []
             for peak_name in MONTANA_PEAKS.keys():
-                button = gr.Button(f"📍 {peak_name}")
-                button.click(
-                    fn=make_peak_click_handler(peak_name),
-                    inputs=[],
-                    outputs=[lat_input, lon_input]
-                ).then(
-                    fn=update_weather,
-                    inputs=[lat_input, lon_input],
-                    outputs=[
-                        forecast_output,
-                        current_radar,
-                        forecast_6hr,
-                        forecast_12hr,
-                        map_display
-                    ]
-                )
+                peak_buttons.append(gr.Button(f"📍 {peak_name}"))
             
             submit_btn = gr.Button("Get Weather", variant="primary")
         
@@ -110,6 +221,24 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
         ]
     )
     
+    # Handle peak button clicks
+    for i, peak_name in enumerate(MONTANA_PEAKS.keys()):
+        peak_buttons[i].click(
+            fn=make_peak_click_handler(peak_name),
+            inputs=[],
+            outputs=[lat_input, lon_input]
+        ).then(
+            fn=update_weather,
+            inputs=[lat_input, lon_input],
+            outputs=[
+                forecast_output,
+                current_radar,
+                forecast_6hr,
+                forecast_12hr,
+                map_display
+            ]
+        )
+    
     gr.Markdown("""
     ## Instructions
     1. Use the quick access buttons to check specific Montana peaks