fix locos for trips, hopefully improve build times
Some checks failed
Release / android-build (push) Blocked by required conditions
Release / meta (push) Successful in 51s
Release / release-dev (push) Has been cancelled
Release / release-master (push) Has been cancelled
Release / linux-build (push) Has been cancelled

This commit is contained in:
2025-12-14 12:35:58 +00:00
parent 11a5a42ad4
commit 924c23a401
4 changed files with 58 additions and 32 deletions

View File

@@ -386,7 +386,7 @@ class TripDetail {
});
factory TripDetail.fromJson(Map<String, dynamic> json) => TripDetail(
id: json['trip_id'] ?? 0,
id: json['trip_id'] ?? json['id'] ?? 0,
name: json['trip_name'] ?? '',
mileage: (json['trip_mileage'] as num?)?.toDouble() ?? 0,
legCount: json['leg_count'] ?? ((json['trip_legs'] as List?)?.length ?? 0),
@@ -411,14 +411,40 @@ class TripLocoStat {
this.name,
});
factory TripLocoStat.fromJson(Map<String, dynamic> json) => TripLocoStat(
locoClass: json['loco_class'] ?? json['class'] ?? '',
number: json['loco_number'] ?? json['number'] ?? '',
name: json['loco_name'] ?? json['name'],
won: json['won'] == 1 ||
json['won'] == true ||
(json['won'] is String && json['won'].toString() == '1'),
);
factory TripLocoStat.fromJson(Map<String, dynamic> json) {
final locoJson = json['loco'] is Map<String, dynamic>
? Map<String, dynamic>.from(json['loco'] as Map)
: null;
final locoClass = json['loco_class'] ??
json['class'] ??
locoJson?['class'] ??
locoJson?['loco_class'] ??
'';
final locoNumber = json['loco_number'] ??
json['number'] ??
locoJson?['number'] ??
locoJson?['loco_number'] ??
'';
final locoName =
json['loco_name'] ?? json['name'] ?? locoJson?['name'] ?? locoJson?['loco_name'];
final wonValue = json['won'] ?? json['result'] ?? json['winner'];
final won = _parseWonFlag(wonValue);
return TripLocoStat(
locoClass: locoClass,
number: locoNumber,
name: locoName,
won: won,
);
}
static bool _parseWonFlag(dynamic value) {
if (value == null) return false;
if (value is bool) return value;
if (value is num) return value != 0;
final normalized = value.toString().toLowerCase();
return ['1', 'true', 'win', 'won', 'yes', 'w'].contains(normalized);
}
}
class EventField {