Update services/map_service.py

services/map_service.py

@@ -1,41 +1,42 @@
 import matplotlib.pyplot as plt
 import numpy as np
+from typing import List, Dict, Any, Optional
 
-def generate_map(gps_coordinates, items):
-    if not gps_coordinates or not items:
-        return None
-
-    # Extract latitude and longitude
-    lats = [coord[0] for coord in gps_coordinates]
-    lons = [coord[1] for coord in gps_coordinates]
-
-    # Create a simple plot
-    fig, ax = plt.subplots(figsize=(6, 4))
-    ax.scatter(lons, lats, c='blue', label='Path', alpha=0.5)
-
-    # Plot cracks and holes
-    for coord, item in zip(gps_coordinates[-len(items):], items):
-        if item['type'] == 'crack':
-            color = 'red' if item['severity'] == 'Severe' else 'orange' if item['severity'] == 'Moderate' else 'green' if item['severity'] == 'Minor' else 'purple'
-            marker = 'x'
-            label = f"Crack: {item['severity']}"
-        else:  # Hole
-            color = 'darkred' if item['severity'] == 'Severe' else 'yellow' if item['severity'] == 'Moderate' else 'darkgreen'
-            marker = 'o'
-            label = f"Hole: {item['severity']}"
-        ax.scatter(coord[1], coord[0], c=color, marker=marker, s=100, label=label)
-
-    ax.set_xlabel("Longitude")
-    ax.set_ylabel("Latitude")
-    ax.set_title("Crack/Hole Locations Map")
-    ax.grid(True)
-
-    # Remove duplicate labels in legend
-    handles, labels = ax.get_legend_handles_labels()
-    by_label = dict(zip(labels, handles))
-    ax.legend(by_label.values(), by_label.keys())
-
-    map_path = "map_temp.png"
-    plt.savefig(map_path)
-    plt.close(fig)
-    return map_path
+def generate_map(gps_coordinates: List[List[float]], map_items: List[Dict[str, Any]]) -> Optional[str]:
+    """
+    Generate a map showing issue locations based on GPS coordinates.
+    Args:
+        gps_coordinates: List of [latitude, longitude] coordinates.
+        map_items: List of detected items (cracks, holes, missing patches) to plot.
+    Returns:
+        Path to the generated map image, or None if generation fails.
+    """
+    try:
+        fig, ax = plt.subplots(figsize=(5, 3))
+        
+        if gps_coordinates:
+            lats, longs = zip(*gps_coordinates)
+            ax.plot(longs, lats, 'b-', label='Path')
+        
+        for item in map_items:
+            gps = item.get('gps', [0, 0])
+            lat, lon = gps
+            # Use a default severity if the key is missing
+            severity = item.get('severity', 'Moderate')  # Default to 'Moderate'
+            color = 'darkred' if severity == 'Severe' else 'yellow' if severity == 'Moderate' else 'darkgreen'
+            marker = 'x' if item.get('type') == 'crack' else 'o' if item.get('type') == 'hole' else '^'
+            ax.scatter(lon, lat, c=color, marker=marker, label=item.get('type', 'Issue'), s=100)
+        
+        ax.set_xlabel('Longitude')
+        ax.set_ylabel('Latitude')
+        ax.set_title('Issue Locations')
+        ax.legend()
+        ax.grid(True)
+        
+        map_path = "map_temp.png"
+        fig.savefig(map_path, bbox_inches='tight')
+        plt.close(fig)
+        return map_path
+    except Exception as e:
+        print(f"Error generating map: {str(e)}")
+        return None