Добавил вывод осадков и туманности (пока-что без тестов)

This commit is contained in:
swayfarer 2025-06-06 14:09:16 +03:00
parent dc572de71f
commit 6f40ba447e
3 changed files with 24 additions and 10 deletions

View File

@ -18,8 +18,6 @@ public class MultiDaysWeatherInfo {
} }
@Override @Override
public String toString() { public String toString() {
return "MultiDaysWeatherInfo{" + return "Weather for 7 days:" + "\n" + perDayWeather ;
"perDayWeather=" + perDayWeather +
'}';
} }
} }

View File

@ -32,9 +32,19 @@ public class OpenWeatherMapWeatherProvider implements WeatherProvider {
for (var day = 0; day < 7; day ++) { for (var day = 0; day < 7; day ++) {
var forecast = weatherArray.getJSONObject(day); var forecast = weatherArray.getJSONObject(day);
var weatherArray2 = forecast.getJSONArray("weather");
var weatherMain = weatherArray2.getJSONObject(0);
var weather = weatherMain.getString("main");
var mainData = forecast.getJSONObject("main"); var mainData = forecast.getJSONObject("main");
var temperature = mainData.getDouble("temp"); var temperature = mainData.getDouble("temp");
resultWeeklyWeather.getPerDayWeather().add(new WeatherInfo(temperature));
var cloudsArray = forecast.getJSONObject("clouds");
var clouds = cloudsArray.getDouble("all");
resultWeeklyWeather.getPerDayWeather().add(new WeatherInfo(temperature, weather , clouds));
} }
return resultWeeklyWeather ; return resultWeeklyWeather ;

View File

@ -2,15 +2,21 @@ package ru.dima.weather.provider;
public class WeatherInfo { public class WeatherInfo {
public double temperature; public double temperature;
public String weather;
public WeatherInfo(double temperature) { public double clouds;
public WeatherInfo(double temperature, String weather, double clouds) {
this.temperature = temperature; this.temperature = temperature;
this.weather = weather;
this.clouds = clouds;
} }
@Override @Override
public String toString() { public String toString() {
return "WeatherInfo{" + return " " +
"temperature=" + temperature + " temp: " + temperature +
'}'; ", weather: " + weather +
", clouds: " + clouds +
"\n";
} }
} }