diff --git a/lib/core/app_controller.dart b/lib/core/app_controller.dart index 9a811c16..f25ddc1f 100644 --- a/lib/core/app_controller.dart +++ b/lib/core/app_controller.dart @@ -2628,6 +2628,53 @@ class AppController extends ChangeNotifier { return results; } + /// Finds every route that serves a stop name regardless of which city + /// manages the route. Cities whose local database is ready are searched + /// locally; the rest (and the whole lookup on web) go through the API, so a + /// route from a neighbouring city is listed even when that city's data was + /// never downloaded. The [current] provider is searched first and its errors + /// propagate; failures for other cities are skipped. + Future> searchRoutesByStopAcrossAllProviders( + String query, { + required BusProvider current, + }) async { + if (kIsWeb) return searchRoutesByStopFromApi(query); + final results = [ + ...await repository.searchRoutesByStopName(query, provider: current), + ]; + final remoteProviders = []; + for (final provider in BusProvider.values) { + if (provider == current) continue; + if (!provider.supportsLocalDatabase) { + // Intercity has no local database; it is only reachable via the API. + remoteProviders.add(provider); + continue; + } + try { + await ensureProviderDatabaseState(provider); + if (!isDatabaseReady(provider)) { + remoteProviders.add(provider); + continue; + } + results.addAll( + await repository.searchRoutesByStopName(query, provider: provider), + ); + } catch (error) { + debugPrint('Stop route lookup skipped for ${provider.name}: $error'); + } + } + if (remoteProviders.isNotEmpty) { + try { + results.addAll( + await searchRoutesByStopFromApi(query, providers: remoteProviders), + ); + } catch (error) { + debugPrint('Stop route API lookup error: $error'); + } + } + return results; + } + Future> searchRoutesByStopFromApi( String query, { Iterable? providers, diff --git a/lib/screens/route_detail_screen.dart b/lib/screens/route_detail_screen.dart index f2600b8a..a7096481 100644 --- a/lib/screens/route_detail_screen.dart +++ b/lib/screens/route_detail_screen.dart @@ -4620,7 +4620,13 @@ class _RouteDetailScreenState extends State } String _normalizeStopRouteLookupName(String value) { - return value.trim().toLowerCase().replaceAll(RegExp(r'\s+'), ''); + // Same 臺→台 folding as the repository's stop search, otherwise a sibling + // result spelled 台北車站 is dropped for a stop named 臺北車站. + return value + .trim() + .toLowerCase() + .replaceAll('臺', '台') + .replaceAll(RegExp(r'\s+'), ''); } // Keys ([stopRouteMergeKey]) of the entries in the related-stop-routes sheet @@ -4678,9 +4684,9 @@ class _RouteDetailScreenState extends State Object? localError; StackTrace? localStackTrace; try { - final results = await controller.searchRoutesByStop( + final results = await controller.searchRoutesByStopAcrossAllProviders( stop.stopName, - provider: widget.provider, + current: widget.provider, ); local = results .where(