Added GeoConverter.kt and various minor fixes

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
         android:name=".MainApplication"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -16,7 +17,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Look4Sat.Main"
-        tools:targetApi="31">
+        tools:targetApi="33">
 
         <activity
             android:name=".MainActivity"

app/src/main/java/com/rtbishop/look4sat/MainContainer.kt

@@ -11,7 +11,6 @@ import com.rtbishop.look4sat.data.database.MainDatabase
 import com.rtbishop.look4sat.data.framework.BluetoothReporter
 import com.rtbishop.look4sat.data.framework.NetworkReporter
 import com.rtbishop.look4sat.data.framework.SettingsRepo
-import com.rtbishop.look4sat.data.repository.DataParser
 import com.rtbishop.look4sat.data.repository.DatabaseRepo
 import com.rtbishop.look4sat.data.repository.SatelliteRepo
 import com.rtbishop.look4sat.data.repository.SelectionRepo
@@ -22,20 +21,25 @@ import com.rtbishop.look4sat.domain.repository.IDatabaseRepo
 import com.rtbishop.look4sat.domain.repository.ISatelliteRepo
 import com.rtbishop.look4sat.domain.repository.ISelectionRepo
 import com.rtbishop.look4sat.domain.repository.ISettingsRepo
+import com.rtbishop.look4sat.domain.source.IDataSource
 import com.rtbishop.look4sat.domain.source.ISensorSource
+import com.rtbishop.look4sat.domain.utility.DataParser
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
+import okhttp3.Cache
 import okhttp3.OkHttpClient
 import org.osmdroid.config.Configuration
 
 class MainContainer(private val context: Context) {
 
-    private val database = Room.databaseBuilder(context, MainDatabase::class.java, "Look4SatDb")
-        .addMigrations(MIGRATION_1_2).fallbackToDestructiveMigration().build()
+    private val database =
+        Room.databaseBuilder(context, MainDatabase::class.java, "Look4SatDb").addMigrations(MIGRATION_1_2)
+            .fallbackToDestructiveMigration().build()
     private val localStorage = LocalStorage(database.storageDao())
     private val mainHandler = CoroutineExceptionHandler { _, error -> println("Look4Sat: $error") }
+    private val remoteSource = provideRemoteSource()
     val mainScope = CoroutineScope(SupervisorJob() + Dispatchers.Default + mainHandler)
     val settingsRepo = provideSettingsRepo()
     val databaseRepo = provideDatabaseRepo()
@@ -57,11 +61,15 @@ class MainContainer(private val context: Context) {
         return SensorSource(sensorManager, sensor)
     }
 
+    private fun provideRemoteSource(): IDataSource {
+        val cache = Cache(context.cacheDir, 1000 * 1000 * 10L)
+        val httpClient = OkHttpClient.Builder().cache(cache).build()
+        return DataSource(context.contentResolver, httpClient, Dispatchers.IO)
+    }
+
     private fun provideDatabaseRepo(): IDatabaseRepo {
-        val httpClient = OkHttpClient.Builder().build()
         val dataParser = DataParser(Dispatchers.Default)
-        val dataSource = DataSource(context.contentResolver, httpClient, Dispatchers.IO)
-        return DatabaseRepo(Dispatchers.Default, dataParser, dataSource, localStorage, settingsRepo)
+        return DatabaseRepo(Dispatchers.Default, dataParser, remoteSource, localStorage, settingsRepo)
     }
 
     private fun provideSatelliteRepo(): ISatelliteRepo {