ndacremont/weather-aggregator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: change String city to City city

Browse Source
This commit is contained in:
Nemo D'ACREMONT 2024-11-09 18:23:50 +01:00
parent a4f127e4e3
commit 8ce493501e
No known key found for this signature in database
GPG Key ID: 6E5BCE8022FA8276
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eirb/pg203/Temperature.java
View File

@ -3,11 +3,11 @@ package eirb.pg203;
import java.time.Instant; import java.time.Instant;
public class Temperature { public class Temperature {
private String city; private City city;
private Instant date; private Instant date;
private float temp; private float temp;
Temperature(float temp, String city, Instant date) { Temperature(float temp, City city, Instant date) {
this.temp = temp; this.temp = temp;
this.city = city; this.city = city;
this.date = date; this.date = date;
@ -18,7 +18,7 @@ public class Temperature {
* @return city * @return city
*/ */
public String getCity() { public String getCity() {
return city; return this.city.getCityName();
} }
/** /**

4
src/main/java/eirb/pg203/WeatherAPI.java
View File

@ -49,7 +49,7 @@ public class WeatherAPI implements WeatherDataAPI{
JSONArray forecast = result.getJSONObject("forecast").getJSONArray("forecastday"); JSONArray forecast = result.getJSONObject("forecast").getJSONArray("forecastday");
float temp_c = forecast.getJSONObject(day).getJSONObject("day").getFloat("avgtemp_c"); float temp_c = forecast.getJSONObject(day).getJSONObject("day").getFloat("avgtemp_c");
return new Temperature(temp_c, city, Instant.now()); return new Temperature(temp_c, new City(city), Instant.now());
} }
@Override @Override
@ -64,7 +64,7 @@ public class WeatherAPI implements WeatherDataAPI{
for (int day = 0; day < days; ++day) { for (int day = 0; day < days; ++day) {
JSONArray forecast = result.getJSONObject("forecast").getJSONArray("forecastday"); JSONArray forecast = result.getJSONObject("forecast").getJSONArray("forecastday");
float temp_c = forecast.getJSONObject(day).getJSONObject("day").getFloat("avgtemp_c"); float temp_c = forecast.getJSONObject(day).getJSONObject("day").getFloat("avgtemp_c");
temperatures.add(new Temperature(temp_c, city, Instant.now())); temperatures.add(new Temperature(temp_c, new City(city), Instant.now()));
} }
return temperatures; return temperatures;
} }