diff --git a/src/main/java/ru/dima/weather/provider/MultiDaysWeatherInfo.java b/src/main/java/ru/dima/weather/provider/MultiDaysWeatherInfo.java index 11c45a8..a9af246 100644 --- a/src/main/java/ru/dima/weather/provider/MultiDaysWeatherInfo.java +++ b/src/main/java/ru/dima/weather/provider/MultiDaysWeatherInfo.java @@ -18,8 +18,6 @@ public class MultiDaysWeatherInfo { } @Override public String toString() { - return "MultiDaysWeatherInfo{" + - "perDayWeather=" + perDayWeather + - '}'; + return "Weather for 7 days:" + "\n" + perDayWeather ; } } diff --git a/src/main/java/ru/dima/weather/provider/OpenWeatherMapWeatherProvider.java b/src/main/java/ru/dima/weather/provider/OpenWeatherMapWeatherProvider.java index 11ee46f..f172294 100644 --- a/src/main/java/ru/dima/weather/provider/OpenWeatherMapWeatherProvider.java +++ b/src/main/java/ru/dima/weather/provider/OpenWeatherMapWeatherProvider.java @@ -32,12 +32,22 @@ public class OpenWeatherMapWeatherProvider implements WeatherProvider { for (var day = 0; day < 7; 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 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 ; } @Override diff --git a/src/main/java/ru/dima/weather/provider/WeatherInfo.java b/src/main/java/ru/dima/weather/provider/WeatherInfo.java index 05f4442..abccb6c 100644 --- a/src/main/java/ru/dima/weather/provider/WeatherInfo.java +++ b/src/main/java/ru/dima/weather/provider/WeatherInfo.java @@ -2,15 +2,21 @@ package ru.dima.weather.provider; public class WeatherInfo { public double temperature; - - public WeatherInfo(double temperature) { + public String weather; + public double clouds; + public WeatherInfo(double temperature, String weather, double clouds) { this.temperature = temperature; + this.weather = weather; + this.clouds = clouds; + } @Override public String toString() { - return "WeatherInfo{" + - "temperature=" + temperature + - '}'; + return " " + + " temp: " + temperature + + ", weather: " + weather + + ", clouds: " + clouds + + "\n"; } }