Update app.py

app.py

@@ -18,48 +18,54 @@ 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 10-minute intervals
-    for hour in range(hours_back, -1, -1):
-        for minute in range(0, 60, 10):
-            time = current_time - timedelta(hours=hour, minutes=minute)
-            
-            # Try both Level 2 and Level 3 radar products
-            urls = [
-                f"https://radar.weather.gov/ridge/RadarImg/N0R/KMSX_{time.strftime('%Y%m%d_%H%M')}_N0R.gif",  # Base reflectivity
-                f"https://radar.weather.gov/ridge/RadarImg/NCR/KMSX_{time.strftime('%Y%m%d_%H%M')}_NCR.gif",  # Composite reflectivity
-                f"https://radar.weather.gov/ridge/RadarImg/N0S/KMSX_{time.strftime('%Y%m%d_%H%M')}_N0S.gif",  # Storm relative motion
-            ]
-            
-            for url in urls:
-                try:
-                    print(f"Trying URL: {url}")  # Debug print
-                    response = requests.get(url, timeout=5)
-                    if response.status_code == 200:
-                        print(f"Successfully downloaded: {url}")  # Debug print
-                        img = Image.open(io.BytesIO(response.content)).convert('RGB')
-                        img = crop_to_region(img, lat, lon)
-                        
-                        # Add timestamp
-                        draw = ImageDraw.Draw(img)
-                        radar_type = "Base" if "N0R" in url else "Composite" if "NCR" in url else "Storm"
-                        text = f"{radar_type} Radar\n{time.strftime('%Y-%m-%d %H:%M UTC')}"
-                        draw_text_with_outline(draw, text, (10, 10))
-                        
-                        # 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  # Successfully got frame for this time period
-                except Exception as e:
-                    print(f"Error with URL {url}: {str(e)}")  # Debug print
-                    continue
+    # Adjust current time to allow for NOAA delay and round down to the nearest 10 minutes.
+    now = datetime.utcnow() - timedelta(minutes=20)
+    now = now - timedelta(minutes=now.minute % 10, seconds=now.second, microseconds=now.microsecond)
+    
+    total_frames = (hours_back * 60) // 10 + 1  # one frame every 10 minutes
+    for i in range(total_frames):
+        time_point = now - timedelta(minutes=i * 10)
+        # Try multiple radar products
+        urls = [
+            f"https://radar.weather.gov/ridge/RadarImg/N0R/KMSX_{time_point.strftime('%Y%m%d_%H%M')}_N0R.gif",  # Base reflectivity
+            f"https://radar.weather.gov/ridge/RadarImg/NCR/KMSX_{time_point.strftime('%Y%m%d_%H%M')}_NCR.gif",  # Composite reflectivity
+            f"https://radar.weather.gov/ridge/RadarImg/N0S/KMSX_{time_point.strftime('%Y%m%d_%H%M')}_N0S.gif",  # Storm relative motion
+        ]
+        
+        for url in urls:
+            try:
+                print(f"Trying URL: {url}")
+                response = requests.get(url, timeout=5)
+                if response.status_code == 200:
+                    print(f"Successfully downloaded: {url}")
+                    img = Image.open(io.BytesIO(response.content)).convert('RGB')
+                    img = crop_to_region(img, lat, lon)
+                    
+                    # Add timestamp overlay
+                    draw = ImageDraw.Draw(img)
+                    if "N0R" in url:
+                        radar_type = "Base"
+                    elif "NCR" in url:
+                        radar_type = "Composite"
+                    else:
+                        radar_type = "Storm"
+                    text = f"{radar_type} Radar\n{time_point.strftime('%Y-%m-%d %H:%M UTC')}"
+                    draw_text_with_outline(draw, text, (10, 10))
+                    
+                    # Save individual frame and add to animation list
+                    with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as tmp:
+                        img.save(tmp.name)
+                        frame_files.append(tmp.name)
+                        frames.append(img)
+                    break  # Use the first available image for this time_point
+            except Exception as e:
+                print(f"Error with URL {url}: {str(e)}")
+                continue
                     
     if frames:
-        print(f"Creating animation with {len(frames)} frames")  # Debug print
-        # Create animation
+        print(f"Creating animation with {len(frames)} frames")
+        # Create animated gif from frames
         with tempfile.NamedTemporaryFile(delete=False, suffix='.gif') as tmp:
             frames[0].save(
                 tmp.name, 
@@ -68,10 +74,10 @@ def get_radar_frames(lat, lon, hours_back=6):
                 duration=200,  # 0.2 seconds per frame
                 loop=0
             )
-            print(f"Animation saved to {tmp.name}")  # Debug print
+            print(f"Animation saved to {tmp.name}")
             return tmp.name, frame_files
     else:
-        print("No frames collected for animation")  # Debug print
+        print("No frames collected for animation")
             
     return None, []
 
@@ -87,28 +93,36 @@ def crop_to_region(img, lat, lon, zoom=1.5):
     x = (lon - lon_min) / (lon_max - lon_min) * img_width
     y = (lat_max - lat) / (lat_max - lat_min) * img_height
     
