mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 11:50:00 +00:00
2d3940a4ff
So finally I think this refactorin is ready to be reviewed :-) DONE: - [x] Removed all conversion functions for wind and temperature from specific weatherproviders - [x] Use internally only metric units: celsius for temperature, meters per seconds for wind - [x] Convert temp and wind into the configured units when displaying data on the UI - [x] look how beaufort calculation uses metrics, added knots as new windunit - [x] add more e2e tests Checked providers: - [x] Darksky - [x] EnvCanada - [x] OpenWeatherMap - [x] SMHI provider - [x] UK Met Office - [x] UK Met Office DataHub - [x] WeatherBit - [x] WeatherFlow - [x] WeatherGov TODO in different tickets: - check weatherproviders for usage of weatherEndpoint (as seen in https://github.com/MichMich/MagicMirror-Documentation/issues/131) -> see #2926 - cleanup precipations -> #2953 Co-authored-by: veeck <michael@veeck.de>
79 lines
3.2 KiB
Plaintext
79 lines
3.2 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-up" style="transform:rotate({{ current.windDirection }}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) 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>
|
|
{% endif %}
|
|
{% if config.showPrecipitationAmount %}
|
|
<span class="dimmed">
|
|
{{ "PRECIP" | translate }} {{ current.precipitation | unit("precip") }}
|
|
</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> -->
|