code refactoring

canopas · Dec 27, 2024 · 47712af · 47712af
1 parent 3cf5cf5
commit 47712af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/lib/ui/flow/geofence/add/locate/locate_on_map_view_model.dart b/app/lib/ui/flow/geofence/add/locate/locate_on_map_view_model.dart
@@ -51,7 +51,7 @@ class LocateOnMapVieNotifier extends StateNotifier<LocateOnMapState> {
             await locationService.getCurrentLocation(_currentUser.id);
         if (location != null) {
           final latLng =
-              LatLng(location.first.latitude, location.first.longitude);
+              LatLng(location.latitude, location.longitude);
           state = state.copyWith(
             currentLatLng: latLng,
             centerPosition:

diff --git a/data/lib/service/location_service.dart b/data/lib/service/location_service.dart
@@ -42,15 +42,15 @@ class LocationService {
     });
   }
 
-  Future<List<ApiLocation>?> getCurrentLocation(String userId) async {
+  Future<ApiLocation?> getCurrentLocation(String userId) async {
     var snapshot = await _locationRef(userId)
         .where("user_id", isEqualTo: userId)
         .orderBy('created_at', descending: true)
         .limit(1)
         .get();
 
     if (snapshot.docs.isNotEmpty) {
-      return snapshot.docs.map((doc) => doc.data() as ApiLocation).toList();
+      return snapshot.docs.map((doc) => doc.data() as ApiLocation).first;
     }
     return null;
   }