Update app.py

app.py

@@ -9,236 +9,207 @@ import io
 
 # Montana Mountain Peaks coordinates
 MONTANA_PEAKS = {
-    "Lone Peak (Big Sky)": (45.27806, -111.45028),  # 45°16′41″N 111°27′01″W
-    "Sacajawea Peak": (45.89583, -110.96861),  # 45°53′45″N 110°58′7″W
-    "Pioneer Mountain": (45.231835, -111.450505)  # 45°13′55″N 111°27′2″W
+    "Lone Peak (Big Sky)": (45.27806, -111.45028),
+    "Sacajawea Peak": (45.89583, -110.96861),
+    "Pioneer Mountain": (45.231835, -111.450505)
 }
 
-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)
-        base_url = "https://cdn.star.nesdis.noaa.gov/GOES18"
-        
-        # Get multiple products
-        products = [
-            {
-                "path": "/ABI/SECTOR/np/BAND02/",  # Visible
-                "title": "Visible Cloud Cover"
-            },
-            {
-                "path": "/ABI/SECTOR/np/BAND13/",  # IR Clean
-                "title": "Infrared Clean"
-            },
-            {
-                "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"
-            }
-        ]
-        
-        for product in products:
-            product_frames = []
-            
-            # Get last N hours of data
-            for hour in range(hours_back, -1, -1):
-                time = current_time - timedelta(hours=hour)
-                
-                # Format time for GOES URL (updates every 10 minutes)
-                for minute in range(0, 60, 10):
-                    try:
-                        timestamp = time.replace(minute=minute).strftime("%Y%j%H%M")
-                        url = f"{base_url}{product['path']}{timestamp}_GOES18-ABI-np-{product['path'].split('/')[-2]}-1000x1000.jpg"
-                        
-                        response = requests.get(url, timeout=5)
-                        if response.status_code == 200:
-                            img = Image.open(io.BytesIO(response.content))
-                            
-                            if img.mode != 'RGB':
-                                img = img.convert('RGB')
-                            
-                            # Crop to region
-                            img = crop_to_region(img, lat, lon, zoom=2.0)  # Higher zoom for satellite
-                            
-                            # Add timestamp
-                            draw = ImageDraw.Draw(img)
-                            try:
-                                font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 20)
-                            except:
-                                font = ImageFont.load_default()
-                            
-                            text = f"{product['title']}\n{time.strftime('%Y-%m-%d %H:%M UTC')}"
-                            
-                            # 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)
-                            
-                            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
-            
-            if product_frames:
-                # Create animated GIF for this product
-                with tempfile.NamedTemporaryFile(delete=False, suffix='.gif') as tmp_file:
-                    product_frames[0].save(
-                        tmp_file.name,
-                        save_all=True,
-                        append_images=product_frames[1:],
-                        duration=500,  # Half second per frame
-                        loop=0
-                    )
-                    frames.append(tmp_file.name)
-                    print(f"Successfully created animation for {product['title']}")
-        
-        return frames, frame_files
-    except Exception as e:
-        print(f"Error creating satellite animation: {str(e)}")
-        return [], []
-
-def get_forecast_products(lat, lon):
-    """Get various forecast products."""
-    try:
-        gallery_data = []
-        timestamp = datetime.utcnow().strftime('%Y-%m-%d %H:%M UTC')
+def get_radar_frames(lat, lon, hours_back=6):
+    """Get historical radar frames and create animation."""
+    frames = []
+    frame_files = []
+    current_time = datetime.utcnow()
+    
+    # Get historical radar frames at 5-minute intervals
+    for hour in range(hours_back, -1, -1):
+        time = current_time - timedelta(hours=hour)
+        timestamp = time.strftime("%Y%m%d_%H%M")
         
-        # List of forecast products
+        # Different radar products available
+        url_base = "https://radar.weather.gov/ridge/standard/CONUS"
         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://graphical.weather.gov/images/conus/MaxT2_conus.png",
-                "title": "Maximum Temperature (Day 2)"
-            },
-            {
-                "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://www.wpc.ncep.noaa.gov/noaa/noaa.gif",
-                "title": "Surface Analysis"
-            }
+            (f"{url_base}_{timestamp}.gif", "Standard Radar"),
+            (f"{url_base}_BR_{timestamp}.gif", "Base Reflectivity"),
+            (f"{url_base}_CV_{timestamp}.gif", "Composite Reflectivity"),
         ]
         
-        for product in products:
+        for url, title in products:
             try:
-                response = requests.get(product["url"], timeout=10)
+                response = requests.get(url, timeout=5)
                 if response.status_code == 200:
-                    img = Image.open(io.BytesIO(response.content))
-                    
-                    if img.mode != 'RGB':
-                        img = img.convert('RGB')
-                    
-                    # Crop to region
+                    img = Image.open(io.BytesIO(response.content)).convert('RGB')
                     img = crop_to_region(img, lat, lon)
                     
-                    # Add title and timestamp
+                    # Add timestamp
                     draw = ImageDraw.Draw(img)
