Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Tour Blog] Separated weather common values with a new line instead o…
…f being on the same line as the last hour values
- Loading branch information
1 parent
2caf69a
commit 9670c32
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -141,29 +141,38 @@ public static String buildFullWeatherDataString(final float temperatureValue, | |
| * Returns the weather data as a human readable string, depending on the | ||
| * desired data. | ||
| * Example: ☀ Sunny, 19°C, max. 26°C, min. 10°C, feels like 19°C, 6km/h from SSE, 34% humidity | ||
| * | ||
| * @param tourData | ||
| * @param isDisplayMinimumTemperature | ||
| * @param isDisplayMaximumTemperature | ||
| * @param isDisplayPressure | ||
| * @param isWeatherDataSeparatorNewLine | ||
| * @return | ||
| */ | ||
| public static String buildWeatherDataString(final TourData tourData, | ||
| final boolean isDisplayMinimumTemperature, | ||
| final boolean isDisplayMaximumTemperature, | ||
| final boolean isDisplayPressure, | ||
| final boolean isWeatherDataSeparatorNewLine) { | ||
|
|
||
| final List<String> weatherHourValues = new ArrayList<>(); | ||
| final List<String> weatherAvgValues = new ArrayList<>(); | ||
|
|
||
| // Icon | ||
| final String weatherIcon = getWeatherIcon(tourData.getWeatherIndex()); | ||
| if (StringUtils.hasContent(weatherIcon)) { | ||
|
|
||
| weatherHourValues.add(weatherIcon.trim()); | ||
| } | ||
|
|
||
| // Description | ||
| final String weatherText = tourData.getWeather(); | ||
| if (StringUtils.hasContent(weatherText)) { | ||
|
|
||
| if (weatherHourValues.size() == 1) { | ||
| weatherHourValues.set(0, weatherHourValues.get(0) + UI.SPACE + weatherText); | ||
| } else { | ||
| weatherHourValues.add(weatherText); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -172,100 +181,110 @@ public static String buildWeatherDataString(final TourData tourData, | |
| // Average temperature | ||
| final float averageTemperature = tourData.getWeather_Temperature_Average(); | ||
| if (averageTemperature != Float.MIN_VALUE) { | ||
|
|
||
| weatherAvgValues.add(Messages.Log_HistoricalWeatherRetriever_001_WeatherData_Temperature_Avg | ||
| + UI.SPACE | ||
| + FormatManager.formatTemperature(UI.convertTemperatureFromMetric(averageTemperature)) | ||
| + UI.UNIT_LABEL_TEMPERATURE); | ||
| } | ||
|
|
||
| // Minimum temperature | ||
| if (isDisplayMinimumTemperature) { | ||
|
|
||
| weatherAvgValues.add(Messages.Log_HistoricalWeatherRetriever_001_WeatherData_Temperature_Min | ||
| + UI.SPACE | ||
| + FormatManager.formatTemperature(UI.convertTemperatureFromMetric(tourData.getWeather_Temperature_Min())) | ||
| + UI.UNIT_LABEL_TEMPERATURE); | ||
| } | ||
|
|
||
| // Maximum temperature | ||
| if (isDisplayMaximumTemperature) { | ||
|
|
||
| weatherAvgValues.add(Messages.Log_HistoricalWeatherRetriever_001_WeatherData_Temperature_Max | ||
| + UI.SPACE | ||
| + FormatManager.formatTemperature(UI.convertTemperatureFromMetric(tourData.getWeather_Temperature_Max())) | ||
| + UI.UNIT_LABEL_TEMPERATURE); | ||
| } | ||
|
|
||
| // Wind chill | ||
| final float temperatureWindChill = tourData.getWeather_Temperature_WindChill(); | ||
| if (temperatureWindChill != Float.MIN_VALUE) { | ||
|
|
||
| weatherAvgValues.add(Messages.Log_HistoricalWeatherRetriever_001_WeatherData_Temperature_FeelsLike | ||
| + UI.SPACE | ||
| + FormatManager.formatTemperature(UI.convertTemperatureFromMetric(temperatureWindChill)) | ||
| + UI.UNIT_LABEL_TEMPERATURE); | ||
| } | ||
| } | ||
|
|
||
| // Wind | ||
| final int windSpeed = tourData.getWeather_Wind_Speed(); | ||
| if (windSpeed > 0) { | ||
|
|
||
| final int weather_Wind_Direction = tourData.getWeather_Wind_Direction(); | ||
|
|
||
| final String windDirection = weather_Wind_Direction != -1 | ||
| ? UI.SPACE | ||
| + Messages.Log_HistoricalWeatherRetriever_001_WeatherData_WindDirection | ||
| + UI.SPACE | ||
| + getWindDirectionText(weather_Wind_Direction) | ||
| : UI.EMPTY_STRING; | ||
|
|
||
| weatherAvgValues.add(Math.round(UI.convertSpeed_FromMetric(windSpeed)) | ||
| + UI.UNIT_LABEL_SPEED | ||
| + windDirection); | ||
| } | ||
|
|
||
| // Humidity | ||
| final float humidity = tourData.getWeather_Humidity(); | ||
| if (humidity > 0) { | ||
|
|
||
| weatherAvgValues.add(Messages.Log_HistoricalWeatherRetriever_001_WeatherData_Humidity | ||
| + UI.SPACE | ||
| + (int) humidity | ||
| + UI.SYMBOL_PERCENTAGE); | ||
| } | ||
|
|
||
| // Pressure | ||
| final float weatherPressure = tourData.getWeather_Pressure(); | ||
| if (weatherPressure > 0 && isDisplayPressure) { | ||
|
|
||
| weatherAvgValues.add(Messages.Log_HistoricalWeatherRetriever_001_WeatherData_Pressure | ||
| + UI.SPACE | ||
| + roundDoubleToFloat(weatherPressure) | ||
| + UI.UNIT_LABEL_PRESSURE_MBAR_OR_INHG); | ||
| } | ||
|
|
||
| // Precipitation | ||
| final float precipitation = tourData.getWeather_Precipitation(); | ||
| if (precipitation > 0) { | ||
|
|
||
| weatherAvgValues.add(Messages.Log_HistoricalWeatherRetriever_001_WeatherData_Precipitation | ||
| + UI.SPACE | ||
| + roundDoubleToFloat(UI.convertPrecipitation_FromMetric(precipitation)) | ||
| + UI.UNIT_LABEL_DISTANCE_MM_OR_INCH); | ||
| } | ||
|
|
||
| // Snowfall | ||
| final float snowfall = tourData.getWeather_Snowfall(); | ||
| if (snowfall > 0) { | ||
|
|
||
| weatherAvgValues.add(Messages.Log_HistoricalWeatherRetriever_001_WeatherData_Snowfall | ||
| + UI.SPACE | ||
| + roundDoubleToFloat(UI.convertPrecipitation_FromMetric(snowfall)) | ||
| + UI.UNIT_LABEL_DISTANCE_MM_OR_INCH); | ||
| } | ||
|
|
||
| final String weatherHourValuesJoined = String.join(UI.COMMA_SPACE, weatherHourValues); | ||
| final String weatherAvgValuesJoined = String.join(UI.COMMA_SPACE, weatherAvgValues); | ||
|
|
||
| final String weatherDataSeparator = isWeatherDataSeparatorNewLine ? UI.NEW_LINE1 : UI.COMMA_SPACE; | ||
|
|
||
| final String weatherData = weatherHourValuesJoined | ||
|
|
||
| + (weatherAvgValuesJoined.length() == 0 | ||
| ? UI.EMPTY_STRING | ||
| : weatherDataSeparator + weatherAvgValuesJoined); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
FJBDev
Collaborator
|
||
|
|
||
| return weatherData; | ||
| } | ||
|
|
||
Moved the common weather values in the tour blog into a separate line, in the tour log it's still on the same line.
Reordered min/max values and exchanged text and value for some data to have the same layout as the hour values