Bumped SDK version, further changes to predict4kotlin

This commit is contained in:
Arty Bishop committed 2021-09-10 17:33:42 +01:00
1 parent 60a67f86b6
commit c38fe8b10f
6 files changed
+54 -243

No files matched your search

+3 -3
View File
@@ -6,14 +6,14 @@ plugins {
}
android {
compileSdkVersion 30
buildToolsVersion "30.0.3"
compileSdkVersion 31
buildToolsVersion "31.0.0"
defaultConfig {
applicationId "com.rtbishop.look4sat"
minSdkVersion 23
resConfigs "en,ru"
targetSdkVersion 30
targetSdkVersion 31
versionCode 253
versionName "2.5.3"
}
+1
View File
@@ -3,6 +3,7 @@
package="com.rtbishop.look4sat">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<application
@@ -23,6 +23,7 @@ import com.rtbishop.look4sat.data.SatDataRepository
import com.rtbishop.look4sat.domain.predict4kotlin.Position
import com.rtbishop.look4sat.domain.predict4kotlin.Satellite
import com.rtbishop.look4sat.domain.predict4kotlin.StationPosition
import com.rtbishop.look4sat.domain.predict4kotlin.getRangeCircle
import com.rtbishop.look4sat.framework.model.SatData
import com.rtbishop.look4sat.injection.DefaultDispatcher
import dagger.hilt.android.lifecycle.HiltViewModel
@@ -154,7 +155,7 @@ class SatMapViewModel @Inject constructor(
private suspend fun setSelectedSatFootprint(sat: Satellite, gsp: StationPosition, date: Date) {
withContext(defaultDispatcher) {
val satFootprint = sat.getPredictor(gsp).getRangeCircle(date).map { rangePos ->
val satFootprint = sat.getPosition(gsp, date).getRangeCircle().map { rangePos ->
val osmLat = clipLat(rangePos.latitude)
val osmLon = clipLon(rangePos.longitude)
Position(osmLat, osmLon)