-                    try:
-                        font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 20)
-                    except:
-                        font = ImageFont.load_default()
+                    text = f"{title}\n{time.strftime('%Y-%m-%d %H:%M UTC')}"
+                    draw_text_with_outline(draw, text, (10, 10))
                     
-                    text = f"{product['title']}\n{timestamp}"
-                    
-                    # 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 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']}")
+                    # Save both individual frame and add to animation
+                    with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as tmp:
+                        img.save(tmp.name)
+                        frame_files.append(tmp.name)
+                        frames.append(img)
+                    break
             except Exception as e:
-                print(f"Error processing {product['title']}: {str(e)}")
                 continue
+                
+    if frames:
+        # Create animation
+        with tempfile.NamedTemporaryFile(delete=False, suffix='.gif') as tmp:
+            frames[0].save(
+                tmp.name, 
+                save_all=True,
+                append_images=frames[1:],
+                duration=200,
+                loop=0
+            )
+            return tmp.name, frame_files
+            
+    return None, []
+
+def crop_to_region(img, lat, lon, zoom=1.5):
+    """Crop image to focus on selected region."""
+    img_width, img_height = img.size
+    
+    # CONUS bounds (approximate)
+    lat_min, lat_max = 25.0, 50.0
+    lon_min, lon_max = -125.0, -65.0
+    
+    # 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 crop box on 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 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 and resize
+    cropped = img.crop((x1, y1, x2, y2))
+    return cropped.resize((img_width, img_height), Image.Resampling.LANCZOS)
+
+def draw_text_with_outline(draw, text, pos, font_size=20):
+    """Draw text with outline for visibility."""
+    try:
+        font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", font_size)
+    except:
+        font = ImageFont.load_default()
+    
+    x, y = pos
+    # Draw outline
+    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
+    draw.text((x, y), text, fill='white', font=font)
+
+def get_forecast_products(lat, lon):
+    """Get various forecast products."""
+    gallery_data = []
+    timestamp = datetime.utcnow().strftime('%Y-%m-%d %H:%M UTC')
+    
+    products = [
+        # Temperature
+        ("MaxT1_conus.png", "Maximum Temperature"),
+        ("MinT1_conus.png", "Minimum Temperature"),
+        # Precipitation
+        ("QPF06_conus.png", "6-Hour Precipitation"),
+        ("QPF12_conus.png", "12-Hour Precipitation"),
+        ("QPF24_conus.png", "24-Hour Precipitation"),
+        # Snow
+        ("Snow1_conus.png", "Snowfall Amount"),
+        ("Snow2_conus.png", "Snowfall Day 2"),
+        # Weather Type
+        ("Wx1_conus.png", "Weather Type"),
+    ]
+    
+    base_url = "https://graphical.weather.gov/images/conus"
+    
+    for filename, title in products:
+        try:
+            url = f"{base_url}/{filename}"
+            response = requests.get(url, timeout=10)
+            if response.status_code == 200:
+                img = Image.open(io.BytesIO(response.content)).convert('RGB')
+                img = crop_to_region(img, lat, lon)
+                
+                # Add title
+                draw = ImageDraw.Draw(img)
+                text = f"{title}\n{timestamp}"
+                draw_text_with_outline(draw, text, (10, 10))
+                
+                # Save processed image
+                with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as tmp:
+                    img.save(tmp.name)
+                    gallery_data.append(tmp.name)
+        except Exception as e:
+            continue
+            
+    return gallery_data
+
+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())
+    return m._repr_html_()
+
+def get_noaa_forecast(lat, lon):
+    """Get NOAA text forecast."""
+    try:
+        # Get forecast URL
+        points_url = f"https://api.weather.gov/points/{lat},{lon}"
+        response = requests.get(points_url, timeout=10)
+        forecast_url = response.json()['properties']['forecast']
         
-        return gallery_data
+        # Get forecast data
+        forecast = requests.get(forecast_url, timeout=10).json()
         
+        # Format text forecast
+        text = "Weather Forecast:\n\n"
+        for period in forecast['properties']['periods']:
+            text += f"{period['name']}:\n"
+            text += f"Temperature: {period['temperature']}°{period['temperatureUnit']}\n"
+            text += f"Wind: {period['windSpeed']} {period['windDirection']}\n"
+            text += f"{period['detailedForecast']}\n\n"
+            
+            # Highlight snow events
+            if any(word in period['detailedForecast'].lower() for word in 
+                  ['snow', 'flurries', 'wintry mix', 'blizzard']):
+                text += "⚠️ SNOW EVENT PREDICTED ⚠️\n\n"
+        
+        return text
     except Exception as e:
-        print(f"Error getting forecast products: {str(e)}")
-        return []
+        return f"Error getting forecast: {str(e)}"
 
-[Previous crop_to_region, get_snow_forecast, get_map, and make_peak_click_handler functions remain the same]
+def make_peak_click_handler(peak_name):
+    """Creates a click handler for a specific peak."""
+    def handler():
+        return MONTANA_PEAKS[peak_name]
+    return handler
 
 def update_weather(lat, lon):
     """Update weather information based on coordinates."""
