WeatherDataLoader: update weather ttl

thewizrd · thewizrd · commit 55d75d8a67ab · 2025-01-11T17:56:13.000-05:00
diff --git a/common/src/main/java/com/thewizrd/common/weatherdata/WeatherDataLoader.kt b/common/src/main/java/com/thewizrd/common/weatherdata/WeatherDataLoader.kt
@@ -414,7 +414,7 @@ class WeatherDataLoader {
             } else {
                 Duration.between(weather.condition!!.observationTime, now).toMinutes()
             }
-        if (duraMins > 90) {
+        if (duraMins > 120) {
             val interval =
                 weatherModule.weatherManager.getWeatherProvider(weather.source)
                     .getHourlyForecastInterval()
diff --git a/weather-api/src/main/java/com/thewizrd/weather_api/brightsky/WeatherData.kt b/weather-api/src/main/java/com/thewizrd/weather_api/brightsky/WeatherData.kt
@@ -136,7 +136,7 @@ fun createWeatherData(
         atmosphere = createAtmosphere(currRoot)
         precipitation = createPrecipitation(currRoot)
 
-        ttl = 180
+        ttl = 120
 
         // Set feelslike temp
         if (condition?.feelslikeF == null && condition?.tempF != null && condition?.windMph != null && atmosphere?.humidity != null) {
diff --git a/weather-api/src/main/java/com/thewizrd/weather_api/eccc/WeatherData.kt b/weather-api/src/main/java/com/thewizrd/weather_api/eccc/WeatherData.kt
@@ -70,7 +70,7 @@ fun createWeatherData(root: LocationResponseItem): Weather {
         astronomy = createAstronomy(root.riseSet)
         weatherAlerts = createWeatherAlerts(root.alert)
 
-        ttl = 180
+        ttl = 120
 
         if ((condition?.highF == null || condition?.highC == null) && forecast!!.size > 0) {
             condition!!.highF = forecast!![0].highF
diff --git a/weather-api/src/main/java/com/thewizrd/weather_api/here/weather/WeatherData.kt b/weather-api/src/main/java/com/thewizrd/weather_api/here/weather/WeatherData.kt
@@ -76,7 +76,7 @@ fun createWeatherData(root: PlacesItem): Weather {
         atmosphere = createAtmosphere(observation)
         astronomy = createAstronomy(root.astronomyForecasts!![0].forecasts!!)
         precipitation = createPrecipitation(observation, todaysForecast)
-        ttl = 180
+        ttl = 120
 
         source = WeatherAPI.HERE
     }
diff --git a/weather-api/src/main/java/com/thewizrd/weather_api/nws/WeatherData.kt b/weather-api/src/main/java/com/thewizrd/weather_api/nws/WeatherData.kt
@@ -159,7 +159,7 @@ fun createWeatherData(
         atmosphere = createAtmosphere(forecastResponse)
         //astronomy = new Astronomy(obsCurrentResponse);
         precipitation = createPrecipitation(forecastResponse)
-        ttl = 180
+        ttl = 120
 
         if (condition!!.highF == null && forecast!!.size > 0) {
             condition!!.highF = forecast!![0].highF
diff --git a/weather-api/src/main/java/com/thewizrd/weather_api/tomorrow/WeatherData.kt b/weather-api/src/main/java/com/thewizrd/weather_api/tomorrow/WeatherData.kt
@@ -100,7 +100,7 @@ fun createWeatherData(root: Rootobject, minutelyRoot: Rootobject?, alertRoot: Al
 
         weatherAlerts = createWeatherAlerts(alertRoot)
 
-        ttl = 180
+        ttl = 120
         source = WeatherAPI.TOMORROWIO
     }
 }
diff --git a/weather-api/src/main/java/com/thewizrd/weather_api/weatherkit/WeatherData.kt b/weather-api/src/main/java/com/thewizrd/weather_api/weatherkit/WeatherData.kt
@@ -80,7 +80,7 @@ fun createWeatherData(root: com.thewizrd.weather_api.weatherkit.Weather): Weathe
             astronomy = createAstronomy(it)
         }
         precipitation = createPrecipitation(root.currentWeather!!)
-        ttl = 180
+        ttl = 120
 
         if ((condition!!.highF == null || condition!!.highC == null) && forecast!!.size > 0) {
             condition!!.highF = forecast!![0].highF

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ class WeatherDataLoader {`
`414`	`414`	`} else {`
`415`	`415`	`Duration.between(weather.condition!!.observationTime, now).toMinutes()`
`416`	`416`	`}`
`417`		`- if (duraMins > 90) {`
	`417`	`+ if (duraMins > 120) {`
`418`	`418`	`val interval =`
`419`	`419`	`weatherModule.weatherManager.getWeatherProvider(weather.source)`
`420`	`420`	`.getHourlyForecastInterval()`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ fun createWeatherData(root: PlacesItem): Weather {`
`76`	`76`	`atmosphere = createAtmosphere(observation)`
`77`	`77`	`astronomy = createAstronomy(root.astronomyForecasts!![0].forecasts!!)`
`78`	`78`	`precipitation = createPrecipitation(observation, todaysForecast)`
`79`		`- ttl = 180`
	`79`	`+ ttl = 120`
`80`	`80`
`81`	`81`	`source = WeatherAPI.HERE`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ fun createWeatherData(root: Rootobject, minutelyRoot: Rootobject?, alertRoot: Al`
`100`	`100`
`101`	`101`	`weatherAlerts = createWeatherAlerts(alertRoot)`
`102`	`102`
`103`		`- ttl = 180`
	`103`	`+ ttl = 120`
`104`	`104`	`source = WeatherAPI.TOMORROWIO`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ fun createWeatherData(root: com.thewizrd.weather_api.weatherkit.Weather): Weathe`
`80`	`80`	`astronomy = createAstronomy(it)`
`81`	`81`	`}`
`82`	`82`	`precipitation = createPrecipitation(root.currentWeather!!)`
`83`		`- ttl = 180`
	`83`	`+ ttl = 120`
`84`	`84`
`85`	`85`	`if ((condition!!.highF == null \|\| condition!!.highC == null) && forecast!!.size > 0) {`
`86`	`86`	`condition!!.highF = forecast!![0].highF`