Skip to content

Fix: Include routes without RouteInstances when no filter is applied on maps #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fix: Include routes without RouteInstances when no filter is applied on maps #124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f24f4b4
Initial plan
Copilot Sep 30, 2025
5af2194
Fix RoutesOdataController to include routes without RouteInstances wh…
Copilot Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 38 additions & 14 deletions OV_DB/Controllers/RoutesOdataController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,26 @@ public async Task<ActionResult<MapDataDTO>> GetGeoJsonAsync(string id, ODataQuer
return Forbid();
}
}
var routes = _context.RouteInstances
.Include(ri => ri.Route)
.ThenInclude(r => r.RouteType)
.AsQueryable();

var types = await _context.RouteTypes.ToListAsync(cancellationToken: cancellationToken);
var colours = new Dictionary<int, LineStyle>();
types.ForEach(t =>
{
colours.Add(t.TypeId, new LineStyle { Color = Color32.Parse(t.Colour) });
});
NetTopologySuite.Geometries.Geometry? limitingArea = null;

var collection = new FeatureCollection();
var routesList = new List<Route>();
var routesToReturn = new Dictionary<int, int>();

if (q.Filter != null)
{
// Apply filters - use existing RouteInstance-based logic for backward compatibility
var routes = _context.RouteInstances
.Include(ri => ri.Route)
.ThenInclude(r => r.RouteType)
.AsQueryable();

var model = Startup.GetEdmModel();
IEdmType type = model.FindDeclaredType("OVDB_database.Models.RouteInstance");
IEdmNavigationSource source = model.FindDeclaredEntitySet("Products");
Expand All @@ -93,19 +99,37 @@ public async Task<ActionResult<MapDataDTO>> GetGeoJsonAsync(string id, ODataQuer
{
limitingArea = await ExtractAreaFromQueryAsync(q, cancellationToken);
}

routes = routes.Where(r => r.RouteInstanceMaps.Any(rim => rim.MapId == map.MapId) || r.Route.RouteMaps.Any(rm => rm.MapId == map.MapId));

await routes.ForEachAsync(r =>
{
if (routesToReturn.TryAdd(r.RouteId, 0))
{
routesList.Add(r.Route);
}
routesToReturn[r.RouteId] += 1;
}, cancellationToken: cancellationToken);
}
routes = routes.Where(r => r.RouteInstanceMaps.Any(rim => rim.MapId == map.MapId) || r.Route.RouteMaps.Any(rm => rm.MapId == map.MapId));
var collection = new FeatureCollection();
var routesList = new List<Route>();
var routesToReturn = new Dictionary<int, int>();
await routes.ForEachAsync(r =>
else
{
if (routesToReturn.TryAdd(r.RouteId, 0))
// No filter applied - include all routes (even those without RouteInstances)
var allRoutes = await _context.Routes
.Include(r => r.RouteType)
.Include(r => r.RouteInstances)
.Where(r => r.RouteMaps.Any(rm => rm.MapId == map.MapId))
.ToListAsync(cancellationToken: cancellationToken);

foreach (var route in allRoutes)
{
routesList.Add(r.Route);
routesList.Add(route);
// Count instances associated with this map
var instanceCount = route.RouteInstances.Count(ri =>
ri.RouteInstanceMaps.Any(rim => rim.MapId == map.MapId) ||
route.RouteMaps.Any(rm => rm.MapId == map.MapId));
routesToReturn[route.RouteId] = instanceCount;
}
routesToReturn[r.RouteId] += 1;
}, cancellationToken: cancellationToken);
}

var total = routesList.Count;
var processed = 0;
Expand Down