Merge pull request 'precision medium - more fast geolocation' (#18) from hotfix/geolocation-slow into main

Reviewed-on: #18
This commit is contained in:
v4l3n71n 2024-11-20 23:20:51 +01:00
commit a7d8bebe1f
2 changed files with 77 additions and 45 deletions

View File

@ -1,3 +1,4 @@
import 'package:covas_mobile/classes/alert.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:flutter_dotenv/flutter_dotenv.dart'; // Import dotenv import 'package:flutter_dotenv/flutter_dotenv.dart'; // Import dotenv
@ -50,21 +51,37 @@ class _MyHomePageState extends State<ListItemMenu> {
// Fetching events from API // Fetching events from API
static Future<List<Events>> getPosts() async { static Future<List<Events>> getPosts() async {
PermissionStatus status = await Permission.location.status; PermissionStatus status = await Permission.location.status;
final List<Events> body = [];
var url = Uri.parse("${globals.api}/events"); var url = Uri.parse("${globals.api}/events");
if (status.isGranted) { if (status.isGranted) {
print("Location permission granted"); print("Location permission granted");
// Get the current position with high accuracy // Get the current position with high accuracy
LocationSettings locationSettings = LocationSettings(
accuracy: LocationAccuracy.high,
distanceFilter:
10, // Optional: Minimum distance (in meters) to trigger location update
);
Position position = await Geolocator.getCurrentPosition( const LocationSettings locationSettings = LocationSettings(
locationSettings: locationSettings, accuracy: LocationAccuracy.medium,
timeLimit: Duration(seconds: 5),
); );
Position? position;
try {
position = await Geolocator.getCurrentPosition(
locationSettings: locationSettings);
} on LocationServiceDisabledException {
// Handle location services disabled
print('Location services are disabled.');
position = await Geolocator.getLastKnownPosition();
if (position == null) {
print('No last known position available.');
}
} catch (e) {
// Handle other errors
print('Failed to get location: $e');
position = await Geolocator.getLastKnownPosition();
if (position == null) {
print('No last known position available.');
}
}
if (position != null) {
// Calculate the boundaries // Calculate the boundaries
double radiusInKm = 50; double radiusInKm = 50;
double latDistance = radiusInKm / 111.0; double latDistance = radiusInKm / 111.0;
@ -82,7 +99,7 @@ class _MyHomePageState extends State<ListItemMenu> {
} }
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
var accessToken = prefs.getString("access_token") ?? ""; var accessToken = prefs.getString("access_token") ?? "";
final List<Events> body = [];
if (accessToken.isNotEmpty) { if (accessToken.isNotEmpty) {
final response = await http.get(url, headers: { final response = await http.get(url, headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
@ -91,6 +108,7 @@ class _MyHomePageState extends State<ListItemMenu> {
final List body = json.decode(utf8.decode(response.bodyBytes)); final List body = json.decode(utf8.decode(response.bodyBytes));
return body.map((e) => Events.fromJson(e)).toList(); return body.map((e) => Events.fromJson(e)).toList();
} }
}
return body; return body;
} }

View File

@ -141,19 +141,33 @@ class _MapboxPagesState extends State<MapboxPages> with ShowErrorDialog {
"Location permissions are permanently denied. Enable them in settings."); "Location permissions are permanently denied. Enable them in settings.");
return; return;
} }
LocationSettings locationSettings = LocationSettings( const LocationSettings locationSettings = LocationSettings(
accuracy: LocationAccuracy.high, accuracy: LocationAccuracy.medium, timeLimit: Duration(seconds: 5));
distanceFilter: Position? position;
10, // Optional: Minimum distance (in meters) to trigger location update try {
); position = await Geolocator.getCurrentPosition(
locationSettings: locationSettings);
Position position = await Geolocator.getCurrentPosition( } on LocationServiceDisabledException {
locationSettings: locationSettings, // Handle location services disabled
); print('Location services are disabled.');
position = await Geolocator.getLastKnownPosition();
if (position == null) {
print('No last known position available.');
}
} catch (e) {
// Handle other errors
print('Failed to get location: $e');
position = await Geolocator.getLastKnownPosition();
if (position == null) {
print('No last known position available.');
}
}
if (position != null) {
setState(() { setState(() {
userPosition = LatLng(position.latitude, position.longitude); userPosition = LatLng(position!.latitude, position!.longitude);
isUserPositionInitialized = true; isUserPositionInitialized = true;
}); });
}
_initToken(); _initToken();
_getEventInfo(); _getEventInfo();
} catch (e) { } catch (e) {