Update app.py

app.py

@@ -18,6 +18,7 @@ def get_satellite_animation(lat, lon, hours_back=6):
     """Get GOES satellite data and create animation."""
     try:
         frames = []
+        frame_files = []
         current_time = datetime.utcnow()
         
         # GOES-West (covers Montana)
@@ -36,6 +37,18 @@ def get_satellite_animation(lat, lon, hours_back=6):
             {
                 "path": "/ABI/SECTOR/np/GEOCOLOR/",  # True Color
                 "title": "True Color"
+            },
+            {
+                "path": "/ABI/SECTOR/np/BAND08/",  # Water Vapor
+                "title": "Water Vapor"
+            },
+            {
+                "path": "/ABI/SECTOR/np/BAND09/",  # Mid-Level Water Vapor
+                "title": "Mid-Level Water Vapor"
+            },
+            {
+                "path": "/ABI/SECTOR/np/BAND10/",  # Low-Level Water Vapor
+                "title": "Low-Level Water Vapor"
             }
         ]
         
@@ -56,7 +69,6 @@ def get_satellite_animation(lat, lon, hours_back=6):
                         if response.status_code == 200:
                             img = Image.open(io.BytesIO(response.content))
                             
-                            # Convert to RGB if needed
                             if img.mode != 'RGB':
                                 img = img.convert('RGB')
                             
@@ -80,6 +92,11 @@ def get_satellite_animation(lat, lon, hours_back=6):
                             
                             product_frames.append(img)
                             
+                            # Save individual frame
+                            with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as tmp_file:
+                                img.save(tmp_file.name, format='PNG')
+                                frame_files.append(tmp_file.name)
+                            
                     except Exception as e:
                         print(f"Error getting frame for {timestamp}: {str(e)}")
                         continue
@@ -97,155 +114,99 @@ def get_satellite_animation(lat, lon, hours_back=6):
                     frames.append(tmp_file.name)
                     print(f"Successfully created animation for {product['title']}")
         
-        return frames
+        return frames, frame_files
     except Exception as e:
         print(f"Error creating satellite animation: {str(e)}")
-        return []
+        return [], []
 
-def crop_to_region(img, lat, lon, zoom=1.5):
-    """Crop image to focus on selected region."""
+def get_forecast_products(lat, lon):
+    """Get various forecast products."""
     try:
-        # Convert lat/lon to image coordinates (approximate for CONUS images)
-        # These values are tuned for NOAA's CONUS projection
-        img_width, img_height = img.size
-        
-        # CONUS bounds (approximate)
-        lat_min, lat_max = 25.0, 50.0  # Southern to Northern bounds
-        lon_min, lon_max = -125.0, -65.0  # Western to Eastern bounds
-        
-        # Convert coordinates to image space
-        x = (lon - lon_min) / (lon_max - lon_min) * img_width
-        y = (lat_max - lat) / (lat_max - lat_min) * img_height
-        
-        # Calculate crop box
-        crop_width = img_width / zoom
-        crop_height = img_height / zoom
-        
-        # Center the crop box on the point
-        x1 = max(0, x - crop_width/2)
-        y1 = max(0, y - crop_height/2)
-        x2 = min(img_width, x + crop_width/2)
-        y2 = min(img_height, y + crop_height/2)
-        
-        # Ensure we don't crop outside image bounds
-        if x1 < 0: x2 -= x1; x1 = 0
-        if y1 < 0: y2 -= y1; y1 = 0
-        if x2 > img_width: x1 -= (x2 - img_width); x2 = img_width
-        if y2 > img_height: y1 -= (y2 - img_height); y2 = img_height
-        
-        # Crop the image
-        cropped = img.crop((x1, y1, x2, y2))
-        return cropped.resize((img_width, img_height), Image.Resampling.LANCZOS)
-    except Exception as e:
-        print(f"Error cropping image: {str(e)}")
-        return img
-
-def get_snow_forecast(lat, lon):
-    """Get snow forecast data from NOAA."""
-    try:
-        points_url = f"https://api.weather.gov/points/{lat},{lon}"
-        response = requests.get(points_url, timeout=10)
-        response.raise_for_status()
-        forecast_url = response.json()['properties']['forecast']
-        
-        forecast_response = requests.get(forecast_url, timeout=10)
-        forecast_response.raise_for_status()
-        forecast_data = forecast_response.json()
-        
-        # Format text forecast
-        forecast_text = "Weather Forecast:\n\n"
-        for period in forecast_data['properties']['periods']:
-            forecast_text += f"{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\n"
-            
-            # Check for snow-related keywords
-            if any(word in period['detailedForecast'].lower() for word in 
-                  ['snow', 'flurries', 'wintry mix', 'blizzard', 'winter storm']):
-                forecast_text += "⚠️ SNOW EVENT PREDICTED ⚠️\n\n"
-        
-        return forecast_text
-    except Exception as e:
-        return f"Error getting forecast: {str(e)}"
-
-def get_map(lat, lon):
-    """Create a map centered on the given coordinates with markers."""
-    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 m._repr_html_()
-
-def make_peak_click_handler(peak_name):
-    """Creates a click handler for a specific peak."""
-    def handler():
-        coords = MONTANA_PEAKS[peak_name]
-        return coords[0], coords[1]
-    return handler
-
-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", [], get_map(45.5, -111.0)
-        
-        # Get text forecast
-        forecast_text = get_snow_forecast(lat, lon)
-        
-        # Get satellite animations first
-        gallery_data = get_satellite_animation(lat, lon)
-        
-        # Process regular forecast products
+        gallery_data = []
         timestamp = datetime.utcnow().strftime('%Y-%m-%d %H:%M UTC')
         
         # List of forecast products