@@ -247,31 +218,31 @@ def update_weather(lat, lon):
         lat = float(lat)
         lon = float(lon)
         if not (-90 <= lat <= 90 and -180 <= lon <= 180):
-            return "Invalid coordinates", [], [], [], get_map(45.5, -111.0)
+            return "Invalid coordinates", [], None, get_map(45.5, -111.0)
         
         # Get text forecast
-        forecast_text = get_snow_forecast(lat, lon)
+        forecast_text = get_noaa_forecast(lat, lon)
         
-        # Get satellite animations and frames
-        satellite_animations, satellite_frames = get_satellite_animation(lat, lon)
+        # Get radar animation and frames
+        radar_animation, frames = get_radar_frames(lat, lon)
         
         # Get forecast products
-        forecast_products = get_forecast_products(lat, lon)
+        forecast_frames = get_forecast_products(lat, lon)
         
         # Combine all images for gallery
-        gallery_data = satellite_frames + forecast_products
+        gallery_data = frames + forecast_frames
         
         # Get map
         map_html = get_map(lat, lon)
         
-        return forecast_text, gallery_data, satellite_animations, [], map_html
+        return forecast_text, gallery_data, radar_animation, map_html
         
     except Exception as e:
-        return f"Error: {str(e)}", [], [], [], get_map(45.5, -111.0)
+        return f"Error: {str(e)}", [], None, get_map(45.5, -111.0)
 
 # Create Gradio interface
-with gr.Blocks(title="Montana Mountain Weather - Satellite & Forecast") as demo:
-    gr.Markdown("# Montana Mountain Weather - Satellite & Forecast")
+with gr.Blocks(title="Montana Mountain Weather") as demo:
+    gr.Markdown("# Montana Mountain Weather")
     
     with gr.Row():
         with gr.Column(scale=1):
@@ -288,10 +259,9 @@ with gr.Blocks(title="Montana Mountain Weather - Satellite & Forecast") as demo:
                 maximum=180
             )
             
-            # Quick access buttons for Montana peaks
             gr.Markdown("### Quick Access - Montana Peaks")
             peak_buttons = []
-            for peak_name in MONTANA_PEAKS.keys():
+            for peak_name in MONTANA_PEAKS:
                 peak_buttons.append(gr.Button(f"📍 {peak_name}"))
             
             submit_btn = gr.Button("Get Weather", variant="primary")
@@ -307,20 +277,18 @@ with gr.Blocks(title="Montana Mountain Weather - Satellite & Forecast") as demo:
                 placeholder="Select a location to see the forecast..."
             )
         with gr.Column(scale=2):
-            satellite_gallery = gr.Gallery(
-                label="Satellite Animations",
+            radar_animation = gr.Image(
+                label="Radar Animation",
                 show_label=True,
-                columns=3,
-                height=300,
-                object_fit="contain"
+                type="filepath"
             )
     
     with gr.Row():
         forecast_gallery = gr.Gallery(
-            label="Forecast Products",
+            label="Weather Products",
             show_label=True,
             columns=4,
-            height=800,
+            height=600,
             object_fit="contain"
         )
     
@@ -331,8 +299,7 @@ with gr.Blocks(title="Montana Mountain Weather - Satellite & Forecast") as demo:
         outputs=[
             forecast_output,
             forecast_gallery,
-            satellite_gallery,
-            satellite_frames,
+            radar_animation,
             map_display
         ]
     )
@@ -349,8 +316,7 @@ with gr.Blocks(title="Montana Mountain Weather - Satellite & Forecast") as demo:
             outputs=[
                 forecast_output,
                 forecast_gallery,
-                satellite_gallery,
-                satellite_frames,
+                radar_animation,
                 map_display
             ]
         )
@@ -359,29 +325,27 @@ with gr.Blocks(title="Montana Mountain Weather - Satellite & Forecast") 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 satellite data
+    3. Click "Get Weather" to see the forecast and weather products
     
     **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
     
-    **Satellite Products:**
-    - Visible Cloud Cover
-    - Infrared Clean
-    - True Color
-    - Water Vapor (Multiple Levels)
+    **Radar Products:**
+    - Standard Radar
+    - Base Reflectivity
+    - Composite Reflectivity
+    All images are cropped to focus on selected location.
+    Radar animation shows the last 6 hours of data.
     
     **Forecast Products:**
-    - Temperature (Max/Min, Days 1-2)
-    - Precipitation (6/12/24/48 Hour)
-    - Snow Probability and Amount
-    - Weather Type and Surface Analysis
-    
-    The satellite animations show the last 6 hours with 10-minute intervals.
-    All images are automatically cropped to focus on the selected location.
+    - Temperature (Max/Min)
+    - Precipitation (6/12/24 Hour)
+    - Snowfall Amount
+    - Weather Type
     
-    **Note**: This app uses NOAA and GOES-West satellite data. 
+    **Note**: This app uses NOAA weather data.
     Mountain weather can change rapidly - always check multiple sources for safety.
     """)