Refactor map components and improve modal functionality

2 files changed, 15 insertions, 11 deletions

diff --git a/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs b/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs
index 61a003e..6b90f20 100644
--- a/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs
+++ b/src/Costasdev.Busurbano.Backend/Controllers/ArrivalsController.cs
@@ -1,6 +1,7 @@
 using System.Net;
 using Costasdev.Busurbano.Backend.GraphClient;
 using Costasdev.Busurbano.Backend.GraphClient.App;
+using Costasdev.Busurbano.Backend.Helpers;
 using Costasdev.Busurbano.Backend.Services;
 using Costasdev.Busurbano.Backend.Types;
 using Costasdev.Busurbano.Backend.Types.Arrivals;
@@ -140,13 +141,19 @@ public partial class ArrivalsController : ControllerBase
                 Latitude = stop.Lat,
                 Longitude = stop.Lon
             },
-            Routes = stop.Routes.Select(r => new RouteInfo
-            {
-                GtfsId =  r.GtfsId,
-                ShortName = _feedService.NormalizeRouteShortName(feedId, r.ShortName ?? ""),
-                Colour = r.Color ?? "FFFFFF",
-                TextColour = r.TextColor ?? "000000"
-            }).ToList(),
+            Routes = stop.Routes
+                .OrderBy(
+                    r => r.ShortName,
+                    Comparer<string?>.Create(SortingHelper.SortRouteShortNames)
+                )
+                .Select(r => new RouteInfo
+                {
+                    GtfsId = r.GtfsId,
+                    ShortName = _feedService.NormalizeRouteShortName(feedId, r.ShortName ?? ""),
+                    Colour = r.Color ?? "FFFFFF",
+                    TextColour = r.TextColor ?? "000000"
+                })
+                .ToList(),
             Arrivals = arrivals
         });
     }
diff --git a/src/Costasdev.Busurbano.Backend/Services/Processors/VitrasaRealTimeProcessor.cs b/src/Costasdev.Busurbano.Backend/Services/Processors/VitrasaRealTimeProcessor.cs
index a16425f..7a1d6ea 100644
--- a/src/Costasdev.Busurbano.Backend/Services/Processors/VitrasaRealTimeProcessor.cs
+++ b/src/Costasdev.Busurbano.Backend/Services/Processors/VitrasaRealTimeProcessor.cs
@@ -120,10 +120,7 @@ public class VitrasaRealTimeProcessor : AbstractRealTimeProcessor
 
                     // Calculate delay badge
                     var delayMinutes = estimate.Minutes - scheduledMinutes;
-                    if (delayMinutes != 0)
-                    {
-                        arrival.Delay = new DelayBadge { Minutes = delayMinutes };
-                    }
+                    arrival.Delay = new DelayBadge { Minutes = delayMinutes };
 
                     // Prefer real-time headsign if available and different
                     if (!string.IsNullOrWhiteSpace(estimate.Route))