-        forecast_products = [
+        products = [
+            # Temperature Forecasts
+            {
+                "url": "https://graphical.weather.gov/images/conus/MaxT1_conus.png",
+                "title": "Maximum Temperature"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/MinT1_conus.png",
+                "title": "Minimum Temperature"
+            },
             {
-                "url": "https://radar.weather.gov/ridge/standard/CONUS_0.gif",
-                "title": "Current Radar",
-                "crop": True
+                "url": "https://graphical.weather.gov/images/conus/MaxT2_conus.png",
+                "title": "Maximum Temperature (Day 2)"
             },
             {
-                "url": "https://radar.weather.gov/ridge/standard/CONUS_BR0.gif",
-                "title": "Base Reflectivity",
-                "crop": True
+                "url": "https://graphical.weather.gov/images/conus/MinT2_conus.png",
+                "title": "Minimum Temperature (Day 2)"
+            },
+            
+            # Precipitation Forecasts
+            {
+                "url": "https://graphical.weather.gov/images/conus/QPF06_conus.png",
+                "title": "6-Hour Precipitation"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/QPF12_conus.png",
+                "title": "12-Hour Precipitation"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/QPF24_conus.png",
+                "title": "24-Hour Precipitation"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/QPF48_conus.png",
+                "title": "48-Hour Precipitation"
+            },
+            
+            # Snow Forecasts
+            {
+                "url": "https://graphical.weather.gov/images/conus/Snow1_conus.png",
+                "title": "Snowfall Amount"
+            },
+            {
+                "url": "https://www.wpc.ncep.noaa.gov/pwpf/24hr_pwpf_fill.gif",
+                "title": "24hr Snow Probability"
+            },
+            {
+                "url": "https://www.wpc.ncep.noaa.gov/pwpf/48hr_pwpf_fill.gif",
+                "title": "48hr Snow Probability"
+            },
+            {
+                "url": "https://www.wpc.ncep.noaa.gov/pwpf/72hr_pwpf_fill.gif",
+                "title": "72hr Snow Probability"
+            },
+            
+            # Additional Forecasts
+            {
+                "url": "https://graphical.weather.gov/images/conus/Wx1_conus.png",
+                "title": "Weather Type"
+            },
+            {
+                "url": "https://graphical.weather.gov/images/conus/Wx2_conus.png",
+                "title": "Weather Type (Day 2)"
             },
             {
-                "url": "https://radar.weather.gov/ridge/standard/CONUS_CV0.gif",
-                "title": "Composite Reflectivity",
-                "crop": True
+                "url": "https://www.wpc.ncep.noaa.gov/noaa/noaa.gif",
+                "title": "Surface Analysis"
             }
         ]
         
-        for product in forecast_products:
+        for product in products:
             try:
                 response = requests.get(product["url"], timeout=10)
                 if response.status_code == 200:
-                    # Load the image
                     img = Image.open(io.BytesIO(response.content))
                     
-                    # Convert to RGB if needed
                     if img.mode != 'RGB':
                         img = img.convert('RGB')
                     
-                    # Crop if specified
-                    if product.get("crop", False):
-                        img = crop_to_region(img, lat, lon)
+                    # Crop to region
+                    img = crop_to_region(img, lat, lon)
                     
                     # Add title and timestamp
                     draw = ImageDraw.Draw(img)
@@ -256,46 +217,61 @@ def update_weather(lat, lon):
                     
                     text = f"{product['title']}\n{timestamp}"
                     
-                    # Draw text with outline for visibility
+                    # Draw text with outline
                     x, y = 10, 10
                     for dx, dy in [(-1,-1), (-1,1), (1,-1), (1,1)]:
                         draw.text((x+dx, y+dy), text, fill='black', font=font)
                     draw.text((x, y), text, fill='white', font=font)
                     
-                    # Save to temporary file
-                    with tempfile.NamedTemporaryFile(delete=False, suffix=".png") as tmp_file:
-                        img.save(tmp_file.name, format="PNG")
+                    # Save processed image
+                    with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as tmp_file:
+                        img.save(tmp_file.name, format='PNG')
                         gallery_data.append(tmp_file.name)
                         print(f"Successfully saved {product['title']}")
             except Exception as e:
                 print(f"Error processing {product['title']}: {str(e)}")
                 continue
         
-        if not gallery_data:
-            # Create error image
-            with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as tmp_file:
-                img = Image.new('RGB', (800, 600), color='black')
-                draw = ImageDraw.Draw(img)
-                message = "No forecast images available\nPlease check weather.gov"
-                try:
-                    font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 20)
-                except:
-                    font = ImageFont.load_default()
-                draw.text((400, 300), message, fill='white', anchor="mm", align="center", font=font)
-                img.save(tmp_file.name, format='PNG')
-                gallery_data = [tmp_file.name]
+        return gallery_data
+        
+    except Exception as e:
+        print(f"Error getting forecast products: {str(e)}")
+        return []
+
+[Previous crop_to_region, get_snow_forecast, get_map, and make_peak_click_handler functions remain the same]
+
+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", [], [], [], get_map(45.5, -111.0)
+        
+        # Get text forecast
+        forecast_text = get_snow_forecast(lat, lon)
+        
+        # Get satellite animations and frames
+        satellite_animations, satellite_frames = get_satellite_animation(lat, lon)
+        
+        # Get forecast products
+        forecast_products = get_forecast_products(lat, lon)
+        
+        # Combine all images for gallery
+        gallery_data = satellite_frames + forecast_products
         
         # Get map
         map_html = get_map(lat, lon)
         
