Add support for file uploads using new async upload jobs, add admin section for uploading distance files

lib/components/calculator/calculator.dart

@@ -3,6 +3,7 @@ import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
+import 'package:mileograph_flutter/components/widgets/multi_select_filter.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import './route_summary_widget.dart';
 
@@ -358,7 +359,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
             runSpacing: 12,
             crossAxisAlignment: WrapCrossAlignment.center,
             children: [
-              _MultiSelectFilter(
+              MultiSelectFilter(
                 label: 'Countries',
                 options: _countries,
                 selected: _selectedCountries,
@@ -367,7 +368,7 @@ class _RouteCalculatorState extends State<RouteCalculator> {
                   _loadStations();
                 },
               ),
-              _MultiSelectFilter(
+              MultiSelectFilter(
                 label: 'Networks',
                 options: _networks,
                 selected: _selectedNetworks,
@@ -375,6 +376,16 @@ class _RouteCalculatorState extends State<RouteCalculator> {
                   setState(() => _selectedNetworks = vals);
                   _loadStations();
                 },
+                onRefresh: () async {
+                  final data = context.read<DataService>();
+                  await data.fetchStationFilters();
+                  if (!mounted) return;
+                  setState(() {
+                    _networks = data.stationNetworks;
+                    _countries = data.stationCountryNetworks.keys.toList();
+                  });
+                  await _loadStations();
+                },
               ),
               if (_loadingStations)
                 const Padding(
@@ -573,159 +584,3 @@ Widget debugPanel(List<String> stations) {
     ),
   );
 }
-
-class _MultiSelectFilter extends StatefulWidget {
-  const _MultiSelectFilter({
-    required this.label,
-    required this.options,
-    required this.selected,
-    required this.onChanged,
-  });
-
-  final String label;
-  final List<String> options;
-  final List<String> selected;
-  final ValueChanged<List<String>> onChanged;
-
-  @override
-  State<_MultiSelectFilter> createState() => _MultiSelectFilterState();
-}
-
-class _MultiSelectFilterState extends State<_MultiSelectFilter> {
-  late List<String> _tempSelected;
-  String _query = '';
-
-  @override
-  void initState() {
-    super.initState();
-    _tempSelected = List.from(widget.selected);
-  }
-
-  @override
-  void didUpdateWidget(covariant _MultiSelectFilter oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.selected != widget.selected) {
-      _tempSelected = List.from(widget.selected);
-    }
-  }
-
-  void _openPicker() async {
-    _tempSelected = List.from(widget.selected);
-    _query = '';
-    await showModalBottomSheet<void>(
-      context: context,
-      isScrollControlled: true,
-      builder: (ctx) {
-        return StatefulBuilder(
-          builder: (ctx, setModalState) {
-            final filtered = widget.options
-                .where((opt) =>
-                    _query.isEmpty || opt.toLowerCase().contains(_query.toLowerCase()))
-                .toList();
-            return SafeArea(
-              child: Padding(
-                padding: const EdgeInsets.all(16.0),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Row(
-                      children: [
-                        Text(
-                          'Select ${widget.label.toLowerCase()}',
-                          style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                fontWeight: FontWeight.w700,
-                              ),
-                        ),
-                        const Spacer(),
-                        TextButton(
-                          onPressed: () {
-                            setModalState(() {
-                              _tempSelected.clear();
-                            });
-                            Navigator.of(ctx).pop();
-                            widget.onChanged(const []);
-                          },
-                          child: const Text('Clear'),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 8),
-                    TextField(
-                      decoration: const InputDecoration(
-                        labelText: 'Search',
-                        border: OutlineInputBorder(),
-                      ),
-                      onChanged: (val) {
-                        setModalState(() {
-                          _query = val;
-                        });
-                      },
-                    ),
-                    const SizedBox(height: 12),
-                    SizedBox(
-                      height: 320,
-                      child: ListView.builder(
-                        itemCount: filtered.length,
-                        itemBuilder: (_, index) {
-                          final option = filtered[index];
-                          final selected = _tempSelected.contains(option);
-                          return CheckboxListTile(
-                            value: selected,
-                            title: Text(option),
-                            onChanged: (val) {
-                              setModalState(() {
-                                if (val == true) {
-                                  if (!_tempSelected.contains(option)) {
-                                    _tempSelected.add(option);
-                                  }
-                                } else {
-                                  _tempSelected.removeWhere((e) => e == option);
-                                }
-                              });
-                              widget.onChanged(List.from(_tempSelected.toSet()));
-                            },
-                          );
-                        },
-                      ),
-                    ),
-                    const SizedBox(height: 12),
-                    Align(
-                      alignment: Alignment.centerRight,
-                      child: FilledButton.icon(
-                        onPressed: () {
-                          widget.onChanged(List.from(_tempSelected.toSet()));
-                          Navigator.of(ctx).pop();
-                        },
-                        icon: const Icon(Icons.check),
-                        label: const Text('Apply'),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            );
-          },
-        );
-      },
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final hasSelection = widget.selected.isNotEmpty;
-    final display =
-        hasSelection ? widget.selected.join(', ') : 'Any ${widget.label.toLowerCase()}';
-    return OutlinedButton.icon(
-      onPressed: _openPicker,
-      icon: const Icon(Icons.filter_alt),
-      label: SizedBox(
-        width: 180,
-        child: Text(
-          '${widget.label}: $display',
-          overflow: TextOverflow.ellipsis,
-        ),
-      ),
-    );
-  }
-}

lib/components/calculator/route_summary_widget.dart

@@ -40,6 +40,7 @@ class RouteDetailsView extends StatelessWidget {
   final List<double> costs;
   final VoidCallback onBack;
   final Set<String> routingPoints;
+  final VoidCallback? onNetworksPressed;
 
   const RouteDetailsView({
     super.key,
@@ -47,6 +48,7 @@ class RouteDetailsView extends StatelessWidget {
     required this.costs,
     required this.onBack,
     this.routingPoints = const {},
+    this.onNetworksPressed,
   });
 
   @override
@@ -56,13 +58,21 @@ class RouteDetailsView extends StatelessWidget {
     final mutedColor = Theme.of(context).colorScheme.outlineVariant;
     return Column(
       children: [
-        Align(
+        Row(
-          alignment: Alignment.centerLeft,
+          children: [
-          child: TextButton.icon(
+            TextButton.icon(
-            onPressed: onBack,
+              onPressed: onBack,
-            icon: const Icon(Icons.arrow_back),
+              icon: const Icon(Icons.arrow_back),
-            label: const Text('Back'),
+              label: const Text('Back'),
-          ),
+            ),
+            const Spacer(),
+            if (onNetworksPressed != null)
+              TextButton.icon(
+                onPressed: onNetworksPressed,
+                icon: const Icon(Icons.account_tree),
+                label: const Text('Networks'),
+              ),
+          ],
         ),
         Expanded(
           child: ListView.builder(

lib/components/legs/leg_card.dart

@@ -32,6 +32,8 @@ class _LegCardState extends State<LegCard> {
     final sharedTo = leg.sharedTo;
     final distanceUnits = context.watch<DistanceUnitService>();
     final routeSegments = _parseRouteSegments(leg.route);
+    final networkMileage = _sortedNetworkMileage(leg);
+    final countryMileage = _sortedCountryMileage(leg);
     final textTheme = Theme.of(context).textTheme;
     return Card(
       clipBehavior: Clip.antiAlias,
@@ -160,10 +162,11 @@ class _LegCardState extends State<LegCard> {
                 ),
               );
             }
-            if (leg.network.isNotEmpty) {
+            final networkSummary = _networkSummary(leg);
+            if (networkSummary != null) {
               children.add(
                 Text(
-                  leg.network,
+                  networkSummary,
                   style: textTheme.labelSmall,
                 ),
               );
@@ -285,6 +288,28 @@ class _LegCardState extends State<LegCard> {
                   ),
                   const SizedBox(height: 12),
                 ],
+                if (networkMileage.isNotEmpty || countryMileage.isNotEmpty) ...[
+                  Text('Network mileage', style: textTheme.titleSmall),
+                  const SizedBox(height: 6),
+                  ...networkMileage.map(
+                    (entry) => Text(
+                      '${entry.network}: ${distanceUnits.format(entry.miles, decimals: 1)}',
+                      style: textTheme.bodyMedium,
+                    ),
+                  ),
+                  if (countryMileage.isNotEmpty) ...[
+                    const SizedBox(height: 8),
+                    Text('Country mileage', style: textTheme.titleSmall),
+                    const SizedBox(height: 6),
+                    ...countryMileage.map(
+                      (entry) => Text(
+                        '${entry.country}: ${distanceUnits.format(entry.miles, decimals: 1)}',
+                        style: textTheme.bodyMedium,
+                      ),
+                    ),
+                  ],
+                  const SizedBox(height: 12),
+                ],
                 if (routeSegments.isNotEmpty) ...[
                   Text('Route', style: textTheme.titleSmall),
                   const SizedBox(height: 6),
@@ -483,6 +508,33 @@ class _LegCardState extends State<LegCard> {
   List<String> _parseRouteSegments(List<String> route) {
     return route.map((e) => e.toString()).where((e) => e.trim().isNotEmpty).toList();
   }
+
+  List<NetworkMileage> _sortedNetworkMileage(Leg leg) {
+    final items = leg.networkMileage
+        .where((entry) => entry.network.trim().isNotEmpty)
+        .toList();
+    items.sort((a, b) => b.miles.compareTo(a.miles));
+    return items;
+  }
+
+  List<CountryMileage> _sortedCountryMileage(Leg leg) {
+    final items = leg.countryMileage
+        .where((entry) => entry.country.trim().isNotEmpty)
+        .toList();
+    items.sort((a, b) => b.miles.compareTo(a.miles));
+    return items;
+  }
+
+  String? _networkSummary(Leg leg) {
+    final networks = _sortedNetworkMileage(leg);
+    if (networks.isNotEmpty) {
+      return networks.map((entry) => entry.network).join(', ');
+    }
+    if (leg.network.trim().isNotEmpty) {
+      return leg.network;
+    }
+    return null;
+  }
 }
 
 class _SharedIcons extends StatelessWidget {

lib/components/login/login.dart

@@ -95,21 +95,7 @@ class _LoginScreenState extends State<LoginScreen> {
                           );
                         },
                       ),
-                      const SizedBox(height: 50),
+                      const SizedBox(height: 40),
-                      const LoginPanel(),
-                      const SizedBox(height: 16),
-                      IconButton(
-                        icon: const Icon(Icons.settings, color: Colors.grey),
-                        tooltip: 'Settings',
-                        onPressed: () {
-                          Navigator.of(context).push(
-                            MaterialPageRoute(
-                              fullscreenDialog: true,
-                              builder: (_) => const SettingsPage(),
-                            ),
-                          );
-                        },
-                      ),
                       if (_checkingSession) ...[
                         const SizedBox(height: 12),
                         Row(
@@ -127,6 +113,22 @@ class _LoginScreenState extends State<LoginScreen> {
                             ),
                           ],
                         ),
+                      ] else ...[
+                        const SizedBox(height: 10),
+                        const LoginPanel(),
+                        const SizedBox(height: 16),
+                        IconButton(
+                          icon: const Icon(Icons.settings, color: Colors.grey),
+                          tooltip: 'Settings',
+                          onPressed: () {
+                            Navigator.of(context).push(
+                              MaterialPageRoute(
+                                fullscreenDialog: true,
+                                builder: (_) => const SettingsPage(),
+                              ),
+                            );
+                          },
+                        ),
                       ],
                     ],
                   ),
@@ -190,7 +192,7 @@ class _LoginLogoState extends State<_LoginLogo> {
   }
 
   String _colorToHex(Color color) {
-    final hex = color.value.toRadixString(16).padLeft(8, '0');
+    final hex = color.toARGB32().toRadixString(16).padLeft(8, '0');
     return '#${hex.substring(2)}';
   }
 }

lib/components/pages/calculator_details.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:mileograph_flutter/components/calculator/route_summary_widget.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
+import 'package:mileograph_flutter/services/distance_unit_service.dart';
+import 'package:provider/provider.dart';
 
 class CalculatorDetailsPage extends StatelessWidget {
   const CalculatorDetailsPage({
@@ -34,13 +36,85 @@ class CalculatorDetailsPage extends StatelessWidget {
       );
     }
 
-    return Padding(
+    final networks = List<NetworkMileage>.from(parsed.networkMileage)
-      padding: const EdgeInsets.all(16.0),
+      ..sort((a, b) => b.miles.compareTo(a.miles));
-      child: RouteDetailsView(
+    final countries = List<CountryMileage>.from(parsed.countryMileage)
-        route: parsed.calculatedRoute,
+      ..sort((a, b) => b.miles.compareTo(a.miles));
-        costs: parsed.costs,
+
-        routingPoints: parsed.inputRoute.toSet(),
+    return Scaffold(
-        onBack: () => context.pop(),
+      endDrawer: _NetworksDrawer(
+        networks: networks,
+        countries: countries,
+      ),
+      body: Builder(
+        builder: (scaffoldContext) => Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: RouteDetailsView(
+            route: parsed.calculatedRoute,
+            costs: parsed.costs,
+            routingPoints: parsed.inputRoute.toSet(),
+            onBack: () => context.pop(),
+            onNetworksPressed: () =>
+                Scaffold.of(scaffoldContext).openEndDrawer(),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _NetworksDrawer extends StatelessWidget {
+  const _NetworksDrawer({
+    required this.networks,
+    required this.countries,
+  });
+
+  final List<NetworkMileage> networks;
+  final List<CountryMileage> countries;
+
+  @override
+  Widget build(BuildContext context) {
+    final distanceUnits = context.watch<DistanceUnitService>();
+    return Drawer(
+      child: SafeArea(
+        child: ListView(
+          padding: const EdgeInsets.all(16),
+          children: [
+            Text(
+              'Networks',
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            if (networks.isEmpty)
+              const Text('No network mileage data.')
+            else
+              ...networks.map(
+                (entry) => ListTile(
+                  contentPadding: EdgeInsets.zero,
+                  title: Text(entry.network),
+                  trailing:
+                      Text(distanceUnits.format(entry.miles, decimals: 2)),
+                ),
+              ),
+            const SizedBox(height: 16),
+            Text(
+              'Countries',
+              style: Theme.of(context).textTheme.titleMedium,
+            ),
+            const SizedBox(height: 8),
+            if (countries.isEmpty)
+              const Text('No country mileage data.')
+            else
+              ...countries.map(
+                (entry) => ListTile(
+                  contentPadding: EdgeInsets.zero,
+                  title: Text(entry.country),
+                  trailing:
+                      Text(distanceUnits.format(entry.miles, decimals: 2)),
+                ),
+              ),
+          ],
+        ),
       ),
     );
   }

lib/components/pages/legs.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:mileograph_flutter/components/legs/leg_card.dart';
+import 'package:mileograph_flutter/components/widgets/multi_select_filter.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/data_service.dart';
 import 'package:mileograph_flutter/services/distance_unit_service.dart';
@@ -19,6 +20,9 @@ class _LegsPageState extends State<LegsPage> {
   bool _initialised = false;
   bool _unallocatedOnly = false;
   bool _showMoreFilters = false;
+  bool _loadingNetworks = false;
+  List<String> _availableNetworks = [];
+  List<String> _selectedNetworks = [];
 
   @override
   void didChangeDependencies() {
@@ -26,9 +30,21 @@ class _LegsPageState extends State<LegsPage> {
     if (!_initialised) {
       _initialised = true;
       _refreshLegs();
+      _loadNetworks();
     }
   }
 
+  Future<void> _loadNetworks() async {
+    setState(() => _loadingNetworks = true);
+    final data = context.read<DataService>();
+    await data.fetchStationNetworks();
+    if (!mounted) return;
+    setState(() {
+      _availableNetworks = data.stationNetworks;
+      _loadingNetworks = false;
+    });
+  }
+
   Future<void> _refreshLegs() async {
     final data = context.read<DataService>();
     await data.fetchLegs(
@@ -36,6 +52,7 @@ class _LegsPageState extends State<LegsPage> {
       dateRangeStart: _formatDate(_startDate),
       dateRangeEnd: _formatDate(_endDate),
       unallocatedOnly: _unallocatedOnly,
+      networkFilter: _selectedNetworks,
     );
   }
 
@@ -48,6 +65,7 @@ class _LegsPageState extends State<LegsPage> {
       offset: data.legs.length,
       append: true,
       unallocatedOnly: _unallocatedOnly,
+      networkFilter: _selectedNetworks,
     );
   }
 
@@ -90,6 +108,7 @@ class _LegsPageState extends State<LegsPage> {
       _sortDirection = 0;
       _unallocatedOnly = false;
       _showMoreFilters = false;
+      _selectedNetworks = [];
     });
     _refreshLegs();
   }
@@ -209,6 +228,16 @@ class _LegsPageState extends State<LegsPage> {
                         spacing: 12,
                         runSpacing: 12,
                         children: [
+                          MultiSelectFilter(
+                            label: 'Networks',
+                            options: _availableNetworks,
+                            selected: _selectedNetworks,
+                            onChanged: (vals) async {
+                              setState(() => _selectedNetworks = vals);
+                              await _refreshLegs();
+                            },
+                            onRefresh: _loadingNetworks ? null : _loadNetworks,
+                          ),
                           FilterChip(
                             avatar: const Icon(Icons.flash_off),
                             label: const Text('Unallocated only'),
@@ -218,6 +247,15 @@ class _LegsPageState extends State<LegsPage> {
                               await _refreshLegs();
                             },
                           ),
+                          if (_loadingNetworks)
+                            const Padding(
+                              padding: EdgeInsets.only(left: 8.0),
+                              child: SizedBox(
+                                height: 20,
+                                width: 20,
+                                child: CircularProgressIndicator(strokeWidth: 2),
+                              ),
+                            ),
                         ],
                       ),
                     ),

lib/components/pages/loco_timeline/timeline_grid.dart

@@ -813,17 +813,17 @@ List<DateTime> _buildBoundaries(
   for (final seg in segments) {
     boundaryDates.add(seg.start);
     boundaryDates.add(seg.end);
-    minStart = minStart == null || seg.start.isBefore(minStart!)
+    minStart = minStart == null || seg.start.isBefore(minStart)
         ? seg.start
         : minStart;
-    maxEnd = maxEnd == null || seg.end.isAfter(maxEnd!) ? seg.end : maxEnd;
+    maxEnd = maxEnd == null || seg.end.isAfter(maxEnd) ? seg.end : maxEnd;
   }
-  minStart ??= now.subtract(const Duration(days: 1));
+  final effectiveMinStart = minStart ?? now.subtract(const Duration(days: 1));
   final effectiveMaxEnd = maxEnd ?? now;
   boundaryDates.add(effectiveMaxEnd);
   var boundaries = boundaryDates.toList()..sort();
   if (boundaries.length < 2) {
-    boundaries = [minStart!, effectiveMaxEnd];
+    boundaries = [effectiveMinStart, effectiveMaxEnd];
   }
   return boundaries;
 }

lib/components/pages/more/admin_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:file_selector/file_selector.dart';
 import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
@@ -28,6 +29,16 @@ class _AdminPageState extends State<AdminPage> {
 
   bool _sending = false;
 
+  List<XFile> _routeFiles = [];
+  bool _routeUploading = false;
+  String? _routeStatus;
+  String? _routeStatusMessage;
+  String? _routeErrorMessage;
+  int? _routeProcessed;
+  int? _routeTotal;
+  double? _routeProgress;
+  Map<String, dynamic>? _routeResult;
+
   @override
   void initState() {
     super.initState();
@@ -340,6 +351,191 @@ class _AdminPageState extends State<AdminPage> {
     }
   }
 
+  int? _parseCount(dynamic value) {
+    if (value is num) return value.toInt();
+    return int.tryParse(value?.toString() ?? '');
+  }
+
+  double? _parsePercent(
+    dynamic value, {
+    required int? processed,
+    required int? total,
+  }) {
+    if (value is num) {
+      final raw = value.toDouble();
+      final normalized = raw > 1 ? raw / 100 : raw;
+      return normalized.clamp(0, 1);
+    }
+    if (processed != null && total != null && total > 0) {
+      return (processed / total).clamp(0, 1);
+    }
+    return null;
+  }
+
+  Duration _pollDelay(int attempt) {
+    const delays = [
+      Duration(seconds: 1),
+      Duration(seconds: 2),
+      Duration(seconds: 2),
+      Duration(seconds: 5),
+      Duration(seconds: 5),
+      Duration(seconds: 8),
+      Duration(seconds: 10),
+    ];
+    if (attempt < delays.length) return delays[attempt];
+    return const Duration(seconds: 10);
+  }
+
+  String _routeStatusLabel() {
+    final status = _routeStatus ?? '';
+    final lower = status.toLowerCase();
+    final base = switch (lower) {
+      'queued' => 'Queued',
+      'running' => 'Processing',
+      'succeeded' => 'Completed',
+      'failed' => 'Failed',
+      _ => status,
+    };
+    final parts = <String>[base];
+    if (_routeProcessed != null && _routeTotal != null) {
+      parts.add('Files $_routeProcessed of $_routeTotal');
+    }
+    if (_routeProgress != null) {
+      parts.add('${(_routeProgress! * 100).toStringAsFixed(0)}%');
+    }
+    return parts.join(' · ');
+  }
+
+  Future<void> _pickRouteFiles() async {
+    final files = await openFiles(
+      acceptedTypeGroups: const [
+        XTypeGroup(
+          label: 'XLSX spreadsheets',
+          extensions: ['xlsx'],
+        ),
+      ],
+    );
+    if (files.isEmpty) return;
+    setState(() {
+      _routeFiles = files;
+      _routeStatus = null;
+      _routeStatusMessage = null;
+      _routeErrorMessage = null;
+      _routeProcessed = null;
+      _routeTotal = null;
+      _routeProgress = null;
+      _routeResult = null;
+    });
+  }
+
+  Future<void> _uploadRouteFiles() async {
+    if (_routeFiles.isEmpty || _routeUploading) return;
+    setState(() {
+      _routeUploading = true;
+      _routeStatus = null;
+      _routeStatusMessage = null;
+      _routeErrorMessage = null;
+      _routeProcessed = null;
+      _routeTotal = null;
+      _routeProgress = null;
+      _routeResult = null;
+    });
+    try {
+      final api = context.read<ApiService>();
+      final payloads = <MultipartFilePayload>[];
+      for (final file in _routeFiles) {
+        final bytes = await file.readAsBytes();
+        payloads.add(
+          MultipartFilePayload(
+            bytes: bytes,
+            filename: file.name,
+          ),
+        );
+      }
+      final response = await api.postMultipartFiles(
+        '/route/update',
+        files: payloads,
+        headers: const {'accept': 'application/json'},
+      );
+      if (!mounted) return;
+      final parsed = response is Map
+          ? Map<String, dynamic>.from(response)
+          : null;
+      final jobId = parsed?['job_id']?.toString();
+      if (jobId == null || jobId.isEmpty) {
+        setState(() {
+          _routeErrorMessage = 'Upload failed to start.';
+        });
+        return;
+      }
+      setState(() {
+        _routeStatus = parsed?['status']?.toString() ?? 'queued';
+      });
+      var attempt = 0;
+      while (mounted) {
+        final statusResponse = await api.get('/uploads/$jobId');
+        if (!mounted) return;
+        final statusMap = statusResponse is Map
+            ? Map<String, dynamic>.from(statusResponse)
+            : null;
+        if (statusMap == null) {
+          setState(() {
+            _routeErrorMessage = 'Upload status unavailable.';
+          });
+          return;
+        }
+        final status = statusMap['status']?.toString() ?? 'queued';
+        final processed = _parseCount(statusMap['processed']);
+        final total = _parseCount(statusMap['total']);
+        final percent = _parsePercent(
+          statusMap['percent'],
+          processed: processed,
+          total: total,
+        );
+        setState(() {
+          _routeStatus = status;
+          _routeProcessed = processed;
+          _routeTotal = total;
+          _routeProgress = percent;
+        });
+        if (status == 'succeeded') {
+          final result = statusMap['result'];
+          setState(() {
+            if (result is Map) {
+              _routeResult = Map<String, dynamic>.from(result);
+            }
+            final message = _routeResult?['message']?.toString();
+            _routeStatusMessage = message != null && message.isNotEmpty
+                ? message
+                : 'Route update complete.';
+          });
+          return;
+        }
+        if (status == 'failed') {
+          setState(() {
+            _routeErrorMessage =
+                statusMap['error']?.toString() ?? 'Route update failed.';
+          });
+          return;
+        }
+        await Future.delayed(_pollDelay(attempt));
+        attempt += 1;
+      }
+    } on ApiException catch (e) {
+      if (!mounted) return;
+      setState(() {
+        _routeErrorMessage = e.message;
+      });
+    } catch (e) {
+      if (!mounted) return;
+      setState(() {
+        _routeErrorMessage = e.toString();
+      });
+    } finally {
+      if (mounted) setState(() => _routeUploading = false);
+    }
+  }
+
   void _showSnack(String message) {
     ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(message)));
   }
@@ -443,6 +639,87 @@ class _AdminPageState extends State<AdminPage> {
               label: Text(_sending ? 'Sending...' : 'Send notification'),
             ),
           ),
+          const SizedBox(height: 32),
+          const Divider(height: 32),
+          Text(
+            'Route update uploads',
+            style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                  fontWeight: FontWeight.w700,
+                ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            'Upload one or more XLSX sheets to update route distances.',
+            style: Theme.of(context).textTheme.bodyMedium,
+          ),
+          const SizedBox(height: 12),
+          Row(
+            children: [
+              Expanded(
+                child: Text(
+                  _routeFiles.isEmpty
+                      ? 'No files selected'
+                      : '${_routeFiles.length} file(s) selected',
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ),
+              const SizedBox(width: 8),
+              OutlinedButton.icon(
+                onPressed: _routeUploading ? null : _pickRouteFiles,
+                icon: const Icon(Icons.upload_file),
+                label: const Text('Choose files'),
+              ),
+            ],
+          ),
+          const SizedBox(height: 12),
+          FilledButton.icon(
+            onPressed:
+                _routeFiles.isEmpty || _routeUploading ? null : _uploadRouteFiles,
+            icon: _routeUploading
+                ? const SizedBox(
+                    width: 18,
+                    height: 18,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                : const Icon(Icons.file_upload),
+            label: Text(_routeUploading ? 'Uploading...' : 'Upload files'),
+          ),
+          if (_routeStatus != null) ...[
+            const SizedBox(height: 12),
+            Text(
+              _routeStatusLabel(),
+              style: Theme.of(context).textTheme.bodyMedium,
+            ),
+            if (_routeProgress != null) ...[
+              const SizedBox(height: 6),
+              LinearProgressIndicator(value: _routeProgress),
+            ],
+          ],
+          if (_routeStatusMessage != null) ...[
+            const SizedBox(height: 12),
+            Text(
+              _routeStatusMessage!,
+              style: Theme.of(context).textTheme.bodyMedium,
+            ),
+          ],
+          if (_routeErrorMessage != null) ...[
+            const SizedBox(height: 12),
+            Text(
+              _routeErrorMessage!,
+              style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                    color: Theme.of(context).colorScheme.error,
+                  ),
+            ),
+          ],
+          if ((_routeStatus == 'failed' || _routeErrorMessage != null) &&
+              _routeFiles.isNotEmpty) ...[
+            const SizedBox(height: 8),
+            OutlinedButton.icon(
+              onPressed: _routeUploading ? null : _uploadRouteFiles,
+              icon: const Icon(Icons.refresh),
+              label: const Text('Retry upload'),
+            ),
+          ],
         ],
       ),
     );

lib/components/pages/new_entry/new_entry_page.dart

@@ -1399,16 +1399,18 @@ class _NewEntryPageState extends State<NewEntryPage> {
                   singleColumn: true,
                 ),
               ),
-              const Divider(height: 24),
+              if (_useManualMileage) ...[
-              TextFormField(
+                const Divider(height: 24),
-                controller: _networkController,
+                TextFormField(
-                textCapitalization: TextCapitalization.characters,
+                  controller: _networkController,
-                inputFormatters: const [_UpperCaseTextFormatter()],
+                  textCapitalization: TextCapitalization.characters,
-                decoration: const InputDecoration(
+                  inputFormatters: const [_UpperCaseTextFormatter()],
-                  labelText: 'Network',
+                  decoration: const InputDecoration(
-                  border: OutlineInputBorder(),
+                    labelText: 'Network',
+                    border: OutlineInputBorder(),
+                  ),
                 ),
-              ),
+              ],
               TextFormField(
                 controller: _notesController,
                 maxLines: 3,
@@ -1520,6 +1522,9 @@ class _NewEntryPageState extends State<NewEntryPage> {
                 onSelected: (val) {
                   setState(() {
                     _useManualMileage = val;
+                    if (!val) {
+                      _networkController.clear();
+                    }
                     if (val && _routeResult != null) {
                       _mileageController.text = _formatDistance(
                         distanceUnitService,

lib/components/pages/new_entry/new_entry_submit_logic.dart

@@ -18,7 +18,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
       }
     }
 
-    if (_networkController.text.trim().isEmpty) {
+    if (_useManualMileage && _networkController.text.trim().isEmpty) {
       missing.add('Network');
     }
 
@@ -93,7 +93,7 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
     final isEditingExisting = _isEditing && widget.editLegId != null;
 
     try {
-      final commonPayload = {
+    final commonPayload = {
         if (isEditingExisting) "leg_id": widget.editLegId,
         "leg_trip": _selectedTripId,
         "leg_begin_time": _legDateTime.toIso8601String(),
@@ -104,7 +104,8 @@ extension _NewEntrySubmitLogic on _NewEntryPageState {
           "leg_destination_time": destinationTime.toIso8601String(),
         "leg_notes": _notesController.text.trim(),
         "leg_headcode": _headcodeController.text.trim(),
-        "leg_network": _networkController.text.trim(),
+        if (_useManualMileage)
+          "leg_network": _networkController.text.trim(),
         "leg_origin": _originController.text.trim(),
         "leg_destination": _destinationController.text.trim(),
         "leg_begin_delay": beginDelay,

lib/components/pages/stats.dart

@@ -170,6 +170,21 @@ class _StatsPageState extends State<StatsPage> {
                   ),
                 ),
               ),
+            if (year.topCountries.isNotEmpty)
+              _buildSection<StatsCountryMileage>(
+                context,
+                title: 'Top countries',
+                items: year.topCountries,
+                emptyLabel: 'No country data',
+                itemBuilder: (item, index) => ListTile(
+                  dense: true,
+                  contentPadding: const EdgeInsets.symmetric(horizontal: 8),
+                  title: Text(item.country),
+                  trailing: Text(
+                    distanceUnits.format(item.mileage, decimals: 1),
+                  ),
+                ),
+              ),
             _buildSection<StatsStationVisits>(
               context,
               title: 'Top stations',

lib/components/pages/traction/traction_page.dart

@@ -1,6 +1,7 @@
 part of 'traction.dart';
 
 enum _TractionMoreAction {
+  exportResults,
   classStats,
   classLeaderboard,
   adminPending,
@@ -68,14 +69,14 @@ class _TractionPageState extends State<TractionPage> {
   _ClassLeaderboardScope _classLeaderboardScope = _ClassLeaderboardScope.global;
 
   final Map<String, TextEditingController> _dynamicControllers = {};
-  final Map<String, String?> _enumSelections = {};
+  final Map<String, dynamic> _enumSelections = {};
   bool _restoredFromPrefs = false;
   static const int _pageSize = 100;
   int _lastTractionOffset = 0;
   String? _lastQuerySignature;
   String? _transferFromLabel;
   bool _isSearching = false;
-  bool _classExporting = false;
+  bool _exporting = false;
 
   @override
   void initState() {
@@ -169,12 +170,7 @@ class _TractionPageState extends State<TractionPage> {
     ].join(';');
   }
 
-  Future<void> _refreshTraction({
+  Map<String, dynamic> _buildTractionFilters() {
-    bool append = false,
-    bool preservePosition = true,
-  }) async {
-    _setState(() => _isSearching = true);
-    final data = context.read<DataService>();
     final filters = <String, dynamic>{};
     final name = _nameController.text.trim();
     if (name.isNotEmpty) filters['name'] = name;
@@ -187,6 +183,16 @@ class _TractionPageState extends State<TractionPage> {
         filters[key] = value;
       }
     });
+    return filters;
+  }
+
+  Future<void> _refreshTraction({
+    bool append = false,
+    bool preservePosition = true,
+  }) async {
+    _setState(() => _isSearching = true);
+    final data = context.read<DataService>();
+    final filters = _buildTractionFilters();
     final hadOnly = !_hasFilters;
     final signature = _tractionQuerySignature(filters, hadOnly);
     final queryChanged =
@@ -673,23 +679,6 @@ class _TractionPageState extends State<TractionPage> {
     );
 
     final hasClassActions = _hasClassQuery;
-    final classLabel = _currentClassLabel;
-
-    final exportClassButton = !hasClassActions
-        ? null
-        : FilledButton.tonalIcon(
-            onPressed: _classExporting ? null : _exportSelectedClass,
-            icon: _classExporting
-                ? const SizedBox(
-                    height: 16,
-                    width: 16,
-                    child: CircularProgressIndicator(strokeWidth: 2),
-                  )
-                : const Icon(Icons.download),
-            label: Text(
-              _classExporting ? 'Exporting...' : 'Export $classLabel',
-            ),
-          );
 
     final newTractionButton = FilledButton.icon(
       onPressed: () async {
@@ -710,14 +699,14 @@ class _TractionPageState extends State<TractionPage> {
     );
 
     final hasAdminActions = isElevated;
-    final hasMoreMenu = hasClassActions || hasAdminActions;
 
-    final moreButton = !hasMoreMenu
+    final moreButton = PopupMenuButton<_TractionMoreAction>(
-        ? null
-        : PopupMenuButton<_TractionMoreAction>(
             tooltip: 'More options',
             onSelected: (action) async {
               switch (action) {
+                case _TractionMoreAction.exportResults:
+                  await _exportTractionResults();
+                  break;
                 case _TractionMoreAction.classStats:
                   _toggleClassStatsPanel();
                   break;
@@ -759,6 +748,25 @@ class _TractionPageState extends State<TractionPage> {
             },
             itemBuilder: (context) {
               final items = <PopupMenuEntry<_TractionMoreAction>>[];
+              items.add(
+                PopupMenuItem(
+                  value: _TractionMoreAction.exportResults,
+                  child: Row(
+                    children: [
+                      if (_exporting)
+                        const SizedBox(
+                          height: 16,
+                          width: 16,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      else
+                        const Icon(Icons.download, size: 18),
+                      const SizedBox(width: 8),
+                      Text(_exporting ? 'Exporting...' : 'Export'),
+                    ],
+                  ),
+                ),
+              );
               if (hasClassActions) {
                 items.add(
                   PopupMenuItem(
@@ -847,14 +855,12 @@ class _TractionPageState extends State<TractionPage> {
 
     final desktopActions = [
       refreshButton,
-      if (exportClassButton != null) exportClassButton,
       newTractionButton,
-      if (moreButton != null) moreButton,
+      moreButton,
     ];
 
     final mobileActions = [
-      if (moreButton != null) moreButton,
+      moreButton,
-      if (exportClassButton != null) exportClassButton,
       newTractionButton,
       refreshButton,
     ];
@@ -882,23 +888,36 @@ class _TractionPageState extends State<TractionPage> {
     );
   }
 
-  Future<void> _exportSelectedClass() async {
+  Future<void> _exportTractionResults() async {
-    if (_classExporting) return;
+    if (_exporting) return;
-    final classLabel = _currentClassLabel;
+    setState(() => _exporting = true);
-    if (classLabel.isEmpty) return;
-    setState(() => _classExporting = true);
     final messenger = ScaffoldMessenger.of(context);
     try {
       final data = context.read<DataService>();
-      final encodedClass = Uri.encodeComponent(classLabel);
+      final filters = _buildTractionFilters();
-      final response = await data.api.getBytes(
+      final hadOnly = !_hasFilters;
-        '/loco/class/export/$encodedClass',
+      final limit = data.traction.length;
+      final params = StringBuffer('?limit=$limit&offset=0');
+      if (hadOnly) params.write('&had_only=true');
+      if (!_mileageFirst) params.write('&mileage_first=false');
+
+      final payload = <String, dynamic>{};
+      final classLabel = (_selectedClass ?? _classController.text).trim();
+      if (classLabel.isNotEmpty) payload['class'] = classLabel;
+      final numberLabel = _numberController.text.trim();
+      if (numberLabel.isNotEmpty) payload['number'] = numberLabel;
+      filters.forEach((key, value) {
+        if (value == null) return;
+        if (value is String && value.trim().isEmpty) return;
+        payload[key] = value;
+      });
+
+      final response = await data.api.postBytes(
+        '/locos/search/v2/export${params.toString()}',
+        payload.isEmpty ? null : payload,
         headers: const {'accept': '*/*'},
       );
-      final safeClassName =
+      final filename = response.filename ?? 'traction-export.xlsx';
-          classLabel.replaceAll(RegExp(r'[^a-zA-Z0-9-_]+'), '_');
-      final fallbackName = 'traction-${safeClassName.isEmpty ? 'class' : safeClassName}.xlsx';
-      final filename = response.filename ?? fallbackName;
       final saveResult = await saveBytes(
         Uint8List.fromList(response.bytes),
         filename,
@@ -932,7 +951,7 @@ class _TractionPageState extends State<TractionPage> {
         SnackBar(content: Text('Export failed: $e')),
       );
     } finally {
-      if (mounted) setState(() => _classExporting = false);
+      if (mounted) setState(() => _exporting = false);
     }
   }
 
@@ -950,6 +969,10 @@ class _TractionPageState extends State<TractionPage> {
     Map<String, dynamic>? importResult;
     String? statusMessage;
     String? errorMessage;
+    String? jobStatus;
+    int? processed;
+    int? total;
+    double? progressValue;
 
     await showModalBottomSheet<void>(
       context: context,
@@ -958,6 +981,65 @@ class _TractionPageState extends State<TractionPage> {
         final theme = Theme.of(sheetContext);
         return StatefulBuilder(
           builder: (context, setModalState) {
+            int? parseCount(dynamic value) {
+              if (value is num) return value.toInt();
+              return int.tryParse(value?.toString() ?? '');
+            }
+
+            double? parsePercent(
+              dynamic value, {
+              required int? processed,
+              required int? total,
+            }) {
+              if (value is num) {
+                final raw = value.toDouble();
+                final normalized = raw > 1 ? raw / 100 : raw;
+                return normalized.clamp(0, 1);
+              }
+              if (processed != null && total != null && total > 0) {
+                return (processed / total).clamp(0, 1);
+              }
+              return null;
+            }
+
+            Duration pollDelay(int attempt) {
+              const delays = [
+                Duration(seconds: 1),
+                Duration(seconds: 2),
+                Duration(seconds: 2),
+                Duration(seconds: 5),
+                Duration(seconds: 5),
+                Duration(seconds: 8),
+                Duration(seconds: 10),
+              ];
+              if (attempt < delays.length) return delays[attempt];
+              return const Duration(seconds: 10);
+            }
+
+            String statusLabel(
+              String status, {
+              required int? processed,
+              required int? total,
+              required double? percent,
+            }) {
+              final lower = status.toLowerCase();
+              final base = switch (lower) {
+                'queued' => 'Queued',
+                'running' => 'Processing',
+                'succeeded' => 'Completed',
+                'failed' => 'Failed',
+                _ => status,
+              };
+              final parts = <String>[base];
+              if (processed != null && total != null) {
+                parts.add('Rows $processed of $total');
+              }
+              if (percent != null) {
+                parts.add('${(percent * 100).toStringAsFixed(0)}%');
+              }
+              return parts.join(' · ');
+            }
+
             Future<void> pickFile() async {
               final file = await openFile(
                 acceptedTypeGroups: const [
@@ -973,6 +1055,10 @@ class _TractionPageState extends State<TractionPage> {
                 importResult = null;
                 statusMessage = null;
                 errorMessage = null;
+                jobStatus = null;
+                processed = null;
+                total = null;
+                progressValue = null;
               });
             }
 
@@ -984,6 +1070,10 @@ class _TractionPageState extends State<TractionPage> {
                 importResult = null;
                 statusMessage = null;
                 errorMessage = null;
+                jobStatus = null;
+                processed = null;
+                total = null;
+                progressValue = null;
               });
               try {
                 final data = context.read<DataService>();
@@ -994,33 +1084,98 @@ class _TractionPageState extends State<TractionPage> {
                   filename: file.name,
                   headers: const {'accept': 'application/json'},
                 );
-                if (!mounted) return;
+                if (!context.mounted) return;
                 final parsed = response is Map
                     ? Map<String, dynamic>.from(response)
                     : null;
-                if (parsed != null) {
+                final jobId = parsed?['job_id']?.toString();
-                  final imported = _importCount(parsed['imported']);
+                if (jobId == null || jobId.isEmpty) {
-                  final updated = _importCount(parsed['updated']);
+                  setModalState(() {
-                  final errors = _importErrors(parsed);
+                    errorMessage = 'Upload failed to start.';
-                  final errorNote =
+                  });
-                      errors.isNotEmpty ? ' (${errors.length} error(s))' : '';
+                  return;
-                  statusMessage =
+                }
-                      'Import complete. Imported $imported, updated $updated$errorNote.';
+                setModalState(() {
-                  importResult = parsed;
+                  jobStatus = parsed?['status']?.toString() ?? 'queued';
-                } else {
+                });
-                  statusMessage = 'Import complete.';
+                var attempt = 0;
+                while (context.mounted) {
+                  final statusResponse =
+                      await data.api.get('/uploads/$jobId');
+                  if (!context.mounted) return;
+                  final statusMap = statusResponse is Map
+                      ? Map<String, dynamic>.from(statusResponse)
+                      : null;
+                  if (statusMap == null) {
+                    setModalState(() {
+                      errorMessage = 'Upload status unavailable.';
+                    });
+                    return;
+                  }
+                  final status = statusMap['status']?.toString() ?? 'queued';
+                  final processedCount = parseCount(statusMap['processed']);
+                  final totalCount = parseCount(statusMap['total']);
+                  final percent = parsePercent(
+                    statusMap['percent'],
+                    processed: processedCount,
+                    total: totalCount,
+                  );
+                  setModalState(() {
+                    jobStatus = status;
+                    processed = processedCount;
+                    total = totalCount;
+                    progressValue = percent;
+                  });
+                  if (status == 'succeeded') {
+                    final result = statusMap['result'];
+                    Map<String, dynamic>? parsedResult;
+                    if (result is Map) {
+                      parsedResult = Map<String, dynamic>.from(result);
+                    }
+                    setModalState(() {
+                      importResult = parsedResult;
+                      if (importResult != null) {
+                        final imported =
+                            _importCount(importResult!['imported']);
+                        final updated = _importCount(importResult!['updated']);
+                        final errors = _importErrors(importResult!);
+                        final errorNote = errors.isNotEmpty
+                            ? ' (${errors.length} error(s))'
+                            : '';
+                        statusMessage =
+                            'Import complete. Imported $imported, updated $updated$errorNote.';
+                      } else {
+                        statusMessage = 'Import complete.';
+                      }
+                    });
+                    await data.fetchClassList();
+                    await _refreshTraction(preservePosition: true);
+                    return;
+                  }
+                  if (status == 'failed') {
+                    setModalState(() {
+                      errorMessage =
+                          statusMap['error']?.toString() ?? 'Import failed.';
+                    });
+                    return;
+                  }
+                  await Future.delayed(pollDelay(attempt));
+                  attempt += 1;
                 }
-                await data.fetchClassList();
-                await _refreshTraction(preservePosition: true);
               } on ApiException catch (e) {
-                if (!mounted) return;
+                if (!context.mounted) return;
-                errorMessage = e.message;
+                setModalState(() {
+                  errorMessage = e.message;
+                });
               } catch (e) {
-                if (!mounted) return;
+                if (!context.mounted) return;
-                errorMessage = e.toString();
+                setModalState(() {
+                  errorMessage = e.toString();
+                });
               } finally {
-                if (!mounted) return;
+                if (context.mounted) {
-                setModalState(() => uploading = false);
+                  setModalState(() => uploading = false);
+                }
               }
             }
 
@@ -1078,6 +1233,22 @@ class _TractionPageState extends State<TractionPage> {
                           uploading ? 'Importing...' : 'Upload and import',
                         ),
                       ),
+                      if (jobStatus != null) ...[
+                        const SizedBox(height: 12),
+                        Text(
+                          statusLabel(
+                            jobStatus!,
+                            processed: processed,
+                            total: total,
+                            percent: progressValue,
+                          ),
+                          style: theme.textTheme.bodyMedium,
+                        ),
+                        if (progressValue != null) ...[
+                          const SizedBox(height: 6),
+                          LinearProgressIndicator(value: progressValue),
+                        ],
+                      ],
                       if (statusMessage != null) ...[
                         const SizedBox(height: 12),
                         Text(
@@ -1094,6 +1265,15 @@ class _TractionPageState extends State<TractionPage> {
                           ),
                         ),
                       ],
+                      if ((jobStatus == 'failed' || errorMessage != null) &&
+                          selectedFile != null) ...[
+                        const SizedBox(height: 8),
+                        OutlinedButton.icon(
+                          onPressed: uploading ? null : uploadFile,
+                          icon: const Icon(Icons.refresh),
+                          label: const Text('Retry upload'),
+                        ),
+                      ],
                       if (importResult != null)
                         _buildImportSummary(context, importResult!),
                     ],
@@ -1847,13 +2027,44 @@ class _TractionPageState extends State<TractionPage> {
     bool isMobile,
   ) {
     final width = isMobile ? double.infinity : 220.0;
+    final type = field.type?.toLowerCase() ?? '';
+    final isBooleanField =
+        type == 'bool' || type == 'boolean' || type.contains('bool');
+    if (isBooleanField) {
+      final currentValue = _enumSelections[field.name];
+      final safeValue = currentValue is bool ? currentValue : null;
+      return SizedBox(
+        width: width,
+        child: DropdownButtonFormField<bool?>(
+          value: safeValue,
+          decoration: InputDecoration(
+            labelText: field.display,
+            border: const OutlineInputBorder(),
+          ),
+          items: const [
+            DropdownMenuItem(value: null, child: Text('Any')),
+            DropdownMenuItem(value: true, child: Text('Yes')),
+            DropdownMenuItem(value: false, child: Text('No')),
+          ],
+          onChanged: (val) {
+            setState(() {
+              _enumSelections[field.name] = val;
+            });
+            _refreshTraction();
+          },
+        ),
+      );
+    }
     if (field.enumValues != null && field.enumValues!.isNotEmpty) {
       final options = field.enumValues!
           .map((e) => e.toString())
           .toSet()
           .toList();
       final currentValue = _enumSelections[field.name];
-      final safeValue = options.contains(currentValue) ? currentValue : null;
+      final safeValue =
+          currentValue is String && options.contains(currentValue)
+              ? currentValue
+              : null;
       return SizedBox(
         width: width,
         child: DropdownButtonFormField<String?>(
@@ -1883,7 +2094,6 @@ class _TractionPageState extends State<TractionPage> {
     _dynamicControllers[field.name] = controller;
     TextInputType? inputType;
     if (field.type != null) {
-      final type = field.type!.toLowerCase();
       if (type.contains('int') ||
           type.contains('num') ||
           type.contains('double')) {

lib/components/widgets/multi_select_filter.dart

@@ -0,0 +1,166 @@
+import 'package:flutter/material.dart';
+
+class MultiSelectFilter extends StatefulWidget {
+  const MultiSelectFilter({
+    super.key,
+    required this.label,
+    required this.options,
+    required this.selected,
+    required this.onChanged,
+    this.onRefresh,
+  });
+
+  final String label;
+  final List<String> options;
+  final List<String> selected;
+  final ValueChanged<List<String>> onChanged;
+  final VoidCallback? onRefresh;
+
+  @override
+  State<MultiSelectFilter> createState() => _MultiSelectFilterState();
+}
+
+class _MultiSelectFilterState extends State<MultiSelectFilter> {
+  late List<String> _tempSelected;
+  String _query = '';
+
+  @override
+  void initState() {
+    super.initState();
+    _tempSelected = List.from(widget.selected);
+  }
+
+  @override
+  void didUpdateWidget(covariant MultiSelectFilter oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.selected != widget.selected) {
+      _tempSelected = List.from(widget.selected);
+    }
+  }
+
+  void _openPicker() async {
+    _tempSelected = List.from(widget.selected);
+    _query = '';
+    await showModalBottomSheet<void>(
+      context: context,
+      isScrollControlled: true,
+      builder: (ctx) {
+        return StatefulBuilder(
+          builder: (ctx, setModalState) {
+            final filtered = widget.options
+                .where((opt) =>
+                    _query.isEmpty || opt.toLowerCase().contains(_query.toLowerCase()))
+                .toList();
+            return SafeArea(
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      children: [
+                        Text(
+                          'Select ${widget.label.toLowerCase()}',
+                          style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                                fontWeight: FontWeight.w700,
+                              ),
+                        ),
+                        const Spacer(),
+                        if (widget.onRefresh != null)
+                          IconButton(
+                            tooltip: 'Refresh',
+                            onPressed: widget.onRefresh,
+                            icon: const Icon(Icons.refresh),
+                          ),
+                        TextButton(
+                          onPressed: () {
+                            setModalState(() {
+                              _tempSelected.clear();
+                            });
+                            Navigator.of(ctx).pop();
+                            widget.onChanged(const []);
+                          },
+                          child: const Text('Clear'),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 8),
+                    TextField(
+                      decoration: const InputDecoration(
+                        labelText: 'Search',
+                        border: OutlineInputBorder(),
+                      ),
+                      onChanged: (val) {
+                        setModalState(() {
+                          _query = val;
+                        });
+                      },
+                    ),
+                    const SizedBox(height: 12),
+                    SizedBox(
+                      height: 320,
+                      child: ListView.builder(
+                        itemCount: filtered.length,
+                        itemBuilder: (_, index) {
+                          final option = filtered[index];
+                          final selected = _tempSelected.contains(option);
+                          return CheckboxListTile(
+                            value: selected,
+                            title: Text(option),
+                            onChanged: (val) {
+                              setModalState(() {
+                                if (val == true) {
+                                  if (!_tempSelected.contains(option)) {
+                                    _tempSelected.add(option);
+                                  }
+                                } else {
+                                  _tempSelected.removeWhere((e) => e == option);
+                                }
+                              });
+                              widget.onChanged(List.from(_tempSelected.toSet()));
+                            },
+                          );
+                        },
+                      ),
+                    ),
+                    const SizedBox(height: 12),
+                    Align(
+                      alignment: Alignment.centerRight,
+                      child: FilledButton.icon(
+                        onPressed: () {
+                          widget.onChanged(List.from(_tempSelected.toSet()));
+                          Navigator.of(ctx).pop();
+                        },
+                        icon: const Icon(Icons.check),
+                        label: const Text('Apply'),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final hasSelection = widget.selected.isNotEmpty;
+    final display =
+        hasSelection ? widget.selected.join(', ') : 'Any ${widget.label.toLowerCase()}';
+    return OutlinedButton.icon(
+      onPressed: _openPicker,
+      icon: const Icon(Icons.filter_alt),
+      label: SizedBox(
+        width: 180,
+        child: Text(
+          '${widget.label}: $display',
+          overflow: TextOverflow.ellipsis,
+        ),
+      ),
+    );
+  }
+}

lib/objects/objects.dart

@@ -517,6 +517,7 @@ class StatsAbout {
     final mileageByYear = <int, double>{};
     final classByYear = <int, List<StatsClassMileage>>{};
     final networkByYear = <int, List<StatsNetworkMileage>>{};
+    final countryByYear = <int, List<StatsCountryMileage>>{};
     final stationByYear = <int, List<StatsStationVisits>>{};
     final winnersByYear = <int, int>{};
     final winnerTypeCountsByYear = <int, Map<String, int>>{};
@@ -577,6 +578,17 @@ class StatsAbout {
       return const [];
     }
 
+    List<StatsCountryMileage> parseCountryList(dynamic value) {
+      if (value is List) {
+        return value
+            .whereType<Map>()
+            .map((e) => StatsCountryMileage.fromJson(
+                e.map((key, value) => MapEntry(key.toString(), value))))
+            .toList();
+      }
+      return const [];
+    }
+
     void parseYearMap<T>(
       dynamic source,
       Map<int, T> target,
@@ -611,6 +623,11 @@ class StatsAbout {
       networkByYear,
       parseNetworkList,
     );
+    parseYearMap<List<StatsCountryMileage>>(
+      json['top_countries'],
+      countryByYear,
+      parseCountryList,
+    );
     parseYearMap<List<StatsStationVisits>>(
       json['top_stations'],
       stationByYear,
@@ -643,6 +660,7 @@ class StatsAbout {
       ...mileageByYear.keys,
       ...classByYear.keys,
       ...networkByYear.keys,
+      ...countryByYear.keys,
       ...stationByYear.keys,
       ...winnersByYear.keys,
       ...winnerTypeCountsByYear.keys,
@@ -656,6 +674,7 @@ class StatsAbout {
         mileage: mileageByYear[year] ?? 0,
         topClasses: classByYear[year] ?? const [],
         topNetworks: networkByYear[year] ?? const [],
+        topCountries: countryByYear[year] ?? const [],
         topStations: stationByYear[year] ?? const [],
         winnerCount: winnersByYear[year] ?? 0,
         winnerTypeCounts: winnerTypeCountsByYear[year] ?? const {},
@@ -678,6 +697,7 @@ class StatsYear {
   final double mileage;
   final List<StatsClassMileage> topClasses;
   final List<StatsNetworkMileage> topNetworks;
+  final List<StatsCountryMileage> topCountries;
   final List<StatsStationVisits> topStations;
   final int winnerCount;
   final Map<String, int> winnerTypeCounts;
@@ -688,6 +708,7 @@ class StatsYear {
     required this.mileage,
     required this.topClasses,
     required this.topNetworks,
+    required this.topCountries,
     required this.topStations,
     required this.winnerCount,
     required this.winnerTypeCounts,
@@ -727,6 +748,22 @@ class StatsNetworkMileage {
       );
 }
 
+class StatsCountryMileage {
+  final String country;
+  final double mileage;
+
+  StatsCountryMileage({
+    required this.country,
+    required this.mileage,
+  });
+
+  factory StatsCountryMileage.fromJson(Map<String, dynamic> json) =>
+      StatsCountryMileage(
+        country: _asString(json['country'], 'Unknown'),
+        mileage: _asDouble(json['mileage']),
+      );
+}
+
 class StatsStationVisits {
   final String station;
   final int visits;
@@ -1205,6 +1242,8 @@ class Leg {
   final String start, end, network, notes, headcode, user;
   final String origin, destination;
   final List<String> route;
+  final List<NetworkMileage> networkMileage;
+  final List<CountryMileage> countryMileage;
   final String? legShareId;
   final LegShareMeta? sharedFrom;
   final List<LegShareMeta> sharedTo;
@@ -1231,6 +1270,8 @@ class Leg {
     required this.driving,
     required this.user,
     required this.locos,
+    this.networkMileage = const [],
+    this.countryMileage = const [],
     this.endTime,
     this.originTime,
     this.destinationTime,
@@ -1300,6 +1341,14 @@ class Leg {
           : _asInt(json['leg_end_delay']),
       origin: _asString(json['leg_origin']),
       destination: _asString(json['leg_destination']),
+      networkMileage: (json['network_mileage'] as List? ?? const [])
+          .whereType<Map>()
+          .map((e) => NetworkMileage.fromJson(Map<String, dynamic>.from(e)))
+          .toList(),
+      countryMileage: (json['country_mileage'] as List? ?? const [])
+          .whereType<Map>()
+          .map((e) => CountryMileage.fromJson(Map<String, dynamic>.from(e)))
+          .toList(),
       legShareId: _asString(json['leg_share_id']),
       sharedFrom: sharedFrom,
       sharedTo: sharedTo,
@@ -1470,12 +1519,16 @@ class RouteResult {
   final List<String> calculatedRoute;
   final List<double> costs;
   final double distance;
+  final List<NetworkMileage> networkMileage;
+  final List<CountryMileage> countryMileage;
 
   RouteResult({
     required this.inputRoute,
     required this.calculatedRoute,
     required this.costs,
     required this.distance,
+    this.networkMileage = const [],
+    this.countryMileage = const [],
   });
 
   factory RouteResult.fromJson(Map<String, dynamic> json) {
@@ -1484,10 +1537,50 @@ class RouteResult {
       calculatedRoute: List<String>.from(json['calculated_route']),
       costs: (json['costs'] as List).map((e) => (e as num).toDouble()).toList(),
       distance: (json['distance'] as num).toDouble(),
+      networkMileage: (json['network_mileage'] as List? ?? const [])
+          .whereType<Map>()
+          .map((e) => NetworkMileage.fromJson(Map<String, dynamic>.from(e)))
+          .toList(),
+      countryMileage: (json['country_mileage'] as List? ?? const [])
+          .whereType<Map>()
+          .map((e) => CountryMileage.fromJson(Map<String, dynamic>.from(e)))
+          .toList(),
     );
   }
 }
 
+class NetworkMileage {
+  final String network;
+  final double miles;
+
+  NetworkMileage({
+    required this.network,
+    required this.miles,
+  });
+
+  factory NetworkMileage.fromJson(Map<String, dynamic> json) =>
+      NetworkMileage(
+        network: _asString(json['network']),
+        miles: _asDouble(json['miles']),
+      );
+}
+
+class CountryMileage {
+  final String country;
+  final double miles;
+
+  CountryMileage({
+    required this.country,
+    required this.miles,
+  });
+
+  factory CountryMileage.fromJson(Map<String, dynamic> json) =>
+      CountryMileage(
+        country: _asString(json['country']),
+        miles: _asDouble(json['miles']),
+      );
+}
+
 class Station {
   final int id;
   final String name;

lib/services/api_service.dart

@@ -4,6 +4,18 @@ import 'package:http/http.dart' as http;
 typedef TokenProvider = String? Function();
 typedef UnauthorizedHandler = Future<bool> Function();
 
+class MultipartFilePayload {
+  MultipartFilePayload({
+    required this.bytes,
+    required this.filename,
+    this.fieldName,
+  });
+
+  final List<int> bytes;
+  final String filename;
+  final String? fieldName;
+}
+
 class ApiService {
   String _baseUrl;
   final http.Client _client;
@@ -119,6 +131,45 @@ class ApiService {
     return _processResponse(response);
   }
 
+  Future<ApiBinaryResponse> postBytes(
+    String endpoint,
+    dynamic data, {
+    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
+  }) async {
+    final hasBody = data != null;
+    final response = await _sendWithRetry(
+      () => _client.post(
+        Uri.parse('$baseUrl$endpoint'),
+        headers: _buildHeaders(
+          hasBody ? _jsonHeaders(headers) : headers,
+          includeAuth: includeAuth,
+        ),
+        body: hasBody ? jsonEncode(data) : null,
+      ),
+      allowRetry: allowRetry,
+    );
+
+    if (response.statusCode >= 200 && response.statusCode < 300) {
+      final contentDisposition = response.headers['content-disposition'];
+      return ApiBinaryResponse(
+        bytes: response.bodyBytes,
+        statusCode: response.statusCode,
+        contentType: response.headers['content-type'],
+        filename: _extractFilename(contentDisposition),
+      );
+    }
+
+    final body = _decodeBody(response);
+    final message = _extractErrorMessage(body);
+    throw ApiException(
+      statusCode: response.statusCode,
+      message: message,
+      body: body,
+    );
+  }
+
   Future<dynamic> postMultipartFile(
     String endpoint, {
     required List<int> bytes,
@@ -153,6 +204,41 @@ class ApiService {
     return _processResponse(response);
   }
 
+  Future<dynamic> postMultipartFiles(
+    String endpoint, {
+    required List<MultipartFilePayload> files,
+    String fieldName = 'files',
+    Map<String, String>? fields,
+    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
+  }) async {
+    Future<http.Response> send() async {
+      final request = http.MultipartRequest(
+        'POST',
+        Uri.parse('$baseUrl$endpoint'),
+      );
+      request.headers.addAll(_buildHeaders(headers, includeAuth: includeAuth));
+      if (fields != null && fields.isNotEmpty) {
+        request.fields.addAll(fields);
+      }
+      for (final file in files) {
+        request.files.add(
+          http.MultipartFile.fromBytes(
+            file.fieldName ?? fieldName,
+            file.bytes,
+            filename: file.filename,
+          ),
+        );
+      }
+      final streamed = await _client.send(request);
+      return http.Response.fromStream(streamed);
+    }
+
+    final response = await _sendWithRetry(send, allowRetry: allowRetry);
+    return _processResponse(response);
+  }
+
   Future<dynamic> postForm(
     String endpoint,
     Map<String, String> data, {

lib/services/data_service/data_service_core.dart

@@ -7,6 +7,7 @@ class _LegFetchOptions {
   final String? dateRangeStart;
   final String? dateRangeEnd;
   final bool unallocatedOnly;
+  final List<String> networkFilter;
 
   const _LegFetchOptions({
     this.limit = 100,
@@ -15,6 +16,7 @@ class _LegFetchOptions {
     this.dateRangeStart,
     this.dateRangeEnd,
     this.unallocatedOnly = false,
+    this.networkFilter = const [],
   });
 }
 
@@ -118,6 +120,7 @@ class DataService extends ChangeNotifier {
   List<String> _stationNetworks = [];
   Map<String, List<String>> _stationCountryNetworks = {};
   DateTime? _stationFiltersFetchedAt;
+  DateTime? _stationNetworksFetchedAt;
   List<String> get stationNetworks => _stationNetworks;
   Map<String, List<String>> get stationCountryNetworks =>
       _stationCountryNetworks;
@@ -391,9 +394,14 @@ class DataService extends ChangeNotifier {
     String? dateRangeEnd,
     bool append = false,
     bool unallocatedOnly = false,
+    List<String> networkFilter = const [],
   }) async {
     _isLegsLoading = true;
     if (!append) {
+      final normalizedNetworks = networkFilter
+          .map((network) => network.trim())
+          .where((network) => network.isNotEmpty)
+          .toList();
       _lastLegsFetch = _LegFetchOptions(
         limit: limit,
         sortBy: sortBy,
@@ -401,6 +409,7 @@ class DataService extends ChangeNotifier {
         dateRangeStart: dateRangeStart,
         dateRangeEnd: dateRangeEnd,
         unallocatedOnly: unallocatedOnly,
+        networkFilter: normalizedNetworks,
       );
     }
     final buffer = StringBuffer(
@@ -415,6 +424,13 @@ class DataService extends ChangeNotifier {
     if (unallocatedOnly) {
       buffer.write('&unallocated_only=true');
     }
+    final networks = networkFilter
+        .map((network) => network.trim())
+        .where((network) => network.isNotEmpty)
+        .toList();
+    for (final network in networks) {
+      buffer.write('&network_filter=${Uri.encodeQueryComponent(network)}');
+    }
     try {
       final json = await api.get('/user/legs${buffer.toString()}');
 
@@ -444,6 +460,7 @@ class DataService extends ChangeNotifier {
       dateRangeStart: _lastLegsFetch.dateRangeStart,
       dateRangeEnd: _lastLegsFetch.dateRangeEnd,
       unallocatedOnly: _lastLegsFetch.unallocatedOnly,
+      networkFilter: _lastLegsFetch.networkFilter,
     );
   }
 
@@ -669,6 +686,7 @@ class DataService extends ChangeNotifier {
     _stationNetworks = [];
     _stationCountryNetworks = {};
     _stationFiltersFetchedAt = null;
+    _stationNetworksFetchedAt = null;
     _notifications = [];
     _isNotificationsLoading = false;
     _userEntriesVisibility = 'private';
@@ -736,6 +754,9 @@ class DataService extends ChangeNotifier {
         final networks = (map['networks'] as List? ?? const [])
             .whereType<String>()
             .toList();
+        networks.sort(
+          (a, b) => a.toLowerCase().compareTo(b.toLowerCase()),
+        );
         final countryNetworksRaw =
             map['country_networks'] as Map? ?? const <String, dynamic>{};
         final countryNetworks = <String, List<String>>{};
@@ -753,6 +774,31 @@ class DataService extends ChangeNotifier {
     }
   }
 
+  Future<void> fetchStationNetworks() async {
+    final now = DateTime.now();
+    final recent = _stationNetworks.isNotEmpty &&
+        ((_stationNetworksFetchedAt != null &&
+                now.difference(_stationNetworksFetchedAt!) <
+                    const Duration(minutes: 30)) ||
+            (_stationFiltersFetchedAt != null &&
+                now.difference(_stationFiltersFetchedAt!) <
+                    const Duration(minutes: 30)));
+    if (recent) return;
+    try {
+      final response = await api.get('/stations/networks');
+      if (response is List) {
+        final networks = response.whereType<String>().toList();
+        networks.sort(
+          (a, b) => a.toLowerCase().compareTo(b.toLowerCase()),
+        );
+        _stationNetworks = networks;
+        _stationNetworksFetchedAt = now;
+      }
+    } catch (e) {
+      debugPrint('Failed to fetch station networks: $e');
+    }
+  }
+
   String _stationKey(List<String> countries, List<String> networks) {
     final c = countries..sort();
     final n = networks..sort();

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.7.7+15
+version: 0.8.1+18
 
 environment:
   sdk: ^3.8.1

test/helpers/fake_services.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:mileograph_flutter/objects/objects.dart';
 import 'package:mileograph_flutter/services/api_service.dart';
 import 'package:mileograph_flutter/services/authservice.dart';
@@ -8,14 +7,18 @@ import 'package:mileograph_flutter/services/distance_unit_service.dart';
 import 'test_data.dart';
 
 class FakeApiService extends ApiService {
-  FakeApiService({String baseUrl = 'https://example.com'})
+  FakeApiService({super.baseUrl = 'https://example.com'});
-      : super(baseUrl: baseUrl);
 
   final Map<String, dynamic> getResponses = {};
   final Map<String, dynamic> postResponses = {};
 
   @override
-  Future<dynamic> get(String endpoint, {Map<String, String>? headers}) async {
+  Future<dynamic> get(
+    String endpoint, {
+    Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
+  }) async {
     return getResponses[endpoint];
   }
 
@@ -24,6 +27,8 @@ class FakeApiService extends ApiService {
     String endpoint,
     dynamic data, {
     Map<String, String>? headers,
+    bool includeAuth = true,
+    bool allowRetry = true,
   }) async {
     return postResponses[endpoint] ?? {};
   }
@@ -170,20 +175,16 @@ class FakeDataService extends DataService {
   @override
   Future<void> fetchOnThisDay({DateTime? date}) async {}
 
-  @override
   Future<void> fetchTripDetails() async {}
 
-  @override
   Future<void> fetchHadTraction({int offset = 0, int limit = 100}) async {}
 
-  @override
   Future<void> fetchLatestLocoChanges({
     int limit = 100,
     int offset = 0,
     bool append = false,
   }) async {}
 
-  @override
   Future<void> fetchClassClearanceProgress({
     int offset = 0,
     int limit = 20,
@@ -201,14 +202,13 @@ class FakeDataService extends DataService {
     String? dateRangeEnd,
     bool append = false,
     bool unallocatedOnly = false,
+    List<String> networkFilter = const [],
   }) async {}
 
-  @override
   Future<List<TripLocoStat>> fetchTripLocoStats(int tripId) async {
     return const [];
   }
 
-  @override
   Future<void> fetchTraction({
     bool hadOnly = false,
     int offset = 0,
@@ -220,7 +220,6 @@ class FakeDataService extends DataService {
     Map<String, dynamic>? filters,
   }) async {}
 
-  @override
   Future<List<String>> fetchClassList({bool force = false}) async {
     return locoClassesValue;
   }
@@ -232,11 +231,12 @@ class FakeDataService extends DataService {
   Future<void> fetchPendingLocoCount() async {}
 
   @override
+  Future<void> fetchStationNetworks() async {}
+
   Future<Map<String, dynamic>?> fetchClassStats(String locoClass) async {
     return TestData.classStats;
   }
 
-  @override
   Future<List<LeaderboardEntry>> fetchClassLeaderboard(
     String locoClass, {
     bool friends = false,