Merge branch 'refs/heads/main' into prod/festapp

vkh-cr · Aug 13, 2024 · 431a39d · 431a39d
2 parents e009710 + 812a999
commit 431a39d
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/lib/pages/MapPage.dart b/lib/pages/MapPage.dart
@@ -88,6 +88,13 @@ class _MapPageState extends State<MapPage> with TickerProviderStateMixin {
           offlinePlaces.where((element) => !element.isHidden).toList();
     }
 
+    if(placeId != null) {
+      var p = offlinePlaces.firstWhereOrNull((p)=>p.id == placeId);
+      if(p != null) {
+        mapOfflinePlaces.add(p);
+      }
+    }
+
     await addEventsToPlace(mapOfflinePlaces);
     addPlacesToMap(mapOfflinePlaces);
 
@@ -100,6 +107,8 @@ class _MapPageState extends State<MapPage> with TickerProviderStateMixin {
 
     _icons = await DataService.getAllIcons();
     List<PlaceModel> mapPlaces = [];
+    List<PlaceModel> showMapPlaces = [];
+
     if (loadOtherGroups) {
       var groups = await DataService.getGroupsWithPlaces();
       for (var element in groups) {
@@ -111,15 +120,22 @@ class _MapPageState extends State<MapPage> with TickerProviderStateMixin {
       }
     } else {
       mapPlaces = await DataService.getAllPlaces();
-      mapPlaces = mapPlaces.where((p)=>!p.isHidden).toList();
-      mapPlaces.sortPlaces(false);
+      showMapPlaces = mapPlaces.where((p)=>!p.isHidden).toList();
+      showMapPlaces.sortPlaces(false);
       await OfflineDataHelper.saveAllPlaces(mapPlaces);
     }
 
-    if (mapPlaces.isNotEmpty) {
+    if(placeId != null) {
+      var p = mapPlaces.firstWhereOrNull((p)=>p.id == placeId);
+      if(p != null) {
+        showMapPlaces.add(p);
+      }
+    }
+
+    if (showMapPlaces.isNotEmpty) {
       _markers.clear();
-      await addEventsToPlace(mapPlaces);
-      addPlacesToMap(mapPlaces);
+      await addEventsToPlace(showMapPlaces);
+      addPlacesToMap(showMapPlaces);
     }
 
     if(placeId != null) {