fix(#55) : fixes a bug 'makers on the small map not showing' by refac…

…toring the code and calling the setState as soon as markers init
JordyHers-org · Jun 7, 2023 · 37825a0 · 37825a0
1 parent dae4a35
commit 37825a0
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 37 deletions.
diff --git a/lib/app/config/geo_full.dart b/lib/app/config/geo_full.dart
@@ -41,11 +41,11 @@ class _GeoFullState extends State<GeoFull> {
     geoService.getCurrentLocation.listen((position) {
       centerScreen(position);
     });
-    getAllChildLocations();
+    _getAllChildLocations();
     super.initState();
   }
 
-  Future<Uint8List> getChildMarkerImage(Map<String, dynamic> data) async {
+  Future<Uint8List> _getChildMarkerImage(Map<String, dynamic> data) async {
     var bytes =
         (await NetworkAssetBundle(Uri.parse(data['image'])).load(data['image']))
             .buffer
@@ -54,7 +54,7 @@ class _GeoFullState extends State<GeoFull> {
     return bytes;
   }
 
-  void getAllChildLocations() async {
+  void _getAllChildLocations() async {
     childLocationsList = [];
     await FirebaseFirestore.instance
         .collection(APIPath.children(_currentUser.uid))
@@ -63,8 +63,8 @@ class _GeoFullState extends State<GeoFull> {
       if (document.docs.isNotEmpty) {
         for (var i = 0; i < document.docs.length; i++) {
           childLocationsList.add(document.docs[i].data);
-          initMarker(document.docs[i].data());
-          getChildMarkerImage(document.docs[i].data());
+          _initMarker(document.docs[i].data());
+          _getChildMarkerImage(document.docs[i].data());
           debugPrint(
             'This is the list of children ${childLocationsList.length}',
           );
@@ -74,8 +74,9 @@ class _GeoFullState extends State<GeoFull> {
   }
 
   //TODO:Make function async
-  Future<List<Marker>> initMarker(Map<String, dynamic> data) async {
+  Future<List<Marker>> _initMarker(Map<String, dynamic> data) async {
     if (data['position'] == null) return [];
+    allMarkers.clear();
 
     allMarkers.add(
       Marker(
@@ -94,7 +95,10 @@ class _GeoFullState extends State<GeoFull> {
         onTap: () {
           debugPrint('Marker Tapped');
         },
-        position: LatLng(data['position'].latitude, data['position'].longitude),
+        position: LatLng(
+          data['position'].latitude,
+          data['position'].longitude,
+        ),
       ),
     );
 
@@ -116,15 +120,14 @@ class _GeoFullState extends State<GeoFull> {
           ),
           mapType: MapType.normal,
           myLocationEnabled: true,
+          markers: Set<Marker>.of(allMarkers),
           onMapCreated: (GoogleMapController controller) {
             _controller.complete(controller);
-            if (allMarkers.isEmpty) return;
             setState(() {
               markers[MarkerId(allMarkers.first.markerId.value)] =
                   allMarkers.first;
             });
           },
-          markers: Set<Marker>.of(allMarkers),
         ),
       ),
     );

diff --git a/lib/app/config/geo_location.dart b/lib/app/config/geo_location.dart
@@ -60,28 +60,27 @@ class _GeoState extends State<Geo> {
     await FirebaseFirestore.instance
         .collection(APIPath.children(_currentUser.uid))
         .get()
-        .then((document) {
-      if (document.docs.isNotEmpty) {
-        for (var i = 0; i < document.docs.length; i++) {
-          childLocationsList.add(document.docs[i].data);
-          initMarker(document.docs[i].data());
-          _getChildMarkerImage(document.docs[i].data());
-          debugPrint(
-            'This is the list of children ${childLocationsList.length}',
-          );
+        .then(
+      (document) {
+        if (document.docs.isNotEmpty) {
+          for (var i = 0; i < document.docs.length; i++) {
+            childLocationsList.add(document.docs[i].data);
+            _initMarker(document.docs[i].data());
+            _getChildMarkerImage(document.docs[i].data());
+            debugPrint(
+              'This is the list of children ${childLocationsList.length}',
+            );
+          }
         }
-      }
-    });
+      },
+    );
   }
 
   //TODO:Make function async
-  Future<List<Marker>> initMarker(Map<String, dynamic> data) async {
-    debugPrint('--------------- data -------------');
-    debugPrint(data['id']);
-    debugPrint(data['position']?.latitude);
-    debugPrint(data['position']?.longitude);
+  Future<List<Marker>> _initMarker(Map<String, dynamic> data) async {
     if (data['position'] == null) return [];
-
+    allMarkers.clear();
+
     allMarkers.add(
       Marker(
         infoWindow: InfoWindow(
@@ -101,10 +100,20 @@ class _GeoState extends State<Geo> {
         onTap: () {
           debugPrint('Marker Tapped');
         },
-        position: LatLng(data['position'].latitude, data['position'].longitude),
+        position: LatLng(
+          data['position'].latitude,
+          data['position'].longitude,
+        ),
       ),
     );
     debugPrint(allMarkers.toString());
+    if (allMarkers.isEmpty) return [];
+    if (!mounted) return [];
+    setState(() {
+      markers[MarkerId(
+        allMarkers.first.markerId.value,
+      )] = allMarkers.first;
+    });
     return allMarkers;
   }
 
@@ -114,25 +123,19 @@ class _GeoState extends State<Geo> {
       height: 300,
       margin: EdgeInsets.all(10),
       child: GoogleMap(
-        padding: EdgeInsets.all(10),
-        mapType: MapType.normal,
-        myLocationEnabled: true,
-        markers: Set<Marker>.of(allMarkers),
         initialCameraPosition: CameraPosition(
           target: LatLng(
             widget.initialPosition.latitude,
             widget.initialPosition.longitude,
           ),
           zoom: 15,
         ),
+        mapType: MapType.normal,
+        myLocationEnabled: true,
+        padding: EdgeInsets.all(10),
+        markers: Set<Marker>.of(allMarkers),
         onMapCreated: (GoogleMapController controller) {
           _controller.complete(controller);
-          if (allMarkers.isEmpty) return;
-          setState(() {
-            markers[MarkerId(
-              allMarkers.first.markerId.value,
-            )] = allMarkers.first;
-          });
         },
       ),
     );