|
|
|
|
@ -37,6 +37,7 @@ import 'line_of_sight_map_screen.dart';
|
|
|
|
|
class MapScreen extends StatefulWidget {
|
|
|
|
|
final LatLng? highlightPosition;
|
|
|
|
|
final String? highlightLabel;
|
|
|
|
|
final String? highlightMarkerKey;
|
|
|
|
|
final double highlightZoom;
|
|
|
|
|
final bool hideBackButton;
|
|
|
|
|
|
|
|
|
|
@ -44,6 +45,7 @@ class MapScreen extends StatefulWidget {
|
|
|
|
|
super.key,
|
|
|
|
|
this.highlightPosition,
|
|
|
|
|
this.highlightLabel,
|
|
|
|
|
this.highlightMarkerKey,
|
|
|
|
|
this.highlightZoom = 15.0,
|
|
|
|
|
this.hideBackButton = false,
|
|
|
|
|
});
|
|
|
|
|
@ -94,6 +96,19 @@ class _MapScreenState extends State<MapScreen> {
|
|
|
|
|
_removedMarkerIds = ids;
|
|
|
|
|
_removedMarkersLoaded = true;
|
|
|
|
|
});
|
|
|
|
|
// If this screen was opened to highlight a marker, and that marker
|
|
|
|
|
// was previously removed, re-enable it now that we've loaded the saved
|
|
|
|
|
// removed IDs.
|
|
|
|
|
if (widget.highlightMarkerKey != null &&
|
|
|
|
|
_removedMarkerIds.contains(widget.highlightMarkerKey)) {
|
|
|
|
|
final updated = Set<String>.from(_removedMarkerIds);
|
|
|
|
|
updated.remove(widget.highlightMarkerKey);
|
|
|
|
|
if (!mounted) return;
|
|
|
|
|
setState(() {
|
|
|
|
|
_removedMarkerIds = updated;
|
|
|
|
|
});
|
|
|
|
|
await _markerService.saveRemovedIds(updated);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool _checkLocationPlausibility(double lat, double lon) {
|
|
|
|
|
@ -229,6 +244,24 @@ class _MapScreenState extends State<MapScreen> {
|
|
|
|
|
: <Polyline>[],
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Collect polylines for shared markers' history with dashed lines
|
|
|
|
|
final List<Polyline> sharedMarkerPolylines = [];
|
|
|
|
|
for (final marker in sharedMarkers) {
|
|
|
|
|
if (marker.history.isNotEmpty) {
|
|
|
|
|
final points = List<LatLng>.from(marker.history);
|
|
|
|
|
points.add(marker.position);
|
|
|
|
|
sharedMarkerPolylines.add(
|
|
|
|
|
Polyline(
|
|
|
|
|
points: points,
|
|
|
|
|
color: marker.isChannel
|
|
|
|
|
? (marker.isPublicChannel ? Colors.orange : Colors.purple)
|
|
|
|
|
: Colors.blue,
|
|
|
|
|
strokeWidth: 3,
|
|
|
|
|
),
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Calculate center and zoom of all nodes, or default to (0, 0)
|
|
|
|
|
LatLng center = const LatLng(0, 0);
|
|
|
|
|
double initialZoom = 10.0;
|
|
|
|
|
@ -475,6 +508,8 @@ class _MapScreenState extends State<MapScreen> {
|
|
|
|
|
),
|
|
|
|
|
if (_polylines.isNotEmpty && _isBuildingPathTrace)
|
|
|
|
|
PolylineLayer(polylines: _polylines),
|
|
|
|
|
if (sharedMarkerPolylines.isNotEmpty)
|
|
|
|
|
PolylineLayer(polylines: sharedMarkerPolylines),
|
|
|
|
|
MarkerLayer(
|
|
|
|
|
markers: [
|
|
|
|
|
if (highlightPosition != null)
|
|
|
|
|
@ -1239,28 +1274,39 @@ class _MapScreenState extends State<MapScreen> {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<_SharedMarker> _collectSharedMarkers(MeshCoreConnector connector) {
|
|
|
|
|
final markers = <_SharedMarker>[];
|
|
|
|
|
// Build a _SharedMarker per message (history empty), grouped by dedupe key.
|
|
|
|
|
// Afterwards pick the latest per key and fill its history from older ones.
|
|
|
|
|
final updatesByKey = <String, List<_SharedMarker>>{};
|
|
|
|
|
final selfName = connector.selfName ?? 'Me';
|
|
|
|
|
|
|
|
|
|
void addUpdate(_SharedMarker update) {
|
|
|
|
|
(updatesByKey[update.id] ??= <_SharedMarker>[]).add(update);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (final contact in connector.contacts) {
|
|
|
|
|
final messages = connector.getMessages(contact);
|
|
|
|
|
for (final message in messages) {
|
|
|
|
|
final payload = _parseMarkerText(message.text);
|
|
|
|
|
final payload = parseMarkerText(message.text);
|
|
|
|
|
if (payload == null) continue;
|
|
|
|
|
final fromName = message.isOutgoing ? selfName : contact.name;
|
|
|
|
|
final id = _buildMarkerId(
|
|
|
|
|
final key = buildSharedMarkerKey(
|
|
|
|
|
sourceId: contact.publicKeyHex,
|
|
|
|
|
timestamp: message.timestamp,
|
|
|
|
|
text: message.text,
|
|
|
|
|
label: payload.label,
|
|
|
|
|
fromName: fromName,
|
|
|
|
|
flags: payload.flags,
|
|
|
|
|
isChannel: false,
|
|
|
|
|
);
|
|
|
|
|
markers.add(
|
|
|
|
|
addUpdate(
|
|
|
|
|
_SharedMarker(
|
|
|
|
|
id: id,
|
|
|
|
|
id: key,
|
|
|
|
|
position: payload.position,
|
|
|
|
|
label: payload.label,
|
|
|
|
|
label: payload.label.isEmpty
|
|
|
|
|
? context.l10n.map_sharedPin
|
|
|
|
|
: payload.label,
|
|
|
|
|
flags: payload.flags,
|
|
|
|
|
fromName: fromName,
|
|
|
|
|
sourceLabel: contact.name,
|
|
|
|
|
timestamp: message.timestamp,
|
|
|
|
|
isChannel: false,
|
|
|
|
|
isPublicChannel: false,
|
|
|
|
|
),
|
|
|
|
|
@ -1272,23 +1318,28 @@ class _MapScreenState extends State<MapScreen> {
|
|
|
|
|
final isPublic = _isPublicChannel(channel);
|
|
|
|
|
final messages = connector.getChannelMessages(channel);
|
|
|
|
|
for (final message in messages) {
|
|
|
|
|
final payload = _parseMarkerText(message.text);
|
|
|
|
|
final payload = parseMarkerText(message.text);
|
|
|
|
|
if (payload == null) continue;
|
|
|
|
|
final id = _buildMarkerId(
|
|
|
|
|
final key = buildSharedMarkerKey(
|
|
|
|
|
sourceId: 'channel:${channel.index}',
|
|
|
|
|
timestamp: message.timestamp,
|
|
|
|
|
text: message.text,
|
|
|
|
|
label: payload.label,
|
|
|
|
|
fromName: message.senderName,
|
|
|
|
|
flags: payload.flags,
|
|
|
|
|
isChannel: true,
|
|
|
|
|
);
|
|
|
|
|
markers.add(
|
|
|
|
|
addUpdate(
|
|
|
|
|
_SharedMarker(
|
|
|
|
|
id: id,
|
|
|
|
|
id: key,
|
|
|
|
|
position: payload.position,
|
|
|
|
|
label: payload.label,
|
|
|
|
|
label: payload.label.isEmpty
|
|
|
|
|
? context.l10n.map_sharedPin
|
|
|
|
|
: payload.label,
|
|
|
|
|
flags: payload.flags,
|
|
|
|
|
fromName: message.senderName,
|
|
|
|
|
sourceLabel: channel.name.isEmpty
|
|
|
|
|
? 'Channel ${channel.index}'
|
|
|
|
|
: channel.name,
|
|
|
|
|
timestamp: message.timestamp,
|
|
|
|
|
isChannel: true,
|
|
|
|
|
isPublicChannel: isPublic,
|
|
|
|
|
),
|
|
|
|
|
@ -1296,36 +1347,25 @@ class _MapScreenState extends State<MapScreen> {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return markers;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_MarkerPayload? _parseMarkerText(String text) {
|
|
|
|
|
final trimmed = text.trim();
|
|
|
|
|
if (!trimmed.startsWith('m:')) return null;
|
|
|
|
|
|
|
|
|
|
final parts = trimmed.substring(2).split('|');
|
|
|
|
|
if (parts.isEmpty) return null;
|
|
|
|
|
final coords = parts[0].split(',');
|
|
|
|
|
if (coords.length != 2) return null;
|
|
|
|
|
final lat = double.tryParse(coords[0].trim());
|
|
|
|
|
final lon = double.tryParse(coords[1].trim());
|
|
|
|
|
if (lat == null || lon == null) return null;
|
|
|
|
|
|
|
|
|
|
final label = parts.length > 1 ? parts[1].trim() : '';
|
|
|
|
|
final flags = parts.length > 2 ? parts[2].trim() : '';
|
|
|
|
|
return _MarkerPayload(
|
|
|
|
|
position: LatLng(lat, lon),
|
|
|
|
|
label: label.isEmpty ? context.l10n.map_sharedPin : label,
|
|
|
|
|
flags: flags,
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
final markers = <_SharedMarker>[];
|
|
|
|
|
updatesByKey.forEach((_, updates) {
|
|
|
|
|
updates.sort((a, b) => a.timestamp.compareTo(b.timestamp));
|
|
|
|
|
final latest = updates.last;
|
|
|
|
|
// History: older positions, drop consecutive duplicates at same position.
|
|
|
|
|
final history = <LatLng>[];
|
|
|
|
|
for (var i = 0; i < updates.length - 1; i++) {
|
|
|
|
|
final p = updates[i].position;
|
|
|
|
|
if (history.isEmpty ||
|
|
|
|
|
history.last.latitude != p.latitude ||
|
|
|
|
|
history.last.longitude != p.longitude) {
|
|
|
|
|
history.add(p);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
markers.add(latest.copyWithHistory(history));
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
String _buildMarkerId({
|
|
|
|
|
required String sourceId,
|
|
|
|
|
required DateTime timestamp,
|
|
|
|
|
required String text,
|
|
|
|
|
}) {
|
|
|
|
|
return '$sourceId|${timestamp.millisecondsSinceEpoch}|$text';
|
|
|
|
|
markers.sort((a, b) => b.timestamp.compareTo(a.timestamp));
|
|
|
|
|
return markers;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Marker _buildSharedMarker(_SharedMarker marker) {
|
|
|
|
|
@ -1337,7 +1377,15 @@ class _MapScreenState extends State<MapScreen> {
|
|
|
|
|
width: 60,
|
|
|
|
|
height: 60,
|
|
|
|
|
child: GestureDetector(
|
|
|
|
|
onTap: () => _showMarkerInfo(marker),
|
|
|
|
|
onTap: () async {
|
|
|
|
|
if (_removedMarkerIds.contains(marker.id)) {
|
|
|
|
|
setState(() {
|
|
|
|
|
_removedMarkerIds.remove(marker.id);
|
|
|
|
|
});
|
|
|
|
|
await _markerService.saveRemovedIds(_removedMarkerIds);
|
|
|
|
|
}
|
|
|
|
|
_showMarkerInfo(marker);
|
|
|
|
|
},
|
|
|
|
|
child: Column(
|
|
|
|
|
children: [
|
|
|
|
|
Container(
|
|
|
|
|
@ -1554,13 +1602,19 @@ class _MapScreenState extends State<MapScreen> {
|
|
|
|
|
showDialog(
|
|
|
|
|
context: context,
|
|
|
|
|
builder: (dialogContext) => AlertDialog(
|
|
|
|
|
title: Text(marker.label),
|
|
|
|
|
title: Text(
|
|
|
|
|
marker.label.isEmpty ? context.l10n.map_sharedPin : marker.label,
|
|
|
|
|
),
|
|
|
|
|
content: Column(
|
|
|
|
|
mainAxisSize: MainAxisSize.min,
|
|
|
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
|
|
|
children: [
|
|
|
|
|
_buildInfoRow(context.l10n.map_from, marker.fromName),
|
|
|
|
|
_buildInfoRow(context.l10n.map_source, marker.sourceLabel),
|
|
|
|
|
_buildInfoRow(
|
|
|
|
|
context.l10n.map_sharedAt,
|
|
|
|
|
_formatLastSeen(marker.timestamp),
|
|
|
|
|
),
|
|
|
|
|
_buildInfoRow(
|
|
|
|
|
'Location',
|
|
|
|
|
'${marker.position.latitude.toStringAsFixed(6)}, ${marker.position.longitude.toStringAsFixed(6)}',
|
|
|
|
|
@ -1727,6 +1781,10 @@ class _MapScreenState extends State<MapScreen> {
|
|
|
|
|
String defaultLabel,
|
|
|
|
|
) async {
|
|
|
|
|
final controller = TextEditingController(text: defaultLabel);
|
|
|
|
|
controller.selection = TextSelection(
|
|
|
|
|
baseOffset: 0,
|
|
|
|
|
extentOffset: controller.text.length,
|
|
|
|
|
);
|
|
|
|
|
return showDialog<String>(
|
|
|
|
|
context: context,
|
|
|
|
|
builder: (dialogContext) => AlertDialog(
|
|
|
|
|
@ -2322,18 +2380,50 @@ class _GuessedLocation {
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
class _MarkerPayload {
|
|
|
|
|
class MarkerPayload {
|
|
|
|
|
final LatLng position;
|
|
|
|
|
final String label;
|
|
|
|
|
final String flags;
|
|
|
|
|
|
|
|
|
|
_MarkerPayload({
|
|
|
|
|
MarkerPayload({
|
|
|
|
|
required this.position,
|
|
|
|
|
required this.label,
|
|
|
|
|
required this.flags,
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Parse a shared marker text message of the form
|
|
|
|
|
/// `m:<lat>,<lon>|<label>|<flags>` and return a [MarkerPayload].
|
|
|
|
|
MarkerPayload? parseMarkerText(String text) {
|
|
|
|
|
final trimmed = text.trim();
|
|
|
|
|
final match = RegExp(
|
|
|
|
|
r'm:([\-0-9.]+),([\-0-9.]+)\|([^|]*)\|(.*)',
|
|
|
|
|
).firstMatch(trimmed);
|
|
|
|
|
if (match == null) return null;
|
|
|
|
|
final lat = double.tryParse(match.group(1) ?? '');
|
|
|
|
|
final lon = double.tryParse(match.group(2) ?? '');
|
|
|
|
|
if (lat == null || lon == null) return null;
|
|
|
|
|
final label = (match.group(3) ?? '').trim();
|
|
|
|
|
final flags = (match.group(4) ?? '').trim();
|
|
|
|
|
return MarkerPayload(position: LatLng(lat, lon), label: label, flags: flags);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Build a normalized dedupe key for shared markers.
|
|
|
|
|
/// Keeps the same algorithm previously present in both chat and map screens.
|
|
|
|
|
String buildSharedMarkerKey({
|
|
|
|
|
required String sourceId,
|
|
|
|
|
required String label,
|
|
|
|
|
required String fromName,
|
|
|
|
|
required String flags,
|
|
|
|
|
required bool isChannel,
|
|
|
|
|
}) {
|
|
|
|
|
final normalizedLabel = label.trim().toLowerCase();
|
|
|
|
|
final normalizedFrom = fromName.trim().toLowerCase();
|
|
|
|
|
final normalizedFlags = flags.trim().toLowerCase();
|
|
|
|
|
final scope = isChannel ? 'ch' : 'dm';
|
|
|
|
|
return '$scope|$sourceId|$normalizedFrom|$normalizedLabel|$normalizedFlags';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
class _SharedMarker {
|
|
|
|
|
final String id;
|
|
|
|
|
final LatLng position;
|
|
|
|
|
@ -2341,8 +2431,10 @@ class _SharedMarker {
|
|
|
|
|
final String flags;
|
|
|
|
|
final String fromName;
|
|
|
|
|
final String sourceLabel;
|
|
|
|
|
final DateTime timestamp;
|
|
|
|
|
final bool isChannel;
|
|
|
|
|
final bool isPublicChannel;
|
|
|
|
|
final List<LatLng> history;
|
|
|
|
|
|
|
|
|
|
_SharedMarker({
|
|
|
|
|
required this.id,
|
|
|
|
|
@ -2351,7 +2443,24 @@ class _SharedMarker {
|
|
|
|
|
required this.flags,
|
|
|
|
|
required this.fromName,
|
|
|
|
|
required this.sourceLabel,
|
|
|
|
|
required this.timestamp,
|
|
|
|
|
required this.isChannel,
|
|
|
|
|
required this.isPublicChannel,
|
|
|
|
|
this.history = const [],
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
_SharedMarker copyWithHistory(List<LatLng> newHistory) {
|
|
|
|
|
return _SharedMarker(
|
|
|
|
|
id: id,
|
|
|
|
|
position: position,
|
|
|
|
|
label: label,
|
|
|
|
|
flags: flags,
|
|
|
|
|
fromName: fromName,
|
|
|
|
|
sourceLabel: sourceLabel,
|
|
|
|
|
timestamp: timestamp,
|
|
|
|
|
isChannel: isChannel,
|
|
|
|
|
isPublicChannel: isPublicChannel,
|
|
|
|
|
history: newHistory,
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
zjs81
3 months ago
committed by
GitHub