Auto-fetch wind, drop manual fetch/validate buttons, fix it in fly mode
Redesigns the waypoint list panel to match the drone-status/missions panels: no title bar, close button floats over the tab row, tabs get more vertical padding. Removes the "Fetch wind" and "Validate" header buttons along with the now-fully-orphaned WindValidatePanel screen and its WindService support code (fetchValidation, WindValidationResult and friends) - nothing else referenced them. Wind is now fetched automatically instead: HeaderWindNotifier gains ensurePerWaypointWind(), called when the waypoint list panel opens and when the header pill's per-waypoint toggle switches on. A lat/lon signature of the waypoint list tracks whether the fetched data is still current, so a ref.listen(currentMissionProvider) in the same notifier refetches only when the list itself changes (position added/ removed/moved) - not on every altitude/speed edit. Waypoints that already carry wind data (e.g. loaded from a saved mission) short- circuit the check instead of re-fetching pointlessly. Also wires per-waypoint wind markers into the fly-mode map, which never had them (plan_screen.dart built windMarkers; fly_screen.dart just never did) - the reported "doesn't work in fly mode" bug. windMarkerWidth() moved from a plan_screen.dart-private method to wind_marker_pill.dart so both screens can share it. Test containers in widget_test.dart now override windServiceProvider with a MockClient so the new auto-fetch trigger can't reach the real network during tests.
This commit is contained in:
@@ -27,6 +27,7 @@ import '../../providers/mission_meta_provider.dart';
|
||||
import '../../providers/system_message_log_provider.dart';
|
||||
import '../../providers/telemetry_provider.dart';
|
||||
import '../../providers/terrain_provider.dart';
|
||||
import '../../providers/wind_provider.dart';
|
||||
import '../settings/settings_screen.dart';
|
||||
import '../../widgets/drone_marker_icon.dart';
|
||||
import '../../widgets/drone_status_messages_panel.dart';
|
||||
@@ -34,6 +35,7 @@ import '../../widgets/home_point_icon.dart';
|
||||
import '../../widgets/mission_footer_bar.dart';
|
||||
import '../../widgets/mission_map.dart';
|
||||
import '../../widgets/waypoint_list_panel.dart';
|
||||
import '../../widgets/wind_marker_pill.dart';
|
||||
|
||||
/// Fly-Modus (Architektur-Doku 3.10/3.11): zeigt dieselbe Karte + Fusszeile
|
||||
/// wie der Plan-Modus, aber ohne Reticle/Draeder - im Flug wird die Route
|
||||
@@ -182,6 +184,11 @@ class _FlyScreenState extends ConsumerState<FlyScreen> {
|
||||
final telemetryAsync = ref.watch(telemetryProvider);
|
||||
final telemetry = telemetryAsync.value;
|
||||
final followDrone = ref.watch(followDroneProvider);
|
||||
// Wind-Marker pro Wegpunkt (Doku: "windanzeige pro wegpunkt im
|
||||
// flugmodus aktivieren, das funktioniert momentan nicht") - dieselbe
|
||||
// Kopfleisten-Pille/derselbe Zustand wie im Plan-Modus (PlanScreen),
|
||||
// hier bisher schlicht nie an MissionMap durchgereicht.
|
||||
final showPerWaypointWind = ref.watch(headerWindProvider).showPerWaypoint;
|
||||
// Beobachtet die automatische Ereigniserkennung (Connected/Lost/
|
||||
// Batterie/Failsafe/Verbindungstyp, Doku: "log von kritischen
|
||||
// ereignissen mit time stamp", erweitert um Verbindungsereignisse) fuer
|
||||
@@ -401,6 +408,21 @@ class _FlyScreenState extends ConsumerState<FlyScreen> {
|
||||
],
|
||||
droneMarker: droneMarker,
|
||||
homePointMarker: homePointMarker,
|
||||
windMarkers: [
|
||||
if (showPerWaypointWind)
|
||||
for (final wp in waypoints)
|
||||
if (wp.windSpeedMs != null && wp.windDirFromDeg != null)
|
||||
Marker(
|
||||
point: LatLng(wp.lat, wp.lon),
|
||||
width: windMarkerWidth(wp.windSpeedMs!),
|
||||
height: 22,
|
||||
alignment: const Alignment(1.1, -1.5),
|
||||
child: WindMarkerPill(
|
||||
speedMs: wp.windSpeedMs!,
|
||||
dirFromDeg: wp.windDirFromDeg!,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
// Live-Hoehe/-Geschwindigkeit aus der Telemetrie (HTML-Demonstrator:
|
||||
// #altReadout/#spdReadout im Fly-Modus) - anders als dort keine
|
||||
|
||||
@@ -432,7 +432,7 @@ class _PlanScreenState extends ConsumerState<PlanScreen> {
|
||||
if (wp.windSpeedMs != null && wp.windDirFromDeg != null)
|
||||
Marker(
|
||||
point: LatLng(wp.lat, wp.lon),
|
||||
width: _windMarkerWidth(wp.windSpeedMs!),
|
||||
width: windMarkerWidth(wp.windSpeedMs!),
|
||||
height: 22,
|
||||
alignment: const Alignment(1.1, -1.5),
|
||||
child: WindMarkerPill(
|
||||
@@ -556,19 +556,4 @@ class _PlanScreenState extends ConsumerState<PlanScreen> {
|
||||
borderColor: Colors.white,
|
||||
);
|
||||
}
|
||||
|
||||
/// flutter_map's Marker verlangt eine feste Breite (kein intrinsisches
|
||||
/// Sizing wie bei normalen Widgets) - eine einzelne fuer alle Faelle
|
||||
/// grosszuegig bemessene Breite liesse bei kurzen Werten (z.B. "1 m/s")
|
||||
/// sichtbaren Leerraum rechts neben dem Text. Stattdessen je Ziffernzahl
|
||||
/// berechnet (per Widget-Messung ermittelt: +11px/Ziffer, siehe
|
||||
/// WindMarkerPill).
|
||||
double _windMarkerWidth(double speedMs) {
|
||||
final digits = speedMs.round().abs().toString().length;
|
||||
// +1px Puffer: MarkerLayer rendert ueber eine eigene Transform-/
|
||||
// OverflowBox-Kette, die im echten Baum minimal (< 1px) anders rundet
|
||||
// als eine isolierte Messung - ohne Puffer fuehrte das zu einem
|
||||
// 0.25px-Overflow.
|
||||
return 81.0 + digits * 11.0;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user