From 3ce586243a49f34b36d0fe4099bbfb2631610f11 Mon Sep 17 00:00:00 2001 From: Ariel Costas Guerrero Date: Mon, 16 Mar 2026 13:01:36 +0100 Subject: New marquee generation logic for Xunta --- src/Enmarcha.Backend/Controllers/ArrivalsController.cs | 6 +++--- src/Enmarcha.Backend/Controllers/RoutePlannerController.cs | 2 +- src/Enmarcha.Backend/Controllers/TileController.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Enmarcha.Backend/Controllers') diff --git a/src/Enmarcha.Backend/Controllers/ArrivalsController.cs b/src/Enmarcha.Backend/Controllers/ArrivalsController.cs index 03286c4..861038f 100644 --- a/src/Enmarcha.Backend/Controllers/ArrivalsController.cs +++ b/src/Enmarcha.Backend/Controllers/ArrivalsController.cs @@ -65,7 +65,7 @@ public partial class ArrivalsController : ControllerBase return Ok(new StopArrivalsResponse { StopCode = _feedService.NormalizeStopCode(feedId, stop.Code), - StopName = _feedService.NormalizeStopName(feedId, stop.Name), + StopName = FeedService.NormalizeStopName(feedId, stop.Name), StopLocation = new Position { Latitude = stop.Lat, Longitude = stop.Lon }, Routes = [.. _feedService.ConsolidateRoutes(feedId, stop.Routes @@ -166,7 +166,7 @@ public partial class ArrivalsController : ControllerBase List arrivals = []; foreach (var item in stop.Arrivals) { - if (item.PickupTypeParsed.Equals(ArrivalsAtStopResponse.PickupType.None)) continue; + //if (item.PickupTypeParsed.Equals(ArrivalsAtStopResponse.PickupType.None)) continue; if ( item.Trip.ArrivalStoptime.Stop.GtfsId == id && item.Trip.DepartureStoptime.Stop.GtfsId != id @@ -305,7 +305,7 @@ public partial class ArrivalsController : ControllerBase var feedId = s.GtfsId.Split(':', 2)[0]; var (fallbackColor, _) = _feedService.GetFallbackColourForFeed(feedId); var code = _feedService.NormalizeStopCode(feedId, s.Code ?? ""); - var name = _feedService.NormalizeStopName(feedId, s.Name); + var name = FeedService.NormalizeStopName(feedId, s.Name); return (dynamic)new { diff --git a/src/Enmarcha.Backend/Controllers/RoutePlannerController.cs b/src/Enmarcha.Backend/Controllers/RoutePlannerController.cs index 3ffb02f..489f264 100644 --- a/src/Enmarcha.Backend/Controllers/RoutePlannerController.cs +++ b/src/Enmarcha.Backend/Controllers/RoutePlannerController.cs @@ -163,7 +163,7 @@ public partial class RoutePlannerController : ControllerBase var stops = allStopsRaw.Select(s => { var feedId = s.GtfsId.Split(':')[0]; - var name = _feedService.NormalizeStopName(feedId, s.Name); + var name = FeedService.NormalizeStopName(feedId, s.Name); var code = _feedService.NormalizeStopCode(feedId, s.Code ?? string.Empty); return new PlannerSearchResult diff --git a/src/Enmarcha.Backend/Controllers/TileController.cs b/src/Enmarcha.Backend/Controllers/TileController.cs index 300f9db..bf89a08 100644 --- a/src/Enmarcha.Backend/Controllers/TileController.cs +++ b/src/Enmarcha.Backend/Controllers/TileController.cs @@ -125,7 +125,7 @@ public class TileController : ControllerBase { "feed", idParts[0] }, // The public identifier, usually feed:code or feed:id, recognisable by users and in other systems { "code", $"{idParts[0]}:{codeWithinFeed}" }, - { "name", _feedService.NormalizeStopName(feedId, stop.Name) }, + { "name", FeedService.NormalizeStopName(feedId, stop.Name) }, { "icon", GetIconNameForFeed(feedId) }, { "transitKind", GetTransitKind(feedId) } } -- cgit v1.3