diff --git a/app/lib/consts.dart b/app/lib/consts.dart index 371b45594809d68f8eca0ee65f022583b6147631..720bc10c9f02b6922f9fb9e44ffc38e7ad031773 100644 --- a/app/lib/consts.dart +++ b/app/lib/consts.dart @@ -11,7 +11,6 @@ const String mapEndpoint = "update_map"; // Map variables String selectedLake = 'Mjøsa'; // NB should be initialised to last selected lake - Uint8List selectedRelation = Uint8List(0); // Initialised in init_state.dart List<Measurement> selectedMeasurements = []; List<SubDiv> selectedSubdivisions = []; diff --git a/app/lib/server_requests/init_state.dart b/app/lib/server_requests/init_state.dart index 0d0ef7343f15632ea48ed5d68dfad3686faf21e7..f1bfdf1f38f64d1c5e033d1541833ff42019e459 100644 --- a/app/lib/server_requests/init_state.dart +++ b/app/lib/server_requests/init_state.dart @@ -74,8 +74,12 @@ Future<void> initialiseState(bool fetchSearchOptions) async { initSearchOptions(); } - //selectedRelation = await relationFuture; - selectedRelation = await relationFuture; // NB update once fixed + // Last lake initialised to last persistent variable, or Mjøsa if the variable is not found + final prefs = await SharedPreferences.getInstance(); + selectedLake = prefs.getString('lasLake') ?? "Mjøsa"; + + // Set the selected relation + selectedRelation = await relationFuture; selectedMeasurements = await markerListFuture; } } catch (e) {