-    # Calculate crop box
+    # Calculate crop box dimensions
     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)
+    # Center 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 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
+    # Adjust if crop box goes out of 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
+    # Crop and resize back to full image dimensions
     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, center=False):
-    """Draw text with outline for visibility."""
+    """Draw text with outline for better visibility."""
     try:
         font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", font_size)
     except:
@@ -116,17 +130,17 @@ def draw_text_with_outline(draw, text, pos, font_size=20, center=False):
     
     x, y = pos
     if center:
-        # Get text size for centering
+        # Calculate text size for centering
         bbox = draw.textbbox((0, 0), text, font=font)
         text_width = bbox[2] - bbox[0]
         text_height = bbox[3] - bbox[1]
         x = x - text_width // 2
         y = y - text_height // 2
     
-    # 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 outline for contrast
+    for dx, dy in [(-1, -1), (-1, 1), (1, -1), (1, 1)]:
+        draw.text((x + dx, y + dy), text, fill='black', font=font)
+    # Draw the main text
     draw.text((x, y), text, fill='white', font=font)
 
 def get_forecast_products(lat, lon):
@@ -159,12 +173,12 @@ def get_forecast_products(lat, lon):
                 img = Image.open(io.BytesIO(response.content)).convert('RGB')
                 img = crop_to_region(img, lat, lon)
                 
-                # Add title
+                # Add title overlay
                 draw = ImageDraw.Draw(img)
                 text = f"{title}\n{timestamp}"
                 draw_text_with_outline(draw, text, (10, 10))
                 
-                # Save processed image
+                # Save the processed image
                 with tempfile.NamedTemporaryFile(delete=False, suffix='.png') as tmp:
                     img.save(tmp.name)
                     gallery_data.append(tmp.name)
@@ -177,7 +191,7 @@ 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
+    # Add all Montana peaks to the map
     for peak_name, coords in MONTANA_PEAKS.items():
         folium.Marker(
             coords,
@@ -185,7 +199,7 @@ def get_map(lat, lon):
             tooltip=peak_name
         ).add_to(m)
     
-    # Add current location marker if not a peak
+    # Add a marker for the selected location if it isn’t one of the peaks
     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)
     
@@ -195,15 +209,15 @@ def get_map(lat, lon):
 def get_noaa_forecast(lat, lon):
     """Get NOAA text forecast."""
     try:
-        # Get forecast URL
+        # Get forecast URL from the NOAA points API
         points_url = f"https://api.weather.gov/points/{lat},{lon}"
         response = requests.get(points_url, timeout=10)
         forecast_url = response.json()['properties']['forecast']
         
-        # Get forecast data
+        # Retrieve forecast data
         forecast = requests.get(forecast_url, timeout=10).json()
         
-        # Format text forecast
+        # Format the text forecast
         text = "Weather Forecast:\n\n"
         for period in forecast['properties']['periods']:
             text += f"{period['name']}:\n"
@@ -211,9 +225,9 @@ def get_noaa_forecast(lat, lon):
             text += f"Wind: {period['windSpeed']} {period['windDirection']}\n"
             text += f"{period['detailedForecast']}\n\n"
             
-            # Highlight snow events
+            # Highlight potential snow events
             if any(word in period['detailedForecast'].lower() for word in 
-                  ['snow', 'flurries', 'wintry mix', 'blizzard']):
+                   ['snow', 'flurries', 'wintry mix', 'blizzard']):
                 text += "⚠️ SNOW EVENT PREDICTED ⚠️\n\n"
         
         return text
@@ -223,7 +237,8 @@ def get_noaa_forecast(lat, lon):
 def make_peak_click_handler(peak_name):
     """Creates a click handler for a specific peak."""
     def handler():
-        return MONTANA_PEAKS[peak_name]
+        lat, lon = MONTANA_PEAKS[peak_name]
+        return lat, lon
     return handler
 
 def update_weather(lat, lon):
@@ -238,16 +253,16 @@ def update_weather(lat, lon):
         # Get text forecast
         forecast_text = get_noaa_forecast(lat, lon)
         
-        # Get radar animation and frames
+        # Get radar animation and individual frames
         radar_animation, frames = get_radar_frames(lat, lon)
         
-        # Get forecast products
+        # Get forecast products images
         forecast_frames = get_forecast_products(lat, lon)
         
-        # Combine all images for gallery
+        # Combine all images for the gallery display
         gallery_data = frames + forecast_frames
         
-        # Get map
+        # Generate the map HTML
         map_html = get_map(lat, lon)
         
         return forecast_text, gallery_data, radar_animation, map_html
@@ -351,7 +366,7 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
     - Standard Radar
     - Base Reflectivity
     - Composite Reflectivity
-    All images are cropped to focus on selected location.
+    All images are cropped to focus on the selected location.
     Radar animation shows the last 6 hours of data.
     
     **Forecast Products:**
@@ -364,4 +379,4 @@ with gr.Blocks(title="Montana Mountain Weather") as demo:
     Mountain weather can change rapidly - always check multiple sources for safety.
     """)
 
-demo.queue().launch()
+demo.queue().launch()