diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java index e3f3c1883fa7287d38229f502470f26f2e5e2c07..ab3d5787705ce8c8e041cf426567e90bb7cb3a7e 100755 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/Forecast.java @@ -24,13 +24,12 @@ public class Forecast { -/* - CopyToFile.CopyURLToFile("weatherCache\\" + SearchingAndComparing.GetID() + ".json"); + CopyToFile.CopyURLToFile("weatherCache\\" + SearchingAndComparing.GetID() + ".json"); CopyToFile.CopyFileToWeather(); WeatherOutput.PrintWeather(); -*/ + } } diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java index 7f7099c2a42a9f4843c2798cfc99e33a1a747283..470ca38ce1866ae5bd6a3553a284a29bfc5fd029 100755 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/CopyToFile.java @@ -28,7 +28,6 @@ public class CopyToFile { } } filePath = pathname; - //return pathname; } diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/FormatOutput.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/FormatOutput.java index 8b5891363b974bccba0fe12bdb5bdede60819c4a..5f81a32a5ed324e732d1bca26363c3f3eaac225c 100644 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/FormatOutput.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/FormatOutput.java @@ -49,4 +49,5 @@ public class FormatOutput { return coordsLon + ", " + coordsLat; } + } diff --git a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/WeatherOutput.java b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/WeatherOutput.java index 94b110f14c1aec2dd4503ecaa282b2648d49be56..829557bb73735bd772cbfc1cf1d782ab9e31e859 100755 --- a/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/WeatherOutput.java +++ b/src/main/java/de/hdm_stuttgart/mi/sd1/weather/model/WeatherOutput.java @@ -7,7 +7,7 @@ public class WeatherOutput { Weather weatherObject = CopyToFile.CopyFileToWeather(); /** - * method to print the temperature + * method to print the temperature * and the sky condition of current day + 5 * in 3 hour segments * @param i timestamps for weatherdata @@ -15,14 +15,19 @@ public class WeatherOutput { for (int i = 0; i < weatherObject.getList().length - 1; i++) { - System.out.print(weatherObject.getList()[i].getDtTxt() + ": "); // output nicht wie bei Goik - double timeStamp = weatherObject.getList()[i].getDt(); + if ((weatherObject.getList()[i].getDtTxt().substring(11, 13).equals("00")) || i == 0 ) { + System.out.println(weatherObject.getList()[i].getDtTxt().substring(0, 10)); + } + System.out.print(weatherObject.getList()[i].getDtTxt().substring(11, 13) + " Uhr: "); + // System.out.print(weatherObject.getList()[i].getDtTxt() + ": "); // output nicht wie bei Goik + + /* double timeStamp = weatherObject.getList()[i].getDt(); timeStamp = timeStamp; System.out.println(timeStamp); - // January 1, 1970 00:00:00.000 GMT + // January 1, 1970 00:00:00.000 GMT */ Main MainWeatherData = weatherObject.getList()[i].getMain(); - System.out.print(Math.round(MainWeatherData.getTemp()) + "°C"); + System.out.print(Math.round(MainWeatherData.getTemp()) + "°C,"); Clouds SkyCondition = weatherObject.getList()[i].getClouds(); int SkyPercent = SkyCondition.getAll();