From 4e5195af24185e59b2d5dbf2f829365ca53b2f68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20M=2E=20aka=20Menion?= Date: Tue, 16 Apr 2024 12:00:59 +0200 Subject: [PATCH] - fix: complile fixes --- .../features/augmentedReality/UtilsAddonAR.kt | 3 ++- .../java/locus/api/android/utils/LocusUtils.kt | 18 ++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/locus-api-android/src/main/java/locus/api/android/features/augmentedReality/UtilsAddonAR.kt b/locus-api-android/src/main/java/locus/api/android/features/augmentedReality/UtilsAddonAR.kt index b6be99f..446f3d7 100644 --- a/locus-api-android/src/main/java/locus/api/android/features/augmentedReality/UtilsAddonAR.kt +++ b/locus-api-android/src/main/java/locus/api/android/features/augmentedReality/UtilsAddonAR.kt @@ -12,6 +12,7 @@ import locus.api.objects.Storable import locus.api.objects.extra.Location import locus.api.objects.geoData.Track import java.security.NoSuchAlgorithmException +import kotlin.math.abs object UtilsAddonAR { @@ -116,7 +117,7 @@ object UtilsAddonAR { // do some tests if is really need to send new location val timeDiff = loc.time - mLastLocation!!.time val distDiff = loc.distanceTo(mLastLocation!!).toDouble() - val altDiff = Math.abs(loc.altitude - mLastLocation!!.altitude) + val altDiff = abs((loc.altitude ?: 0.0) - (mLastLocation?.altitude ?: 0.0)) if (timeDiff < 5000 || distDiff < 5 && altDiff < 10) { return } diff --git a/locus-api-android/src/main/java/locus/api/android/utils/LocusUtils.kt b/locus-api-android/src/main/java/locus/api/android/utils/LocusUtils.kt index 59dcd1a..31d3143 100644 --- a/locus-api-android/src/main/java/locus/api/android/utils/LocusUtils.kt +++ b/locus-api-android/src/main/java/locus/api/android/utils/LocusUtils.kt @@ -156,8 +156,6 @@ object LocusUtils { versions.add(lv) } } catch (ignored: PackageManager.NameNotFoundException) { -// Logger.logD(TAG, "getAvailableVersions($ctx), " + -// "e: $ignored") } } @@ -423,17 +421,17 @@ object LocusUtils { loc.longitude = oldLoc.longitude loc.latitude = oldLoc.latitude loc.time = oldLoc.time - if (oldLoc.hasAccuracyHor) { - loc.accuracy = oldLoc.accuracyHor + oldLoc.accuracyHor?.let { + loc.accuracy = it } - if (oldLoc.hasAltitude) { - loc.altitude = oldLoc.altitude + oldLoc.altitude?.let { + loc.altitude = it } - if (oldLoc.hasBearing) { - loc.bearing = oldLoc.bearing + oldLoc.bearing?.let { + loc.bearing = it } - if (oldLoc.hasSpeed) { - loc.speed = oldLoc.speed + oldLoc.speed?.let { + loc.speed = it } return loc }