Persist the ground elevation profile with the mission
The Mini-Altitude-Profile terrain data only ever lived in TerrainNotifier's in-memory state (one slot, keyed by route). Every app restart, or every switch away from and back to a mission, forced a full re-fetch of all AWS Terrarium elevation tiles for the route - the noticeably slow load the user reported for some missions was this happening on every visit, not just once. Adds a nullable terrainProfileJson column to the missions table (schema v6->v7) and a saveTerrainProfile() repository method, kept separate from the regular waypoint upsert() so an ordinary autosave never clobbers an already-cached profile. TerrainNotifier persists a profile right after a successful fetch (fire-and-forget) and gains restore(), called from CurrentMissionMetaNotifier whenever a mission is loaded/ started so a previously fetched profile is available immediately - ensureFor() still validates its routeKey before use, so a stale restored profile is never shown for a route that has since changed. Also included in mission export/import (MissionExportData/ ParsedMissionImport) so sharing a mission carries its terrain cache along instead of forcing the recipient to refetch it. Sample-count/resolution stays as-is for now (still fixed 30m spacing, 10-2000 samples) - adapting the sampling density to terrain variance (e.g. coarser sampling over flat ground) is a separate follow-up. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
4e94102861
commit
35351140ae
@@ -7,6 +7,7 @@ import 'current_mission_provider.dart';
|
||||
import 'database_provider.dart';
|
||||
import 'follow_drone_provider.dart';
|
||||
import 'map_controller_provider.dart';
|
||||
import 'terrain_provider.dart';
|
||||
|
||||
/// Metadaten der aktuell in Bearbeitung befindlichen Mission - ergaenzt
|
||||
/// currentMissionProvider (das nur die Wegpunkte haelt) um Name/Ort und die
|
||||
@@ -58,6 +59,7 @@ class CurrentMissionMetaNotifier extends Notifier<MissionMeta> {
|
||||
ref.read(currentMissionProvider.notifier).replaceAll(loaded.waypoints);
|
||||
_suppressAutosave = false;
|
||||
state = MissionMeta(id: missionId, name: loaded.name, placeName: loaded.placeName);
|
||||
ref.read(terrainProvider.notifier).restore(loaded.terrainProfile);
|
||||
_fitMapToWaypoints(loaded.waypoints);
|
||||
}
|
||||
|
||||
@@ -77,6 +79,7 @@ class CurrentMissionMetaNotifier extends Notifier<MissionMeta> {
|
||||
ref.read(currentMissionProvider.notifier).replaceAll(const []);
|
||||
_suppressAutosave = false;
|
||||
state = newState;
|
||||
ref.read(terrainProvider.notifier).restore(null);
|
||||
await ref.read(appSettingsRepositoryProvider).setCurrentMissionId(null);
|
||||
}
|
||||
|
||||
@@ -89,6 +92,7 @@ class CurrentMissionMetaNotifier extends Notifier<MissionMeta> {
|
||||
ref.read(currentMissionProvider.notifier).replaceAll(loaded.waypoints);
|
||||
_suppressAutosave = false;
|
||||
state = MissionMeta(id: id, name: loaded.name, placeName: loaded.placeName);
|
||||
ref.read(terrainProvider.notifier).restore(loaded.terrainProfile);
|
||||
_fitMapToWaypoints(loaded.waypoints);
|
||||
await ref.read(appSettingsRepositoryProvider).setCurrentMissionId(id);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||
|
||||
import '../../domain/mission/terrain_math.dart';
|
||||
import '../../domain/waypoint/flat_waypoint_list.dart';
|
||||
import '../../services/terrain/terrain_service.dart';
|
||||
import 'database_provider.dart';
|
||||
|
||||
final terrainServiceProvider = Provider<TerrainService>((ref) => TerrainService());
|
||||
|
||||
@@ -30,7 +33,22 @@ class TerrainNotifier extends Notifier<TerrainState> {
|
||||
@override
|
||||
TerrainState build() => const TerrainState();
|
||||
|
||||
Future<void> ensureFor(List<Waypoint> waypoints) async {
|
||||
/// Uebernimmt ein bereits vorliegendes Profil direkt, ohne einen
|
||||
/// Netzwerkabruf auszuloesen - genutzt beim Laden einer gespeicherten
|
||||
/// Mission (Doku 3.9: persistiertes Profil) bzw. zum Zuruecksetzen beim
|
||||
/// Start/Wechsel einer Mission. ensureFor() prueft dessen routeKey wie
|
||||
/// gewohnt, bevor es angezeigt wird, ein veraltetes Profil wird also nie
|
||||
/// faelschlich fuer eine inzwischen andere Route benutzt.
|
||||
void restore(TerrainProfile? profile) {
|
||||
state = TerrainState(profile: profile);
|
||||
}
|
||||
|
||||
/// [missionId] persistiert ein frisch abgerufenes Profil an der
|
||||
/// gespeicherten Mission (Doku 3.9), damit ein erneutes Oeffnen derselben
|
||||
/// Mission nicht wieder alle Kacheln neu laden muss - null, solange die
|
||||
/// Mission noch nie gespeichert wurde (dann bleibt nur der In-Memory-Cache
|
||||
/// dieser Notifier-Instanz).
|
||||
Future<void> ensureFor(List<Waypoint> waypoints, {int? missionId}) async {
|
||||
if (waypoints.length < 2) {
|
||||
if (state.profile != null) state = const TerrainState();
|
||||
return;
|
||||
@@ -48,6 +66,11 @@ class TerrainNotifier extends Notifier<TerrainState> {
|
||||
return;
|
||||
}
|
||||
state = TerrainState(profile: profile ?? state.profile, loading: false);
|
||||
if (profile != null && missionId != null) {
|
||||
unawaited(
|
||||
ref.read(missionRepositoryProvider).saveTerrainProfile(missionId, profile),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -229,6 +229,7 @@ class _MissionsDronesPanelState extends ConsumerState<MissionsDronesPanel> {
|
||||
placeName: full.placeName,
|
||||
createdAt: full.createdAt,
|
||||
waypoints: full.waypoints,
|
||||
terrainProfile: full.terrainProfile,
|
||||
));
|
||||
await ref.read(sharingServiceProvider).shareJsonFile(
|
||||
json: json,
|
||||
@@ -251,11 +252,16 @@ class _MissionsDronesPanelState extends ConsumerState<MissionsDronesPanel> {
|
||||
messenger.showSnackBar(SnackBar(content: Text(e.message)));
|
||||
return;
|
||||
}
|
||||
await ref.read(missionRepositoryProvider).upsert(
|
||||
final id = await ref.read(missionRepositoryProvider).upsert(
|
||||
name: parsed.name,
|
||||
placeName: parsed.placeName,
|
||||
waypoints: parsed.waypoints,
|
||||
);
|
||||
if (parsed.terrainProfile != null) {
|
||||
await ref
|
||||
.read(missionRepositoryProvider)
|
||||
.saveTerrainProfile(id, parsed.terrainProfile!);
|
||||
}
|
||||
if (parsed.versionMismatch != null) {
|
||||
messenger.showSnackBar(SnackBar(
|
||||
content: Text(
|
||||
|
||||
@@ -9,6 +9,7 @@ import '../../domain/waypoint/flat_waypoint_list.dart';
|
||||
import '../../domain/wind/wind_math.dart';
|
||||
import '../providers/active_drone_profile_provider.dart';
|
||||
import '../providers/current_mission_provider.dart';
|
||||
import '../providers/mission_meta_provider.dart';
|
||||
import '../providers/terrain_provider.dart';
|
||||
import '../providers/wind_provider.dart';
|
||||
import 'full_value_chart.dart';
|
||||
@@ -92,7 +93,10 @@ class _WaypointListPanelState extends ConsumerState<WaypointListPanel> {
|
||||
// werden - sonst passiert das erst beim (dann gar nicht mehr
|
||||
// stattfindenden) Antippen des Tab-Buttons.
|
||||
if (_tab == PanelTab.altitude) {
|
||||
ref.read(terrainProvider.notifier).ensureFor(ref.read(currentMissionProvider));
|
||||
ref.read(terrainProvider.notifier).ensureFor(
|
||||
ref.read(currentMissionProvider),
|
||||
missionId: ref.read(currentMissionMetaProvider).id,
|
||||
);
|
||||
}
|
||||
});
|
||||
// Laedt/aktualisiert das Gelaendeprofil (Doku 3.9) nur, waehrend der
|
||||
@@ -102,7 +106,10 @@ class _WaypointListPanelState extends ConsumerState<WaypointListPanel> {
|
||||
// erneuter Kachel-Download noetig ist.
|
||||
ref.listenManual(currentMissionProvider, (previous, next) {
|
||||
if (_tab == PanelTab.altitude) {
|
||||
ref.read(terrainProvider.notifier).ensureFor(next);
|
||||
ref.read(terrainProvider.notifier).ensureFor(
|
||||
next,
|
||||
missionId: ref.read(currentMissionMetaProvider).id,
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -272,7 +279,10 @@ class _WaypointListPanelState extends ConsumerState<WaypointListPanel> {
|
||||
if (tab == PanelTab.list) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) => _scrollToActive());
|
||||
} else if (tab == PanelTab.altitude) {
|
||||
ref.read(terrainProvider.notifier).ensureFor(ref.read(currentMissionProvider));
|
||||
ref.read(terrainProvider.notifier).ensureFor(
|
||||
ref.read(currentMissionProvider),
|
||||
missionId: ref.read(currentMissionMetaProvider).id,
|
||||
);
|
||||
}
|
||||
},
|
||||
child: Container(
|
||||
|
||||
Reference in New Issue
Block a user