From ac3e8310d14a5ba09536752e5a412221c4de3c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Tue, 18 Dec 2018 19:13:59 +0100 Subject: [PATCH] On presence mode only on WMI --- .../findmytutor/service/BackgroundLocalizationService.java | 5 +++++ .../main/java/com/uam/wmi/findmytutor/utils/MapUtils.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/service/BackgroundLocalizationService.java b/app/src/main/java/com/uam/wmi/findmytutor/service/BackgroundLocalizationService.java index 3d3bdef..0417d17 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/service/BackgroundLocalizationService.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/service/BackgroundLocalizationService.java @@ -330,7 +330,12 @@ public class BackgroundLocalizationService extends Service { String locationLevel = PrefUtils.getLocationLevel(getApplicationContext()); String status = (PrefUtils.isStatusEnabled(getApplicationContext())) ? PrefUtils.getUserStatus(getApplicationContext()) : ""; + if (locationLevel.equals(SharingLevel.PRESENCE.toString())) { + if(!MapUtils.checkIfCoordinateIsValid(latitude,longitude)){ + return null; + } + latitude = presenceLatitude; longitude = presenceLongitude; approximatedBuildingPart = presenceApproximatedName; diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/MapUtils.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/MapUtils.java index 3164e2b..cabb845 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/utils/MapUtils.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/MapUtils.java @@ -77,6 +77,10 @@ public class MapUtils { return outsideLatitudeRange.contains(coordinate.getLatitude()) && outsideLongitudeRange.contains(coordinate.getLongitude()); } + public static Boolean checkIfCoordinateIsValid(Double latitude, Double longitude){ + return Const.buildingLatitudeRange.contains(latitude) && Const.buildingLongitudeRange.contains(longitude); + } + // Function for marker animation public static class LatLngEvaluator implements TypeEvaluator { // Method is used to interpolate the marker animation.