Slightly changed classes structure for readability

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

@@ -35,7 +35,7 @@ class MainApplication : Application() {
         enableStrictMode()
         super.onCreate()
         container = MainContainer(this)
-        container.mainScope.launch { checkAutoUpdate() }
+        container.appScope.launch { checkAutoUpdate() }
     }
 
     private suspend fun checkAutoUpdate() {

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

@@ -6,25 +6,23 @@ import android.hardware.Sensor
 import android.hardware.SensorManager
 import android.location.LocationManager
 import androidx.room.Room
-import com.rtbishop.look4sat.data.database.MainDatabase
+import com.rtbishop.look4sat.data.database.Look4SatDb
 import com.rtbishop.look4sat.data.framework.BluetoothReporter
 import com.rtbishop.look4sat.data.framework.NetworkReporter
 import com.rtbishop.look4sat.data.repository.DatabaseRepo
 import com.rtbishop.look4sat.data.repository.SatelliteRepo
 import com.rtbishop.look4sat.data.repository.SelectionRepo
+import com.rtbishop.look4sat.data.repository.SensorsRepo
 import com.rtbishop.look4sat.data.repository.SettingsRepo
-import com.rtbishop.look4sat.data.source.FileSource
 import com.rtbishop.look4sat.data.source.LocalSource
 import com.rtbishop.look4sat.data.source.RemoteSource
-import com.rtbishop.look4sat.data.source.SensorSource
 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.ISensorsRepo
 import com.rtbishop.look4sat.domain.repository.ISettingsRepo
-import com.rtbishop.look4sat.domain.source.IFileSource
 import com.rtbishop.look4sat.domain.source.ILocalSource
 import com.rtbishop.look4sat.domain.source.IRemoteSource
-import com.rtbishop.look4sat.domain.source.ISensorSource
 import com.rtbishop.look4sat.domain.utility.DataParser
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.CoroutineScope
@@ -37,7 +35,8 @@ import org.osmdroid.config.Configuration
 class MainContainer(private val context: Context) {
 
     private val localSource = provideLocalSource()
-    val mainScope = provideMainScope()
+    private val mainHandler = CoroutineExceptionHandler { _, error -> println("MainHandler: $error") }
+    val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Default + mainHandler)
     val settingsRepo = provideSettingsRepo()
     val selectionRepo = provideSelectionRepo()
     val satelliteRepo = provideSatelliteRepo()
@@ -52,40 +51,30 @@ class MainContainer(private val context: Context) {
         return NetworkReporter(CoroutineScope(Dispatchers.IO))
     }
 
-    fun provideSensorSource(): ISensorSource {
+    fun provideSensorsRepo(): ISensorsRepo {
         val manager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager
         val sensor = manager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR)
-        return SensorSource(manager, sensor)
+        return SensorsRepo(manager, sensor)
     }
 
     private fun provideDatabaseRepo(): IDatabaseRepo {
         val dataParser = DataParser(Dispatchers.Default)
-        val fileSource = provideFileSource()
         val remoteSource = provideRemoteSource()
-        return DatabaseRepo(Dispatchers.Default, dataParser, fileSource, localSource, remoteSource, settingsRepo)
-    }
-
-    private fun provideFileSource(): IFileSource {
-        return FileSource(context.contentResolver, Dispatchers.IO)
+        return DatabaseRepo(Dispatchers.Default, dataParser, localSource, remoteSource, settingsRepo)
     }
 
     private fun provideLocalSource(): ILocalSource {
-        val database = Room.databaseBuilder(context, MainDatabase::class.java, "Look4SatDBv313").apply {
+        val database = Room.databaseBuilder(context, Look4SatDb::class.java, "Look4SatDBv313").apply {
 //            addMigrations(MIGRATION_1_2)
             fallbackToDestructiveMigration()
         }.build()
-        return LocalSource(database.storageDao())
-    }
-
-    private fun provideMainScope(): CoroutineScope {
-        val mainHandler = CoroutineExceptionHandler { _, error -> println("Look4Sat: $error") }
-        return CoroutineScope(SupervisorJob() + Dispatchers.Default + mainHandler)
+        return LocalSource(database.look4SatDao())
     }
 
     private fun provideRemoteSource(): IRemoteSource {
         val cache = Cache(context.cacheDir, MainApplication.MAX_OKHTTP_CACHE_SIZE)
         val httpClient = OkHttpClient.Builder().cache(cache).build()
-        return RemoteSource(httpClient, Dispatchers.IO)
+        return RemoteSource(context.contentResolver, httpClient, Dispatchers.IO)
     }
 
     private fun provideSatelliteRepo(): ISatelliteRepo {

app/src/main/java/com/rtbishop/look4sat/presentation/map/MapScreen.kt

@@ -29,8 +29,8 @@ import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.rtbishop.look4sat.R
 import com.rtbishop.look4sat.domain.predict.GeoPos
-import com.rtbishop.look4sat.domain.predict.SatPos
-import com.rtbishop.look4sat.domain.predict.Satellite
+import com.rtbishop.look4sat.domain.predict.OrbitalObject
+import com.rtbishop.look4sat.domain.predict.OrbitalPos
 import org.osmdroid.tileprovider.tilesource.XYTileSource
 import org.osmdroid.util.GeoPoint
 import org.osmdroid.views.CustomZoomButtonsController
@@ -69,7 +69,7 @@ fun MapScreen() {
     val positions = viewModel.positions.collectAsState(initial = null)
     val satTrack = viewModel.track.collectAsState(initial = null)
     val footprint = viewModel.footprint.collectAsState(initial = null)
-    val positionClick = { satellite: Satellite -> viewModel.selectSatellite(satellite) }
+    val positionClick = { orbitalObject: OrbitalObject -> viewModel.selectSatellite(orbitalObject) }
     Column(modifier = Modifier.padding(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
         ElevatedCard(modifier = Modifier.fillMaxSize()) {
             MapView(modifier = Modifier.fillMaxSize()) { mapView ->
@@ -97,7 +97,7 @@ private fun setStationPosition(stationPos: GeoPos, mapView: MapView) {
     }
 }
 
-private fun setPositions(posMap: Map<Satellite, GeoPos>, mapView: MapView, action: (Satellite) -> Unit) {
+private fun setPositions(posMap: Map<OrbitalObject, GeoPos>, mapView: MapView, action: (OrbitalObject) -> Unit) {
     val markers = FolderOverlay()
     try {
         posMap.entries.forEach {
@@ -156,8 +156,8 @@ private fun setSatelliteTrack(satTrack: List<List<GeoPos>>, mapView: MapView) {
 //    mapView.controller.animateTo(center)
 }
 
-private fun setFootprint(satPos: SatPos, mapView: MapView) {
-    val footprintPoints = satPos.getRangeCircle().map { GeoPoint(it.latitude, it.longitude) }
+private fun setFootprint(orbitalPos: OrbitalPos, mapView: MapView) {
+    val footprintPoints = orbitalPos.getRangeCircle().map { GeoPoint(it.latitude, it.longitude) }
     try {
         val footprintOverlay = Polyline().apply {
             outlinePaint.set(footprintPaint)

app/src/main/java/com/rtbishop/look4sat/presentation/map/MapViewModel.kt

@@ -24,8 +24,8 @@ import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.MainApplication
 import com.rtbishop.look4sat.domain.predict.GeoPos
-import com.rtbishop.look4sat.domain.predict.SatPos
-import com.rtbishop.look4sat.domain.predict.Satellite
+import com.rtbishop.look4sat.domain.predict.OrbitalObject
+import com.rtbishop.look4sat.domain.predict.OrbitalPos
 import com.rtbishop.look4sat.domain.repository.ISatelliteRepo
 import com.rtbishop.look4sat.domain.repository.ISettingsRepo
 import com.rtbishop.look4sat.domain.utility.clipLat
@@ -51,7 +51,7 @@ class MapViewModel(private val satelliteRepo: ISatelliteRepo, settingsRepo: ISet
     private var allSatellites = satelliteRepo.satellites.value
     private var dataUpdateJob: Job? = null
     private var dataUpdateRate = 1000L
-    private var selectedSatellite: Satellite? = null
+    private var selectedOrbitalObject: OrbitalObject? = null
 
     val stationPosition = flow {
         val osmLat = clipLat(stationPos.latitude)
@@ -62,14 +62,14 @@ class MapViewModel(private val satelliteRepo: ISatelliteRepo, settingsRepo: ISet
     private val _track = MutableSharedFlow<List<List<GeoPos>>>()
     val track: SharedFlow<List<List<GeoPos>>> = _track
 
-    private val _footprint = MutableSharedFlow<SatPos>()
-    val footprint: SharedFlow<SatPos> = _footprint
+    private val _footprint = MutableSharedFlow<OrbitalPos>()
+    val footprint: SharedFlow<OrbitalPos> = _footprint
 
     private val _mapData = MutableSharedFlow<MapData>()
 //    val mapData: SharedFlow<MapData> = _mapData
 
-    private val _positions = MutableSharedFlow<Map<Satellite, GeoPos>>()
-    val positions: SharedFlow<Map<Satellite, GeoPos>> = _positions
+    private val _positions = MutableSharedFlow<Map<OrbitalObject, GeoPos>>()
+    val positions: SharedFlow<Map<OrbitalObject, GeoPos>> = _positions
 
 //    fun scrollSelection(decrement: Boolean) {
 //        if (allSatellites.isNotEmpty()) {
@@ -88,37 +88,37 @@ class MapViewModel(private val satelliteRepo: ISatelliteRepo, settingsRepo: ISet
         if (allSatellites.isNotEmpty()) {
             if (catnum == -1) {
                 allPasses.find { pass -> pass.progress < 100 && !pass.isDeepSpace }
-                    ?.let { pass -> selectSatellite(pass.satellite) }
+                    ?.let { pass -> selectSatellite(pass.orbitalObject) }
             } else {
                 allSatellites.find { it.data.catnum == catnum }?.let { selectSatellite(it) }
             }
         }
     }
 
-    fun selectSatellite(satellite: Satellite, updateFreq: Long = dataUpdateRate) {
-        selectedSatellite = satellite
+    fun selectSatellite(orbitalObject: OrbitalObject, updateFreq: Long = dataUpdateRate) {
+        selectedOrbitalObject = orbitalObject
         viewModelScope.launch {
             dataUpdateJob?.cancelAndJoin()
             dataUpdateJob = launch {
                 val dateNow = Date()
-                getSatTrack(satellite, stationPos, dateNow)
+                getSatTrack(orbitalObject, stationPos, dateNow)
                 while (isActive) {
                     dateNow.time = System.currentTimeMillis()
                     getPositions(allSatellites, stationPos, dateNow)
-                    getSatFootprint(satellite, stationPos, dateNow)
-                    getSatData(satellite, stationPos, dateNow)
+                    getSatFootprint(orbitalObject, stationPos, dateNow)
+                    getSatData(orbitalObject, stationPos, dateNow)
                     delay(updateFreq)
                 }
             }
         }
     }
 
-    private suspend fun getSatTrack(satellite: Satellite, pos: GeoPos, date: Date) {
+    private suspend fun getSatTrack(orbitalObject: OrbitalObject, pos: GeoPos, date: Date) {
         val satTracks = mutableListOf<List<GeoPos>>()
         val currentTrack = mutableListOf<GeoPos>()
-        val endDate = Date(date.time + (satellite.data.orbitalPeriod * 2.4 * 60000L).toLong())
+        val endDate = Date(date.time + (orbitalObject.data.orbitalPeriod * 2.4 * 60000L).toLong())
         var oldLongitude = 0.0
-        satelliteRepo.getTrack(satellite, pos, date.time, endDate.time).forEach { satPos ->
+        satelliteRepo.getTrack(orbitalObject, pos, date.time, endDate.time).forEach { satPos ->
             val osmLat = clipLat(satPos.latitude.toDegrees())
             val osmLon = clipLon(satPos.longitude.toDegrees())
             val currentPosition = GeoPos(osmLat, osmLon)
@@ -142,9 +142,9 @@ class MapViewModel(private val satelliteRepo: ISatelliteRepo, settingsRepo: ISet
         _track.emit(satTracks)
     }
 
-    private suspend fun getPositions(satellites: List<Satellite>, pos: GeoPos, date: Date) {
-        val positions = mutableMapOf<Satellite, GeoPos>()
-        satellites.forEach { satellite ->
+    private suspend fun getPositions(orbitalObjects: List<OrbitalObject>, pos: GeoPos, date: Date) {
+        val positions = mutableMapOf<OrbitalObject, GeoPos>()
+        orbitalObjects.forEach { satellite ->
             val satPos = satelliteRepo.getPosition(satellite, pos, date.time)
             val osmLat = clipLat(satPos.latitude.toDegrees())
             val osmLon = clipLon(satPos.longitude.toDegrees())
@@ -153,12 +153,12 @@ class MapViewModel(private val satelliteRepo: ISatelliteRepo, settingsRepo: ISet
         _positions.emit(positions)
     }
 
-    private suspend fun getSatFootprint(satellite: Satellite, pos: GeoPos, date: Date) {
-        val satPos = satelliteRepo.getPosition(satellite, pos, date.time)
+    private suspend fun getSatFootprint(orbitalObject: OrbitalObject, pos: GeoPos, date: Date) {
+        val satPos = satelliteRepo.getPosition(orbitalObject, pos, date.time)
         _footprint.emit(satPos)
     }
 
-    private suspend fun getSatData(sat: Satellite, pos: GeoPos, date: Date) {
+    private suspend fun getSatData(sat: OrbitalObject, pos: GeoPos, date: Date) {
         var aosTime = 0L.toTimerString()
         allPasses.find { pass -> pass.catNum == sat.data.catnum && pass.progress < 100 }
             ?.let { satPass ->

app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesScreen.kt

@@ -36,9 +36,9 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.rtbishop.look4sat.R
-import com.rtbishop.look4sat.domain.predict.NearEarthSatellite
+import com.rtbishop.look4sat.domain.predict.NearEarthObject
 import com.rtbishop.look4sat.domain.predict.OrbitalData
-import com.rtbishop.look4sat.domain.predict.SatPass
+import com.rtbishop.look4sat.domain.predict.OrbitalPass
 import com.rtbishop.look4sat.presentation.MainTheme
 import com.rtbishop.look4sat.presentation.components.PullRefreshIndicator
 import com.rtbishop.look4sat.presentation.components.PullRefreshState
@@ -114,13 +114,13 @@ private fun PassPreview() {
     val data = OrbitalData(
         "Satellite", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 45000, 0.0
     )
-    val satellite = NearEarthSatellite(data)
-    val pass = SatPass(1L, 0.0, 10L, 180.0, 850, 45.0, satellite, 0.5f)
+    val satellite = NearEarthObject(data)
+    val pass = OrbitalPass(1L, 0.0, 10L, 180.0, 850, 45.0, satellite, 0.5f)
     MainTheme { Pass(pass = pass, { _, _ -> }) }
 }
 
 @Composable
-private fun Pass(pass: SatPass, navToRadar: (Int, Long) -> Unit, modifier: Modifier = Modifier) {
+private fun Pass(pass: OrbitalPass, navToRadar: (Int, Long) -> Unit, modifier: Modifier = Modifier) {
     Surface(color = MaterialTheme.colorScheme.background, modifier = modifier) {
         Surface(modifier = Modifier
             .padding(bottom = 2.dp)
@@ -207,7 +207,7 @@ private fun Pass(pass: SatPass, navToRadar: (Int, Long) -> Unit, modifier: Modif
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun PassesCard(
-    refreshState: PullRefreshState, isRefreshing: Boolean, passes: List<SatPass>, navToRadar: (Int, Long) -> Unit
+    refreshState: PullRefreshState, isRefreshing: Boolean, passes: List<OrbitalPass>, navToRadar: (Int, Long) -> Unit
 ) {
     ElevatedCard(modifier = Modifier.fillMaxSize()) {
         Box(Modifier.pullRefresh(refreshState)) {

app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesState.kt

@@ -1,6 +1,6 @@
 package com.rtbishop.look4sat.presentation.passes
 
-import com.rtbishop.look4sat.domain.predict.SatPass
+import com.rtbishop.look4sat.domain.predict.OrbitalPass
 
 data class PassesState(
     val isDialogShown: Boolean,
@@ -12,7 +12,7 @@ data class PassesState(
     val hours: Int,
     val elevation: Double,
     val modes: List<String>,
-    val itemsList: List<SatPass>,
+    val itemsList: List<OrbitalPass>,
     val takeAction: (PassesAction) -> Unit
 )
 

app/src/main/java/com/rtbishop/look4sat/presentation/passes/PassesViewModel.kt

@@ -26,7 +26,7 @@ import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import com.rtbishop.look4sat.MainApplication
 import com.rtbishop.look4sat.domain.model.PassesSettings
-import com.rtbishop.look4sat.domain.predict.SatPass
+import com.rtbishop.look4sat.domain.predict.OrbitalPass
 import com.rtbishop.look4sat.domain.repository.ISatelliteRepo
 import com.rtbishop.look4sat.domain.repository.ISettingsRepo
 import com.rtbishop.look4sat.domain.utility.toTimerString
@@ -99,7 +99,7 @@ class PassesViewModel(
         satelliteRepo.calculatePasses(System.currentTimeMillis(), hoursAhead, minElevation, modes)
     }
 
-    private fun setPassInfo(passes: List<SatPass>, timeNow: Long) {
+    private fun setPassInfo(passes: List<OrbitalPass>, timeNow: Long) {
         if (passes.isEmpty()) return
         try {
             val nextPass = passes.first { it.aosTime.minus(timeNow) > 0 }

app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarData.kt

@@ -17,6 +17,6 @@
  */
 package com.rtbishop.look4sat.presentation.radar
 
-import com.rtbishop.look4sat.domain.predict.SatPos
+import com.rtbishop.look4sat.domain.predict.OrbitalPos
 
-data class RadarData(val satPos: SatPos, val satTrack: List<SatPos> = emptyList())
+data class RadarData(val orbitalPos: OrbitalPos, val satTrack: List<OrbitalPos> = emptyList())

app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarScreen.kt

@@ -69,7 +69,7 @@ fun RadarScreen() {
         ) {
             viewModel.radarData.value?.let { data ->
                 RadarViewCompose(
-                    item = data.satPos,
+                    item = data.orbitalPos,
                     items = data.satTrack,
                     azimElev = viewModel.orientation.value
                 )

app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarView.kt

@@ -29,14 +29,14 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.drawText
 import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.unit.sp
+import com.rtbishop.look4sat.domain.predict.OrbitalPos
 import com.rtbishop.look4sat.domain.predict.PI_2
-import com.rtbishop.look4sat.domain.predict.SatPos
 import com.rtbishop.look4sat.domain.utility.toRadians
 import kotlin.math.cos
 import kotlin.math.sin
 
 @Composable
-fun RadarViewCompose(item: SatPos, items: List<SatPos>, azimElev: Pair<Float, Float>) {
+fun RadarViewCompose(item: OrbitalPos, items: List<OrbitalPos>, azimElev: Pair<Float, Float>) {
     val radarColor = Color(0xFFDCDCDC)
     val primaryColor = Color(0xFFFFE082)
     val secondaryColor = Color(0xFFDC0000)
@@ -92,7 +92,7 @@ private fun DrawScope.drawTrack(path: Path, effect: PathEffect, color: Color, ef
     drawPath(path, effectColor, style = Stroke(pathEffect = effect))
 }
 
-private fun DrawScope.drawPosition(item: SatPos, radius: Float, posRadius: Float, color: Color) {
+private fun DrawScope.drawPosition(item: OrbitalPos, radius: Float, posRadius: Float, color: Color) {
     val satX = sph2CartX(item.azimuth, item.elevation, radius.toDouble())
     val satY = sph2CartY(item.azimuth, item.elevation, radius.toDouble())
     drawCircle(color, 16f, center.copy(satX, -satY))
@@ -122,7 +122,7 @@ private fun DrawScope.drawSweep(center: Offset, degrees: Float, radius: Float, c
     rotate(-90 + degrees, center) { drawCircle(brush, radius, style = Fill) }
 }
 
-private fun createTrackPath(positions: List<SatPos>, radius: Float): Path {
+private fun createTrackPath(positions: List<OrbitalPos>, radius: Float): Path {
     val trackPath = Path()
     positions.forEachIndexed { index, satPos ->
         val passX = sph2CartX(satPos.azimuth, satPos.elevation, radius.toDouble())

app/src/main/java/com/rtbishop/look4sat/presentation/radar/RadarViewModel.kt

@@ -32,12 +32,12 @@ import com.rtbishop.look4sat.data.framework.BluetoothReporter
 import com.rtbishop.look4sat.data.framework.NetworkReporter
 import com.rtbishop.look4sat.domain.model.SatRadio
 import com.rtbishop.look4sat.domain.predict.GeoPos
-import com.rtbishop.look4sat.domain.predict.SatPass
-import com.rtbishop.look4sat.domain.predict.SatPos
-import com.rtbishop.look4sat.domain.predict.Satellite
+import com.rtbishop.look4sat.domain.predict.OrbitalObject
+import com.rtbishop.look4sat.domain.predict.OrbitalPass
+import com.rtbishop.look4sat.domain.predict.OrbitalPos
 import com.rtbishop.look4sat.domain.repository.ISatelliteRepo
+import com.rtbishop.look4sat.domain.repository.ISensorsRepo
 import com.rtbishop.look4sat.domain.repository.ISettingsRepo
-import com.rtbishop.look4sat.domain.source.ISensorSource
 import com.rtbishop.look4sat.domain.utility.round
 import com.rtbishop.look4sat.domain.utility.toDegrees
 import kotlinx.coroutines.delay
@@ -51,20 +51,20 @@ class RadarViewModel(
     private val networkReporter: NetworkReporter,
     private val satelliteRepo: ISatelliteRepo,
     private val settingsRepo: ISettingsRepo,
-    private val sensorSource: ISensorSource
+    private val sensorsRepo: ISensorsRepo
 ) : ViewModel() {
 
     private val stationPos = settingsRepo.stationPosition.value
     private val magDeclination = getMagDeclination(stationPos)
     val transmitters = mutableStateOf<List<SatRadio>>(emptyList())
     val radarData = mutableStateOf<RadarData?>(null)
-    val orientation = mutableStateOf(sensorSource.orientation.value)
+    val orientation = mutableStateOf(sensorsRepo.orientation.value)
 
     init {
         if (settingsRepo.otherSettings.value.stateOfSensors) {
             viewModelScope.launch {
-                sensorSource.enableSensor()
-                sensorSource.orientation.collect { data ->
+                sensorsRepo.enableSensor()
+                sensorsRepo.orientation.collect { data ->
                     orientation.value = Pair(data.first + magDeclination, data.second)
                 }
             }
@@ -72,7 +72,7 @@ class RadarViewModel(
     }
 
     override fun onCleared() {
-        sensorSource.disableSensor()
+        sensorsRepo.disableSensor()
         super.onCleared()
     }
 
@@ -89,10 +89,10 @@ class RadarViewModel(
                 while (isActive) {
                     val timeNow = System.currentTimeMillis()
                     val satPos =
-                        satelliteRepo.getPosition(satPass.satellite, stationPos, timeNow)
-                    sendPassData(satPass, satPos, satPass.satellite)
+                        satelliteRepo.getPosition(satPass.orbitalObject, stationPos, timeNow)
+                    sendPassData(satPass, satPos, satPass.orbitalObject)
                     sendPassDataBT(satPos)
-                    processRadios(transmitters, satPass.satellite, timeNow)
+                    processRadios(transmitters, satPass.orbitalObject, timeNow)
                     delay(1000)
                 }
             }
@@ -109,33 +109,33 @@ class RadarViewModel(
         return GeomagneticField(latitude, longitude, geoPos.altitude.toFloat(), time).declination
     }
 
-    private fun sendPassData(satPass: SatPass, satPos: SatPos, satellite: Satellite) {
+    private fun sendPassData(orbitalPass: OrbitalPass, orbitalPos: OrbitalPos, orbitalObject: OrbitalObject) {
         viewModelScope.launch {
-            var track: List<SatPos> = emptyList()
-            if (!satPass.isDeepSpace) {
+            var track: List<OrbitalPos> = emptyList()
+            if (!orbitalPass.isDeepSpace) {
                 track = satelliteRepo.getTrack(
-                    satellite, stationPos, satPass.aosTime, satPass.losTime
+                    orbitalObject, stationPos, orbitalPass.aosTime, orbitalPass.losTime
                 )
             }
             if (settingsRepo.getRotatorState()) {
                 val server = settingsRepo.getRotatorAddress()
                 val port = settingsRepo.getRotatorPort().toInt()
-                val azimuth = satPos.azimuth.toDegrees().round(1)
-                val elevation = satPos.elevation.toDegrees().round(1)
+                val azimuth = orbitalPos.azimuth.toDegrees().round(1)
+                val elevation = orbitalPos.elevation.toDegrees().round(1)
                 networkReporter.reportRotation(server, port, azimuth, elevation)
             }
-            radarData.value = RadarData(satPos, track)
+            radarData.value = RadarData(orbitalPos, track)
         }
     }
 
-    private fun sendPassDataBT(satPos: SatPos) {
+    private fun sendPassDataBT(orbitalPos: OrbitalPos) {
         viewModelScope.launch {
             if (settingsRepo.getBluetoothState()) {
                 val btDevice = settingsRepo.getBluetoothAddress()
                 if (bluetoothReporter.isConnected()) {
                     val format = settingsRepo.getBluetoothFormat()
-                    val azimuth = satPos.azimuth.toDegrees().round(0).toInt()
-                    val elevation = satPos.elevation.toDegrees().round(0).toInt()
+                    val azimuth = orbitalPos.azimuth.toDegrees().round(0).toInt()
+                    val elevation = orbitalPos.elevation.toDegrees().round(0).toInt()
                     bluetoothReporter.reportRotation(format, azimuth, elevation)
                 } else if (!bluetoothReporter.isConnecting()) {
                     Log.i("BTReporter", "BTReporter: Attempting to connect...")
@@ -145,10 +145,10 @@ class RadarViewModel(
         }
     }
 
-    private fun processRadios(radios: List<SatRadio>, satellite: Satellite, time: Long) {
+    private fun processRadios(radios: List<SatRadio>, orbitalObject: OrbitalObject, time: Long) {
         viewModelScope.launch {
             delay(125)
-            val list = satelliteRepo.getRadios(satellite, stationPos, radios, time)
+            val list = satelliteRepo.getRadios(orbitalObject, stationPos, radios, time)
             transmitters.value = list
         }
     }
@@ -164,7 +164,7 @@ class RadarViewModel(
                     container.provideNetworkReporter(),
                     container.satelliteRepo,
                     container.settingsRepo,
-                    container.provideSensorSource()
+                    container.provideSensorsRepo()
                 )
             }
         }