starred/WeatherMaster
1
0 Fork 0
mirror of https://github.com/PranshulGG/WeatherMaster.git synced 2026-10-22 02:52:37 -05:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #1200 from GaijinSystems/fix/nws-daily-missing-today

Browse Source 
NWS: keep today in daily forecast after its daytime period ends
This commit is contained in:
Pranshul authored and GitHub committed 2026-10-13 21:01:51 +05:30
2 parents 402843a93a f330a33202
commit 027ab2b18d
1 file changed
+15 -1
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/pranshulgg/weather_master_app/data/local/mapper/weather/sources/nws/NwsJsonMapper.kt
+15 -1
View File
@@ -19,6 +19,7 @@ import com.pranshulgg.weather_master_app.core.network.sources.weather.nws.json.N
import com.pranshulgg.weather_master_app.core.network.sources.weather.nws.json.bundle.NwsWeatherJsonBundle
import com.pranshulgg.weather_master_app.core.utils.extensions.DateTimeExtensions.iso8601TimestampToMilliseconds
import com.pranshulgg.weather_master_app.core.utils.extensions.DateTimeExtensions.normalizeToDay
import com.pranshulgg.weather_master_app.core.utils.formatters.getCurrentTimeFor
import com.pranshulgg.weather_master_app.core.utils.weather.astronomy.getMoonTimings
import com.pranshulgg.weather_master_app.core.utils.weather.astronomy.getSunTimings
import com.pranshulgg.weather_master_app.core.utils.weather.calculations.computeApparentTemperature
@@ -112,6 +113,19 @@ fun NwsWeatherJsonBundle.toDomain(location: Location): Weather {
location.longitude
)
/**
* NWS drops a day's daytime period once it has passed, so in the evening the forecast starts
* with "Tonight". Use the night period for a day that has no daytime period, otherwise today
* is missing from daily (and hourly day/night icons, sun and moon blocks use the wrong day)
*/
val today = getCurrentTimeFor(zoneId).normalizeToDay(zoneId)
val dailyPeriods = daily.periods
.groupBy { it.startTime.iso8601TimestampToMilliseconds().normalizeToDay(zoneId) }
.mapNotNull { (day, periods) ->
periods.firstOrNull { it.isDayTime } ?: periods.first().takeIf { day >= today }
}
return Weather(
location = location,
current = WeatherCurrent(
@@ -159,7 +173,7 @@ fun NwsWeatherJsonBundle.toDomain(location: Location): Weather {
dewPoint = it.dewPoint.value
)
},
daily = daily.periods.filter { it.isDayTime }.map { item ->
daily = dailyPeriods.map { item ->
val index = daily.periods.indexOf(item)