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

fix: weather data test

Browse Source
This commit is contained in:
Martin Eyben 2024-12-17 17:25:14 +01:00
parent 79a3e1941a
commit a41df4b124
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/eirb/pg203/weather/data/WeatherData.java
View File

@ -1,6 +1,8 @@
package eirb.pg203.weather.data; package eirb.pg203.weather.data;
import java.time.Instant; import java.time.Instant;
import java.util.Locale;
import org.json.JSONObject; import org.json.JSONObject;
import eirb.pg203.weather.utils.City; import eirb.pg203.weather.utils.City;
@ -93,7 +95,7 @@ public class WeatherData {
private WindDirection getWindDirection(float windDirectionAngle) { private WindDirection getWindDirection(float windDirectionAngle) {
if (windDirectionAngle >= 337.5 || windDirectionAngle <= 22.5) if ((windDirectionAngle >= 337.5 && windDirectionAngle <= 360) || (windDirectionAngle >= 0 && windDirectionAngle <= 22.5))
return WindDirection.N; return WindDirection.N;
if (windDirectionAngle > 22.5 && windDirectionAngle <= 67.5) if (windDirectionAngle > 22.5 && windDirectionAngle <= 67.5)
return WindDirection.NE; return WindDirection.NE;
@ -172,11 +174,12 @@ public class WeatherData {
public void setWindDirectionAngle(float windDirectionAngle) { public void setWindDirectionAngle(float windDirectionAngle) {
this.windDirectionAngle = windDirectionAngle; this.windDirectionAngle = windDirectionAngle;
this.windDirection = this.getWindDirection(windDirectionAngle);
} }
@Override @Override
public String toString() { public String toString() {
return String.format("%05.2f° %s %05.2fkm/h %06.2f° %s", return String.format(Locale.ENGLISH, "%05.2f° %s %05.2fkm/h %06.2f° %s",
this.getTemp(), this.getTemp(),
this.getCondition().toString(), this.getCondition().toString(),
this.getWindSpeed(), this.getWindSpeed(),