From 67b04d023c68df68cedcc4edf0b954bcf45d52cf Mon Sep 17 00:00:00 2001
From: a1denvalu3 <43107113+a1denvalu3@users.noreply.github.com>
Date: Fri, 24 Jul 2026 13:48:08 +0200
Subject: [PATCH] Fix automated relay map generation (#12)

---
 .github/workflows/relay-maps.yml |  6 ++-
 scripts/generate_relay_map.py    | 78 ++++++++++++--------------------
 2 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/.github/workflows/relay-maps.yml b/.github/workflows/relay-maps.yml
index c499364..401f60c 100644
--- a/.github/workflows/relay-maps.yml
+++ b/.github/workflows/relay-maps.yml
@@ -31,11 +31,13 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install matplotlib pandas numpy folium scipy
+        # Matplotlib 3.11 raises a LinearRing error with Cartopy 0.25.0.
+        # Keep this at the last version known to render all three maps.
+        pip install matplotlib==3.10.9 pandas numpy folium scipy
         # Install cartopy and its dependencies
         sudo apt-get update
         sudo apt-get install -y libproj-dev proj-bin proj-data libgeos-dev
-        pip install cartopy
+        pip install cartopy==0.25.0
     
     - name: Generate relay maps
       run: |
diff --git a/scripts/generate_relay_map.py b/scripts/generate_relay_map.py
index c80d13b..1b84dd6 100755
--- a/scripts/generate_relay_map.py
+++ b/scripts/generate_relay_map.py
@@ -198,55 +198,35 @@ def main():
     
     # Ensure the assets directory exists
     os.makedirs('assets', exist_ok=True)
-    
-    try:
-        # Read the relay data
-        df = pd.read_csv('nostr_relays.csv')
-        
-        # Filter out rows with missing or invalid coordinates
-        df = df.dropna(subset=['Latitude', 'Longitude'])
-        
-        # Filter out invalid coordinates
-        df = df[(df['Latitude'] >= -90) & (df['Latitude'] <= 90) & 
-                (df['Longitude'] >= -180) & (df['Longitude'] <= 180)]
-        
-        # Generate maps
-        # 1. Interactive HTML map
-        relay_count_interactive = create_interactive_map(
-            df,
-            'assets/relay_locations_interactive.html'
-        )
-        
-        # 2. Static PNG map
-        try:
-            relay_count_static = create_static_map(
-                df,
-                'assets/relay_locations_static.png'
-            )
-        except Exception as e:
-            print(f"Error creating static map: {e}")
-            relay_count_static = 0
-        
-        # 3. Heatmap
-        try:
-            from scipy.ndimage import gaussian_filter
-            relay_count_heatmap = create_heatmap(
-                df,
-                'assets/relay_locations_heatmap.png'
-            )
-        except ImportError:
-            print("Could not create heatmap: scipy not installed")
-            relay_count_heatmap = 0
-            
-        # Print summary
-        print(f"Generated interactive map with {relay_count_interactive} relays")
-        if relay_count_static > 0:
-            print(f"Generated static map with {relay_count_static} relays")
-        if relay_count_heatmap > 0:
-            print(f"Generated heatmap with {relay_count_heatmap} relays")
-            
-    except Exception as e:
-        print(f"Error generating relay maps: {e}")
+
+    # Read the relay data
+    df = pd.read_csv('nostr_relays.csv')
+
+    # Filter out rows with missing or invalid coordinates
+    df = df.dropna(subset=['Latitude', 'Longitude'])
+
+    # Filter out invalid coordinates
+    df = df[(df['Latitude'] >= -90) & (df['Latitude'] <= 90) &
+            (df['Longitude'] >= -180) & (df['Longitude'] <= 180)]
+
+    # Generate maps. Any failure must propagate so CI cannot commit a partial
+    # update while reporting a successful workflow.
+    relay_count_interactive = create_interactive_map(
+        df,
+        'assets/relay_locations_interactive.html'
+    )
+    relay_count_static = create_static_map(
+        df,
+        'assets/relay_locations_static.png'
+    )
+    relay_count_heatmap = create_heatmap(
+        df,
+        'assets/relay_locations_heatmap.png'
+    )
+
+    print(f"Generated interactive map with {relay_count_interactive} relays")
+    print(f"Generated static map with {relay_count_static} relays")
+    print(f"Generated heatmap with {relay_count_heatmap} relays")
 
 if __name__ == "__main__":
     main()