mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
bf279d9a57
Fixes #2953 This is an attempt to fix the issue with precipitation amount and percentage mixup. I have created a separate `precipitationPercentage`-variable where the probability of rain can be stored. The config options now has the old `showPrecipitationAmount` in addition to a new setting: `showPrecipitationProbability` (shows the likelihood of rain). <details> <summary>Examples</summary> ### Yr I tested the Yr weather provider for a Norwegian city Bergen that has a lot of rain. I have removed properties that are irrelevant for this demo from the config-samples below. Config: ```js { module: "weather", config: { weatherProvider: "yr", type: "current", showPrecipitationAmount: true, showPrecipitationProbability: true } }, { module: "weather", config: { weatherProvider: "yr", type: "hourly", showPrecipitationAmount: true, showPrecipitationProbability: true } }, { module: "weather", config: { weatherProvider: "yr", type: "daily", showPrecipitationAmount: true, showPrecipitationProbability: true } } ``` Result:<br/> <img width="444" alt="screenshot" src="https://user-images.githubusercontent.com/34011212/216775423-4e37345c-f915-47e5-8551-7c544ebd24b1.png"> </details> --------- Co-authored-by: Magnus Marthinsen <magmar@online.no> Co-authored-by: Veeck <github@veeck.de>
84 lines
3.7 KiB
Plaintext
84 lines
3.7 KiB
Plaintext
{% if current %}
|
|
{% if not config.onlyTemp %}
|
|
<div class="normal medium">
|
|
<span class="wi wi-strong-wind dimmed"></span>
|
|
<span>
|
|
{{ current.windSpeed | unit("wind") | round }}
|
|
{% if config.showWindDirection %}
|
|
<sup>
|
|
{% if config.showWindDirectionAsArrow %}
|
|
<i class="fas fa-long-arrow-alt-down" style="transform:rotate({{ current.windFromDirection }}deg);"></i>
|
|
{% else %}
|
|
{{ current.cardinalWindDirection() | translate }}
|
|
{% endif %}
|
|
|
|
</sup>
|
|
{% endif %}
|
|
</span>
|
|
{% if config.showHumidity and current.humidity %}
|
|
<span>{{ current.humidity | decimalSymbol }}</span><sup> <i class="wi wi-humidity humidityIcon"></i></sup>
|
|
{% endif %}
|
|
{% if config.showSun %}
|
|
<span class="wi dimmed wi-{{ current.nextSunAction() }}"></span>
|
|
<span>
|
|
{% if current.nextSunAction() === "sunset" %}
|
|
{{ current.sunset | formatTime }}
|
|
{% else %}
|
|
{{ current.sunrise | formatTime }}
|
|
{% endif %}
|
|
</span>
|
|
{% endif %}
|
|
</div>
|
|
{% endif %}
|
|
<div class="large light">
|
|
<span class="wi weathericon wi-{{current.weatherType}}"></span>
|
|
<span class="bright">
|
|
{{ current.temperature | roundValue | unit("temperature") | decimalSymbol }}
|
|
</span>
|
|
</div>
|
|
<div class="normal light indoor">
|
|
{% if config.showIndoorTemperature and indoor.temperature %}
|
|
<div>
|
|
<span class="fas fa-home"></span>
|
|
<span class="bright">
|
|
{{ indoor.temperature | roundValue | unit("temperature") | decimalSymbol }}
|
|
</span>
|
|
</div>
|
|
{% endif %}
|
|
{% if config.showIndoorHumidity and indoor.humidity %}
|
|
<div>
|
|
<span class="fas fa-tint"></span>
|
|
<span class="bright">
|
|
{{ indoor.humidity | roundValue | unit("humidity") | decimalSymbol }}
|
|
</span>
|
|
</div>
|
|
{% endif %}
|
|
</div>
|
|
{% if (config.showFeelsLike or config.showPrecipitationAmount or config.showPrecipitationProbability) and not config.onlyTemp %}
|
|
<div class="normal medium feelslike">
|
|
{% if config.showFeelsLike %}
|
|
<span class="dimmed">
|
|
{{ "FEELS" | translate({DEGREE: current.feelsLike() | roundValue | unit("temperature") | decimalSymbol }) }}
|
|
</span><br/>
|
|
{% endif %}
|
|
{% if config.showPrecipitationAmount and current.precipitationAmount %}
|
|
<span class="dimmed">
|
|
<span class="precipitationLeadText">{{ "PRECIP_AMOUNT" | translate }}</span> {{ current.precipitationAmount | unit("precip", current.precipitationUnits) }}
|
|
</span><br/>
|
|
{% endif %}
|
|
{% if config.showPrecipitationProbability and current.precipitationProbability %}
|
|
<span class="dimmed">
|
|
<span class="precipitationLeadText">{{ "PRECIP_POP" | translate }}</span> {{ current.precipitationProbability }}%
|
|
</span>
|
|
{% endif %}
|
|
</div>
|
|
{% endif %}
|
|
{% else %}
|
|
<div class="dimmed light small">
|
|
{{ "LOADING" | translate }}
|
|
</div>
|
|
{% endif %}
|
|
|
|
<!-- Uncomment the line below to see the contents of the `current` object. -->
|
|
<!-- <div style="word-wrap:break-word" class="xsmall dimmed">{{current | dump}}</div> -->
|