Merge pull request #297 from zjs81/dev-improments

Improvements to path tracing and location handling
2026-07-13 12:22:01 +10:00 · 2026-03-14 18:42:58 -07:00
parent 64698e0be6 60e8ee0130
commit 9199aab7f7
19 changed files with 247 additions and 139 deletions
@@ -40,10 +40,7 @@ class ChannelMessagePathScreen extends StatelessWidget {
        final primaryPath = !channelMessage && !message.isOutgoing
            ? Uint8List.fromList(primaryPathTmp.reversed.toList())
            : primaryPathTmp;
-        final contacts = <Contact>[
-          ...connector.contacts,
-          ...connector.discoveredContacts,
-        ];
+        final contacts = connector.allContacts;
        final hops = _buildPathHops(primaryPath, contacts, l10n);
        final hasHopDetails = primaryPath.isNotEmpty;
        final observedLabel = _formatObservedHops(
@@ -65,8 +62,9 @@ class ChannelMessagePathScreen extends StatelessWidget {
                    builder: (context) => PathTraceMapScreen(
                      title: context.l10n.contacts_repeaterPathTrace,
                      path: primaryPath,
-                      flipPathRound: true,
-                      reversePathRound: !message.isOutgoing && !channelMessage,
+                      flipPathAround: true,
+                      reversePathAround:
+                          !(!channelMessage && !message.isOutgoing),
                    ),
                  ),
                ),
@@ -367,10 +365,7 @@ class _ChannelMessagePathMapScreenState
            : selectedPathTmp;

        final selectedIndex = _indexForPath(selectedPath, observedPaths);
-        final contacts = <Contact>[
-          ...connector.contacts,
-          ...connector.discoveredContacts,
-        ];
+        final contacts = connector.allContacts;
        final hops = _buildPathHops(selectedPath, contacts, context.l10n);

        final points = <LatLng>[];
@@ -858,7 +858,7 @@ class _ChatScreenState extends State<ChatScreen> {
                builder: (context) => PathTraceMapScreen(
                  title: context.l10n.contacts_repeaterPathTrace,
                  path: Uint8List.fromList(pathBytes),
-                  flipPathRound: true,
+                  flipPathAround: true,
                  targetContact: widget.contact,
                ),
              ),
@@ -1027,7 +1027,7 @@ class _ChatScreenState extends State<ChatScreen> {
    final currentPathLabel = _currentPathLabel(currentContact);

    // Filter out the current contact from available contacts
-    final availableContacts = connector.contacts
+    final availableContacts = connector.allContacts
        .where((c) => c != widget.contact)
        .toList();

@@ -1239,7 +1239,7 @@ class _ContactsScreenState extends State<ContactsScreen>
            if (isRepeater) ...[
              ListTile(
                leading: const Icon(Icons.radar, color: Colors.green),
-                title: contact.pathLength > 0
+                title: contact.pathBytesForDisplay.isNotEmpty
                    ? Text(context.l10n.contacts_pathTrace)
                    : Text(context.l10n.contacts_ping),
                onTap: () {
@@ -1247,10 +1247,12 @@ class _ContactsScreenState extends State<ContactsScreen>
                    context,
                    MaterialPageRoute(
                      builder: (context) => PathTraceMapScreen(
-                        title: contact.pathLength > 0
+                        title: contact.pathBytesForDisplay.isNotEmpty
                            ? context.l10n.contacts_repeaterPathTrace
                            : context.l10n.contacts_repeaterPing,
-                        path: contact.traceRouteBytes ?? Uint8List(0),
+                        path: contact.pathBytesForDisplay,
+                        flipPathAround: true,
+                        targetContact: contact,
                      ),
                    ),
                  );
@@ -1275,10 +1277,12 @@ class _ContactsScreenState extends State<ContactsScreen>
                    context,
                    MaterialPageRoute(
                      builder: (context) => PathTraceMapScreen(
-                        title: contact.pathLength > 0
+                        title: contact.pathBytesForDisplay.isNotEmpty
                            ? context.l10n.contacts_roomPathTrace
                            : context.l10n.contacts_roomPing,
-                        path: contact.traceRouteBytes ?? Uint8List(0),
+                        path: contact.pathBytesForDisplay,
+                        flipPathAround: contact.pathBytesForDisplay.isNotEmpty,
+                        targetContact: contact,
                      ),
                    ),
                  );
@@ -1320,7 +1324,8 @@ class _ContactsScreenState extends State<ContactsScreen>
                          title: context.l10n.contacts_pathTraceTo(
                            contact.name,
                          ),
-                          path: contact.traceRouteBytes ?? Uint8List(0),
+                          path: contact.pathBytesForDisplay,
+                          flipPathAround: true,
                          targetContact: contact,
                        ),
                      ),
@@ -137,10 +137,7 @@ class _MapScreenState extends State<MapScreen> {
      builder: (context, connector, settingsService, pathHistory, child) {
        final tileCache = context.read<MapTileCacheService>();
        final settings = settingsService.settings;
-        final allContacts = <Contact>[
-          ...connector.contacts,
-          ...connector.discoveredContacts.where((c) => !c.isActive),
-        ];
+        final allContacts = connector.allContacts;

        final contacts = settings.mapShowDiscoveryContacts
            ? allContacts
@@ -179,20 +176,13 @@ class _MapScreenState extends State<MapScreen> {

        // Filter by location
        final contactsWithLocation = filteredByKeyPrefix.where((c) {
-          if (!c.hasLocation) {
-            return false;
-          }
-          return _checkLocationPlausibility(c.latitude!, c.longitude!);
+          return c.hasLocation;
        }).toList();

        // All contacts with a known location — used as anchors regardless of
        // time/key-prefix filters so that repeaters are always available.
        final allContactsWithLocation = allContacts
-            .where(
-              (c) =>
-                  c.hasLocation &&
-                  _checkLocationPlausibility(c.latitude!, c.longitude!),
-            )
+            .where((c) => c.hasLocation)
            .toList();

        // Compute guessed locations with caching
@@ -124,10 +124,7 @@ class _NeighborsScreenState extends State<NeighborsScreen> {

  void _handleNeighborsResponse(MeshCoreConnector connector, Uint8List frame) {
    final buffer = BufferReader(frame);
-    final contacts = <Contact>[
-      ...connector.contacts,
-      ...connector.discoveredContacts,
-    ];
+    final contacts = connector.allContacts;
    try {
      final neighborCount = buffer.readUInt16LE();
      final parsedNeighbors = parseNeighborsData(buffer, buffer.readUInt16LE());
@@ -52,8 +52,8 @@ class PathTraceMapScreen extends StatefulWidget {
  final String title;
  final Uint8List path;
  final int? repeaterId;
-  final bool flipPathRound;
-  final bool reversePathRound;
+  final bool flipPathAround;
+  final bool reversePathAround;
  final Contact? targetContact;

  const PathTraceMapScreen({
@@ -61,8 +61,8 @@ class PathTraceMapScreen extends StatefulWidget {
    required this.title,
    required this.path,
    this.repeaterId,
-    this.flipPathRound = false,
-    this.reversePathRound = false,
+    this.flipPathAround = false,
+    this.reversePathAround = false,
    this.targetContact,
  });

@@ -93,6 +93,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
  ValueKey<String> _mapKey = const ValueKey('initial');
  double _pathDistanceMeters = 0.0;
  bool _showNodeLabels = true;
+  Contact? _targetContact;

  String _formatPathPrefixes(Uint8List pathBytes) {
    return pathBytes
@@ -158,21 +159,16 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
      });
    }

-    final Uint8List path;
-
-    Uint8List pathTmp = widget.reversePathRound
+    final pathTmp = widget.reversePathAround
        ? Uint8List.fromList(widget.path.reversed.toList())
        : widget.path;

-    if (widget.flipPathRound) {
-      path = buildPath(pathTmp);
-    } else {
-      path = pathTmp;
-    }
+    final path = widget.flipPathAround ? buildPath(pathTmp) : pathTmp;

    appLogger.info(
      'Initiating path trace with path: ${_formatPathPrefixes(path)}',
      tag: 'PathTraceMapScreen',
+      noNotify: !mounted,
    );

    final connector = Provider.of<MeshCoreConnector>(context, listen: false);
@@ -263,10 +259,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
          .toList();

      Map<int, Contact> pathContacts = {};
-      final contacts = <Contact>[
-        ...connector.contacts,
-        ...connector.discoveredContacts,
-      ];
+      final contacts = connector.allContacts;
      contacts.where((c) => c.type != advTypeChat).forEach((repeater) {
        for (var repeaterData in pathData) {
          if (listEquals(
@@ -312,18 +305,21 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
        // Compute endpoint position for the target contact.
        LatLng? targetPos;
        bool targetGuessed = false;
-        final target = widget.targetContact;
-        if (target != null) {
-          if (target.hasLocation) {
-            targetPos = LatLng(target.latitude!, target.longitude!);
-          } else if (pathData.isNotEmpty) {
+        _targetContact = widget.targetContact;
+
+        if (_targetContact != null) {
+          final tc = _targetContact!;
+          if (tc.hasLocation) {
+            targetPos = LatLng(tc.latitude!, tc.longitude!);
+          } else if (widget.path.length > 1) {
            // Infer from the last hop: average GPS contacts sharing that hop.
-            // For a round-trip path (flipPathRound), the target-side hop sits
-            // in the middle of the symmetric sequence; .last is the local side.
-            final lastHop = (widget.flipPathRound && pathData.length > 1)
-                ? pathData[(pathData.length - 1) ~/ 2]
-                : pathData.last;
-            final peers = connector.contacts
+            // For a round-trip path (flipPathAround/reversePathAround), the target-side hop
+            // sits in the middle of the symmetric sequence; .last is the local side.
+            final lastHop = widget.reversePathAround
+                ? widget.path.first
+                : widget.path.last;
+
+            final peers = connector.allContacts
                .where(
                  (c) =>
                      c.hasLocation &&
@@ -339,12 +335,34 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                  peers.map((c) => c.longitude!).reduce((a, b) => a + b) /
                  peers.length;
              const offsetDeg = 0.003;
-              final angle = (target.publicKey[1] / 255.0) * 2 * pi;
+              final angle = (tc.publicKey[1] / 255.0) * 2 * pi;
              targetPos = LatLng(
                lat + offsetDeg * cos(angle),
                lon + offsetDeg * sin(angle),
              );
              targetGuessed = true;
+            } else if (inferredPositions.containsKey(lastHop)) {
+              final lat = inferredPositions[lastHop]!.latitude;
+              final lon = inferredPositions[lastHop]!.longitude;
+              const offsetDeg = 0.003;
+              final angle = (tc.publicKey[1] / 255.0) * 2 * pi;
+              targetPos = LatLng(
+                lat + offsetDeg * cos(angle),
+                lon + offsetDeg * sin(angle),
+              );
+              targetGuessed = true;
+            } else {
+              // As a last resort, just place it at the same position as the last hop.
+              final contact = pathContacts[lastHop];
+              if (contact != null && contact.hasLocation) {
+                const offsetDeg = 0.003;
+                final angle = (tc.publicKey[1] / 255.0) * 2 * pi;
+                targetPos = LatLng(
+                  contact.latitude! + offsetDeg * cos(angle),
+                  contact.longitude! + offsetDeg * sin(angle),
+                );
+                targetGuessed = true;
+              }
            }
          }
        }
@@ -353,7 +371,12 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {

        _points = <LatLng>[];
        _points.add(LatLng(connector.selfLatitude!, connector.selfLongitude!));
+        int hopLast = 0;
+        int hopLastLast = 0;
        for (final hop in _traceData!.pathData) {
+          if (hop == hopLastLast && widget.flipPathAround) {
+            break; //skip duplicate hops in round-trip paths
+          }
          final contact = _traceData!.pathContacts[hop];
          if (contact != null && contact.hasLocation) {
            _points.add(LatLng(contact.latitude!, contact.longitude!));
@@ -361,8 +384,14 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
            final inferred = inferredPositions[hop];
            if (inferred != null) _points.add(inferred);
          }
+          hopLastLast = hopLast;
+          hopLast = hop;
+        }
+        if (targetPos != null) {
+          if (_targetContact != null && _targetContact!.type == advTypeChat) {
+            _points.add(targetPos);
+          }
        }
-        if (targetPos != null) _points.add(targetPos);
        _polylines = _points.length > 1
            ? [
                Polyline(
@@ -451,7 +480,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
                      ],
                    ),
                  ),
-                if (_hasData) _buildMapPathTrace(context, tileCache),
+                if (_hasData)
+                  _buildMapPathTrace(context, tileCache, _targetContact),
                if (_points.isEmpty &&
                    !_hasData &&
                    !_isLoading &&
@@ -480,17 +510,28 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
  List<Marker> _buildHopMarkers(
    List<int> pathData, {
    required bool showLabels,
+    required Contact? target,
  }) {
    final markers = <Marker>[];
+    int hopLast = 0;
+    int hopLastLast = 0;
    for (final hop in pathData) {
      final contact = _traceData!.pathContacts[hop];
      final inferred = _inferredHopPositions[hop];
      final hasGps = contact != null && contact.hasLocation;
-      if (!hasGps && inferred == null) continue;
+      if (hop == hopLastLast && widget.flipPathAround) {
+        continue; //skip duplicate hops in round-trip paths
+      }
+      if (!hasGps && inferred == null) {
+        hopLastLast = hopLast;
+        hopLast = hop;
+        continue; //skip hops with no GPS and no inferred position
+      }
      final point = hasGps
          ? LatLng(contact.latitude!, contact.longitude!)
          : inferred!;
      final label = hop.toRadixString(16).padLeft(2, '0').toUpperCase();
+
      markers.add(
        Marker(
          point: point,
@@ -532,6 +573,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
          ),
        );
      }
+      hopLastLast = hopLast;
+      hopLast = hop;
    }

    final selfLat = context.read<MeshCoreConnector>().selfLatitude;
@@ -581,9 +624,9 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {

    // Add target contact endpoint marker.
    final targetPos = _targetContactPosition;
-    if (targetPos != null) {
+    if (targetPos != null && target != null && target.type == advTypeChat) {
      final isGuessed = _targetContactIsGuessed;
-      final targetName = widget.targetContact?.name ?? '?';
+      final targetName = target.name;
      markers.add(
        Marker(
          point: targetPos,
@@ -719,6 +762,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
  Widget _buildMapPathTrace(
    BuildContext context,
    MapTileCacheService tileCache,
+    Contact? target,
  ) {
    return FlutterMap(
      key: _mapKey,
@@ -757,6 +801,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
            markers: _buildHopMarkers(
              _traceData!.pathData,
              showLabels: _showNodeLabels,
+              target: target,
            ),
          ),
      ],
@@ -5,6 +5,7 @@ import 'package:provider/provider.dart';

 import '../connector/meshcore_connector.dart';
 import '../l10n/l10n.dart';
+import '../services/app_settings_service.dart';
 import '../utils/platform_info.dart';
 import '../widgets/adaptive_app_bar_title.dart';
 import 'contacts_screen.dart';
@@ -27,8 +28,14 @@ class _TcpScreenState extends State<TcpScreen> {
  @override
  void initState() {
    super.initState();
-    _hostController = TextEditingController();
-    _portController = TextEditingController(text: '5000');
+    _hostController = TextEditingController(
+      text: context.read<AppSettingsService>().settings.tcpServerAddress,
+    );
+    _portController = TextEditingController(
+      text: context.read<AppSettingsService>().settings.tcpServerPort > 0
+          ? context.read<AppSettingsService>().settings.tcpServerPort.toString()
+          : '',
+    );
    _connector = context.read<MeshCoreConnector>();

    _connectionListener = () {
@@ -39,6 +46,12 @@ class _TcpScreenState extends State<TcpScreen> {
      if (_connector.state == MeshCoreConnectionState.connected &&
          _connector.isTcpTransportConnected &&
          !_navigatedToContacts) {
+        context.read<AppSettingsService>().setTcpServerAddress(
+          _hostController.text,
+        );
+        context.read<AppSettingsService>().setTcpServerPort(
+          int.tryParse(_portController.text) ?? 0,
+        );
        _navigatedToContacts = true;
        Navigator.of(context).pushReplacement(
          MaterialPageRoute(builder: (_) => const ContactsScreen()),