Skip to content
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

Jump to bottom

feat: allow multiple basic id messages in container #28

Merged
merged 1 commit into from
Mar 14, 2024
Merged

feat: allow multiple basic id messages in container #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 49 additions & 14 deletions lib/models/message_container.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:dart_opendroneid/dart_opendroneid.dart';
import 'package:flutter_opendroneid/extensions/compare_extension.dart';
import 'package:flutter_opendroneid/models/constants.dart';
import 'package:flutter_opendroneid/pigeon.dart' as pigeon;
import 'package:flutter_opendroneid/utils/conversions.dart';

/// The [MessageContainer] groups together messages of different types
/// from one device. It contains one instance of each message. The container is
Expand All @@ -12,7 +13,7 @@ class MessageContainer {
final pigeon.MessageSource source;
final int? lastMessageRssi;

final BasicIDMessage? basicIdMessage;
final Map<IDType, BasicIDMessage>? basicIdMessages;
final LocationMessage? locationMessage;
final OperatorIDMessage? operatorIdMessage;
final SelfIDMessage? selfIdMessage;
Expand All @@ -24,7 +25,7 @@ class MessageContainer {
required this.lastUpdate,
required this.source,
this.lastMessageRssi,
this.basicIdMessage,
this.basicIdMessages,
this.locationMessage,
this.operatorIdMessage,
this.selfIdMessage,
Expand All @@ -37,7 +38,7 @@ class MessageContainer {
int? lastMessageRssi,
DateTime? lastUpdate,
pigeon.MessageSource? source,
BasicIDMessage? basicIdMessage,
Map<IDType, BasicIDMessage>? basicIdMessage,
LocationMessage? locationMessage,
OperatorIDMessage? operatorIdMessage,
SelfIDMessage? selfIdMessage,
Expand All @@ -49,7 +50,7 @@ class MessageContainer {
lastMessageRssi: lastMessageRssi ?? this.lastMessageRssi,
lastUpdate: lastUpdate ?? DateTime.now(),
source: source ?? this.source,
basicIdMessage: basicIdMessage ?? this.basicIdMessage,
basicIdMessages: basicIdMessage ?? this.basicIdMessages,
locationMessage: locationMessage ?? this.locationMessage,
operatorIdMessage: operatorIdMessage ?? this.operatorIdMessage,
selfIdMessage: selfIdMessage ?? this.selfIdMessage,
Expand Down Expand Up @@ -92,16 +93,12 @@ class MessageContainer {
DateTime.fromMillisecondsSinceEpoch(receivedTimestamp),
source: source,
),
BasicIDMessage => basicIdMessage != null &&
basicIdMessage!.containsEqualData(message as BasicIDMessage)
? null
: copyWith(
basicIdMessage: message as BasicIDMessage,
lastMessageRssi: rssi,
lastUpdate:
DateTime.fromMillisecondsSinceEpoch(receivedTimestamp),
source: source,
),
BasicIDMessage => _updateBasicIDMessages(
message: message as BasicIDMessage,
receivedTimestamp: receivedTimestamp,
source: source,
rssi: rssi,
),
SelfIDMessage => selfIdMessage != null &&
selfIdMessage!.containsEqualData(message as SelfIDMessage)
? null
Expand Down Expand Up @@ -178,4 +175,42 @@ class MessageContainer {
locationMessage!.location!.longitude <= MAX_LON &&
locationMessage!.location!.latitude >= MIN_LAT &&
locationMessage!.location!.longitude >= MIN_LON;

/// Check if container contains basic id message with given uas id
bool containsUasId(String uasId) =>
basicIdMessages?.values
.any((element) => element.uasID.asString() == uasId) ??
false;

// preferably return message with SerialNumber uas id, which is the default
BasicIDMessage? get preferredBasicIdMessage {
if (basicIdMessages == null || basicIdMessages!.isEmpty) return null;

return basicIdMessages![IDType.serialNumber] ??
basicIdMessages!.values.first;
}

String? get serialNumberUasId =>
basicIdMessages?[IDType.serialNumber]?.uasID.asString();

MessageContainer? _updateBasicIDMessages({
required BasicIDMessage message,
required int receivedTimestamp,
required pigeon.MessageSource source,
int? rssi,
}) {
if (basicIdMessages != null &&
basicIdMessages![message.uasID.type] != null &&
basicIdMessages![message.uasID.type]!.containsEqualData(message))
return null;

final newEntry = {message.uasID.type: message};
return copyWith(
basicIdMessage: basicIdMessages == null ? newEntry : basicIdMessages!
..addAll(newEntry),
lastMessageRssi: rssi,
lastUpdate: DateTime.fromMillisecondsSinceEpoch(receivedTimestamp),
source: source,
);
}
}
Loading