Добавил вывод осадков и туманности (пока-что без тестов)
This commit is contained in:
parent
dc572de71f
commit
6f40ba447e
@ -18,8 +18,6 @@ public class MultiDaysWeatherInfo {
|
||||
}
|
||||
@Override
|
||||
public String toString() {
|
||||
return "MultiDaysWeatherInfo{" +
|
||||
"perDayWeather=" + perDayWeather +
|
||||
'}';
|
||||
return "Weather for 7 days:" + "\n" + perDayWeather ;
|
||||
}
|
||||
}
|
||||
|
@ -32,9 +32,19 @@ 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 ;
|
||||
|
@ -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";
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user