Update app.py

app.py

@@ -182,74 +182,90 @@ MONTANA_PEAKS = {
 }
 
 def get_radar_and_snow_forecasts():
-    """Get current radar and animated snow forecast."""
+    """Get current radar and forecast loop."""
     try:
-        # Use both current radar and forecast images
-        urls = [
-            # Current radar from Missoula covering the mountains
-            "https://radar.weather.gov/ridge/lite/KMSX_loop.gif",
-            # National Weather Service forecast radar
-            "https://radar.weather.gov/ridge/lite/NATIONAL_loop.gif",
-            # Short term forecast
-            "https://forecast.weather.gov/wwamap/png/US.png"
-        ]
+        # For the Montana region, get:
+        # 1. Current base reflectivity
+        # 2. Short-term forecast (0-6 hours)
+        # 3. Medium-term forecast (6-12 hours)
+        base_url = "https://radar.weather.gov/ridge/Overlays/Foregrounds"
+        overlay_url = "https://radar.weather.gov/ridge/Overlays"
+        background_url = "https://radar.weather.gov/ridge/Overlays/Backgrounds"
         
+        # Build image frames
         frames = []
-        for url in urls:
-            response = requests.get(url, timeout=10)
-            if response.status_code == 200:
-                img = Image.open(io.BytesIO(response.content))
+        
+        # Current conditions plus 6 forecast periods (7 total frames)
+        for hour in range(7):
+            try:
+                # Start with the static background
+                background = Image.open(requests.get(f"{background_url}/Topo/Short/KMSX_Topo_Short.jpg", timeout=10).content)
+                background = background.convert('RGB')
                 
-                # Convert to RGB if needed
-                if img.mode != 'RGB':
-                    img = img.convert('RGB')
+                # Add county overlays
+                counties = Image.open(requests.get(f"{overlay_url}/Counties/Short/KMSX_Counties_Short.gif", timeout=10).content)
+                counties = counties.convert('RGBA')
+                background.paste(counties, (0, 0), counties)
                 
-                # Create font for text
-                font_size = 20
-                try:
-                    font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", font_size)
-                except:
-                    font = ImageFont.load_default()
+                # Add highways
+                highways = Image.open(requests.get(f"{overlay_url}/Highways/Short/KMSX_Highways_Short.gif", timeout=10).content)
+                highways = highways.convert('RGBA')
+                background.paste(highways, (0, 0), highways)
+                
+                # Add current radar or forecast overlay
+                if hour == 0:
+                    # Current radar
+                    radar = Image.open(requests.get(f"{base_url}/Base/KMSX_Base_0.gif", timeout=10).content)
+                else:
+                    # Forecast radar (using NDFD data)
+                    forecast_time = datetime.now() + timedelta(hours=hour)
+                    forecast_str = forecast_time.strftime("%Y%m%d_%H")
+                    radar = Image.open(requests.get(f"https://forecast.weather.gov/wrf_images/KMSX/Reflectivity/Reflectivity_{forecast_str}.gif", timeout=10).content)
                 
-                # Add informational text
-                draw = ImageDraw.Draw(img)
-                timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                radar = radar.convert('RGBA')
+                background.paste(radar, (0, 0), radar)
                 
-                if "KMSX" in url:
-                    text = "Current Radar - Missoula (KMSX)"
-                elif "NATIONAL" in url:
-                    text = "National Radar Loop"
+                # Add timestamp
+                draw = ImageDraw.Draw(background)
+                if hour == 0:
+                    time_text = "Current Conditions"
                 else:
-                    text = "Short Term Forecast"
-                    
-                timestamp_text = f"Last Updated: {timestamp}"
+                    forecast_time = datetime.now() + timedelta(hours=hour)
+                    time_text = f"Forecast +{hour}h ({forecast_time.strftime('%I%p')})"
+                
+                try:
+                    font = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 20)
+                except:
+                    font = ImageFont.load_default()
                 
-                # Draw text with black 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+dx, y+dy+25), timestamp_text, fill='black', font=font)
-                draw.text((x, y), text, fill='white', font=font)
-                draw.text((x, y+25), timestamp_text, fill='white', font=font)
+                    draw.text((x+dx, y+dy), time_text, fill='black', font=font)
+                draw.text((x, y), time_text, fill='white', font=font)
                 
-                frames.append(img)
+                frames.append(background)
                 
+            except Exception as e:
+                print(f"Error processing frame {hour}: {str(e)}")
+                continue
+        
         if not frames:
-            raise Exception("No radar or forecast images could be downloaded")
+            raise Exception("No frames could be generated")
             
-        # Create animated display
+        # Save as animated GIF
         with tempfile.NamedTemporaryFile(suffix='.gif', delete=False) as tmp_file:
             frames[0].save(
                 tmp_file.name,
                 save_all=True,
                 append_images=frames[1:],
-                duration=3000,  # 3 seconds per frame
+                duration=1500,  # 1.5 seconds per frame
                 loop=0
             )
             return tmp_file.name
                 
     except Exception as e:
-        print(f"Error creating radar display: {str(e)}")
+        print(f"Error creating forecast display: {str(e)}")
         # Create error message image
         img = Image.new('RGB', (800, 600), color='black')
         draw = ImageDraw.Draw(img)