-        return forecast_text, gallery_data, map_html
+        return forecast_text, gallery_data, satellite_animations, [], map_html
         
     except Exception as e:
-        return f"Error: {str(e)}", [], get_map(45.5, -111.0)
+        return f"Error: {str(e)}", [], [], [], get_map(45.5, -111.0)
 
 # Create Gradio interface
-with gr.Blocks(title="Montana Mountain Weather") as demo:
-    gr.Markdown("# Montana Mountain Weather")
+with gr.Blocks(title="Montana Mountain Weather - Satellite & Forecast") as demo:
+    gr.Markdown("# Montana Mountain Weather - Satellite & Forecast")
     
     with gr.Row():
         with gr.Column(scale=1):
@@ -331,14 +307,23 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
                 placeholder="Select a location to see the forecast..."
             )
         with gr.Column(scale=2):
-            forecast_gallery = gr.Gallery(
-                label="Weather Products",
+            satellite_gallery = gr.Gallery(
+                label="Satellite Animations",
                 show_label=True,
                 columns=3,
-                height=800,
+                height=300,
                 object_fit="contain"
             )
     
+    with gr.Row():
+        forecast_gallery = gr.Gallery(
+            label="Forecast Products",
+            show_label=True,
+            columns=4,
+            height=800,
+            object_fit="contain"
+        )
+    
     # Handle submit button click
     submit_btn.click(
         fn=update_weather,
@@ -346,6 +331,8 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
         outputs=[
             forecast_output,
             forecast_gallery,
+            satellite_gallery,
+            satellite_frames,
             map_display
         ]
     )
@@ -362,6 +349,8 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
             outputs=[
                 forecast_output,
                 forecast_gallery,
+                satellite_gallery,
+                satellite_frames,
                 map_display
             ]
         )
@@ -370,26 +359,27 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
     ## Instructions
     1. Use the quick access buttons to check specific Montana peaks
     2. Or enter coordinates manually / click on the map
-    3. Click "Get Weather" to see the forecast and weather products
+    3. Click "Get Weather" to see the forecast and satellite data
     
     **Montana Peaks Included:**
     - Lone Peak (Big Sky): 45°16′41″N 111°27′01″W
     - Sacajawea Peak: 45°53′45″N 110°58′7″W
     - Pioneer Mountain: 45°13′55″N 111°27′2″W
     
-    **Weather Products Shown:**
-    - GOES-18 Satellite Animations:
-        - Visible Cloud Cover (10-minute intervals)
-        - Infrared Clean (temperature/height)
-        - True Color Imagery
+    **Satellite Products:**
+    - Visible Cloud Cover
+    - Infrared Clean
+    - True Color
+    - Water Vapor (Multiple Levels)
     
-    - Current Conditions:
-        - Current Radar
-        - Base Reflectivity
-        - Composite Reflectivity
+    **Forecast Products:**
+    - Temperature (Max/Min, Days 1-2)
+    - Precipitation (6/12/24/48 Hour)
+    - Snow Probability and Amount
+    - Weather Type and Surface Analysis
     
-    All images are automatically cropped and zoomed to focus on the selected location.
-    Each satellite animation shows the last 6 hours of data with 10-minute updates.
+    The satellite animations show the last 6 hours with 10-minute intervals.
+    All images are automatically cropped to focus on the selected location.
     
     **Note**: This app uses NOAA and GOES-West satellite data. 
     Mountain weather can change rapidly - always check multiple sources for safety.