From cde15534041499a0baf4153476805ee7f2db7f0d Mon Sep 17 00:00:00 2001 From: Ariel Costas Guerrero Date: Thu, 5 Mar 2026 01:38:13 +0100 Subject: Support for Ourense!! Squashed commit of the following: commit 6c70396fe66ff8bc64655dd8e8c393001d2df8c3 Author: Ariel Costas Guerrero Date: Thu Mar 5 01:35:52 2026 +0100 feat: enhance stop sorting logic for bus and coach in map component commit 380396c78a0b9dc8b0435a479236031e0910b57e Author: Ariel Costas Guerrero Date: Thu Mar 5 01:30:46 2026 +0100 Update sprite and map colours commit cc3662922d8cf7d8d87c52444bc582c8332160c1 Author: Ariel Costas Guerrero Date: Thu Mar 5 01:02:22 2026 +0100 update ourense colour codes and refactor route fetching logic commit a2d8e8b0ecc57989dc79214947ed805d98ebddaa Author: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Date: Wed Mar 4 23:42:49 2026 +0000 feat: add ourense urban bus feed (schedule-only, no real-time) Co-authored-by: arielcostas <94913521+arielcostas@users.noreply.github.com> commit 639a9cf75a71dabc07d1cdf2b39edfd264ccc220 Author: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Date: Wed Mar 4 23:35:44 2026 +0000 Initial plan --- src/frontend/app/routes/map.tsx | 22 +++++++---- src/frontend/app/routes/routes.tsx | 76 ++++++++++++++++++++++++-------------- 2 files changed, 63 insertions(+), 35 deletions(-) (limited to 'src/frontend/app/routes') diff --git a/src/frontend/app/routes/map.tsx b/src/frontend/app/routes/map.tsx index af94509..f54f6cf 100644 --- a/src/frontend/app/routes/map.tsx +++ b/src/frontend/app/routes/map.tsx @@ -320,9 +320,9 @@ export default function StopMap() { ["get", "transitKind"], "bus", 3, - "coach", - 2, "train", + 2, + "coach", 1, 0, ], @@ -342,15 +342,15 @@ export default function StopMap() { "text-offset": [0, 3], "text-anchor": "center", "text-justify": "center", - "text-size": ["interpolate", ["linear"], ["zoom"], 11, 8, 22, 16], + "text-size": ["interpolate", ["linear"], ["zoom"], 11, 10, 22, 17], "symbol-sort-key": [ "match", ["get", "transitKind"], - "coach", + "bus", 3, "train", 2, - "bus", + "coach", 1, 0, ], @@ -366,6 +366,8 @@ export default function StopMap() { "#508096", "tranvias", "#E61C29", + "ourense", + "#ffb319", "xunta", "#007BC4", "renfe", @@ -374,8 +376,14 @@ export default function StopMap() { "#EE3D32", "#27187D", ], - "text-halo-color": "#FFF", - "text-halo-width": 1, + "text-halo-color": [ + "match", + ["get", "feed"], + "ourense", + "#000000", + "#FFF", + ], + "text-halo-width": ["match", ["get", "feed"], "ourense", 1.5, 1], }} /> diff --git a/src/frontend/app/routes/routes.tsx b/src/frontend/app/routes/routes.tsx index 6d50186..1e85cfb 100644 --- a/src/frontend/app/routes/routes.tsx +++ b/src/frontend/app/routes/routes.tsx @@ -12,9 +12,18 @@ export default function RoutesPage() { usePageTitle(t("navbar.routes", "Rutas")); const [searchQuery, setSearchQuery] = useState(""); + const orderedAgencies = [ + "vitrasa", + "tranvias", + "tussa", + "ourense", + "feve", + "shuttle", + ]; + const { data: routes, isLoading } = useQuery({ queryKey: ["routes"], - queryFn: () => fetchRoutes(["vitrasa", "tranvias", "tussa", "feve", "shuttle"]), + queryFn: () => fetchRoutes(orderedAgencies), }); const filteredRoutes = routes?.filter( @@ -53,34 +62,45 @@ export default function RoutesPage() {
{routesByAgency && - Object.entries(routesByAgency).map(([agency, agencyRoutes]) => ( -
-

- {agency} -

-
- {agencyRoutes.map((route) => ( - - -
-

- {route.longName} -

-
- - ))} + Object.entries(routesByAgency) + .sort(([a], [b]) => { + const indexA = orderedAgencies.indexOf(a.toLowerCase()); + const indexB = orderedAgencies.indexOf(b.toLowerCase()); + if (indexA === -1 && indexB === -1) { + return a.localeCompare(b); + } + if (indexA === -1) return 1; + if (indexB === -1) return -1; + return indexA - indexB; + }) + .map(([agency, agencyRoutes]) => ( +
+

+ {agency} +

+
+ {agencyRoutes.map((route) => ( + + +
+

+ {route.longName} +

+
+ + ))} +
-
- ))} + ))}
); -- cgit v1.3