Use sol Time readings helpers

kylecorry31 · Oct 13, 2023 · 64a5efa · 64a5efa
1 parent bb3f4d7
commit 64a5efa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 52 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstronomyService.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/domain/AstronomyService.kt
@@ -8,11 +8,11 @@ import com.kylecorry.sol.science.astronomy.meteors.MeteorShowerPeak
 import com.kylecorry.sol.science.astronomy.moon.MoonPhase
 import com.kylecorry.sol.science.astronomy.moon.MoonTruePhase
 import com.kylecorry.sol.science.shared.Season
+import com.kylecorry.sol.time.Time
 import com.kylecorry.sol.time.Time.toZonedDateTime
 import com.kylecorry.sol.units.Bearing
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.sol.units.Reading
-import com.kylecorry.trail_sense.shared.extensions.getReadings
 import java.time.Clock
 import java.time.Duration
 import java.time.LocalDate
@@ -54,7 +54,7 @@ class AstronomyService(private val clock: Clock = Clock.systemDefaultZone()) {
     ): List<Reading<Float>> {
         val startTime = time.minusHours(12)
         val endTime = time.plusHours(12)
-        return getReadings(
+        return Time.getReadings(
             startTime,
             endTime,
             altitudeGranularity
@@ -64,7 +64,7 @@ class AstronomyService(private val clock: Clock = Clock.systemDefaultZone()) {
     }
 
     fun getMoonAltitudes(location: Coordinate, date: LocalDate): List<Reading<Float>> {
-        return getReadings(
+        return Time.getReadings(
             date,
             ZoneId.systemDefault(),
             altitudeGranularity
@@ -122,7 +122,7 @@ class AstronomyService(private val clock: Clock = Clock.systemDefaultZone()) {
     }
 
     fun getSunAltitudes(location: Coordinate, date: LocalDate): List<Reading<Float>> {
-        return getReadings(
+        return Time.getReadings(
             date,
             ZoneId.systemDefault(),
             altitudeGranularity
@@ -137,7 +137,7 @@ class AstronomyService(private val clock: Clock = Clock.systemDefaultZone()) {
     ): List<Reading<Float>> {
         val startTime = time.minusHours(12)
         val endTime = time.plusHours(12)
-        return getReadings(
+        return Time.getReadings(
             startTime,
             endTime,
             altitudeGranularity

diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TimeExtensions.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/extensions/TimeExtensions.kt
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/tides/domain/TideService.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/tides/domain/TideService.kt
@@ -7,7 +7,6 @@ import com.kylecorry.sol.science.oceanography.Tide
 import com.kylecorry.sol.science.oceanography.TideType
 import com.kylecorry.sol.time.Time
 import com.kylecorry.sol.units.Reading
-import com.kylecorry.trail_sense.shared.extensions.getReadings
 import com.kylecorry.trail_sense.tools.tides.domain.range.TideTableRangeCalculator
 import com.kylecorry.trail_sense.tools.tides.domain.waterlevel.TideTableWaterLevelCalculator
 import java.time.*
@@ -36,7 +35,7 @@ class TideService : ITideService {
     }
 
     override fun getWaterLevels(table: TideTable, date: LocalDate): List<Reading<Float>> {
-        return getReadings(
+        return Time.getReadings(
             date,
             ZoneId.systemDefault(),
             Duration.ofMinutes(10)

diff --git a/.../com/kylecorry/trail_sense/weather/infrastructure/temperatures/HistoricTemperatureRepo.kt b/.../com/kylecorry/trail_sense/weather/infrastructure/temperatures/HistoricTemperatureRepo.kt
@@ -8,7 +8,6 @@ import com.kylecorry.sol.time.Time.daysUntil
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.sol.units.Temperature
-import com.kylecorry.trail_sense.shared.extensions.getReadings
 import com.kylecorry.trail_sense.shared.extensions.onDefault
 import com.kylecorry.trail_sense.weather.infrastructure.temperatures.calculators.DailyTemperatureCalculator
 import java.time.Duration
@@ -42,7 +41,7 @@ internal class HistoricTemperatureRepo(private val context: Context) : ITemperat
     ): List<Reading<Temperature>> {
         val calculator = DailyTemperatureCalculator(location, this::getDailyRange)
 
-        return getReadings(start, end, Duration.ofMinutes(10)) {
+        return Time.getReadings(start, end, Duration.ofMinutes(10)) {
             calculator.calculate(it)
         }
     }