diff --git a/lib/aprsme_web/live/map_live/packet_utils.ex b/lib/aprsme_web/live/map_live/packet_utils.ex index 616407a..76262ce 100644 --- a/lib/aprsme_web/live/map_live/packet_utils.ex +++ b/lib/aprsme_web/live/map_live/packet_utils.ex @@ -215,9 +215,9 @@ defmodule AprsmeWeb.MapLive.PacketUtils do {temperature, temp_unit} = convert_temperature(temperature_raw, locale) {wind_speed, wind_unit} = convert_wind_speed(wind_speed_raw, locale) {wind_gust, gust_unit} = convert_wind_speed(wind_gust_raw, locale) - {rain_1h, rain_unit} = convert_rain(rain_1h_raw, locale) - {rain_24h, rain_unit} = convert_rain(rain_24h_raw, locale) - {rain_since_midnight, rain_unit} = convert_rain(rain_since_midnight_raw, locale) + {rain_1h, rain_1h_unit} = convert_rain(rain_1h_raw, locale) + {rain_24h, rain_24h_unit} = convert_rain(rain_24h_raw, locale) + {rain_since_midnight, rain_since_midnight_unit} = convert_rain(rain_since_midnight_raw, locale) %{ callsign: sender, @@ -238,7 +238,9 @@ defmodule AprsmeWeb.MapLive.PacketUtils do rain_1h: rain_1h, rain_24h: rain_24h, rain_since_midnight: rain_since_midnight, - rain_unit: rain_unit + rain_1h_unit: rain_1h_unit, + rain_24h_unit: rain_24h_unit, + rain_since_midnight_unit: rain_since_midnight_unit } |> PopupComponent.popup() |> Safe.to_iodata() diff --git a/lib/aprsme_web/live/map_live/popup_component.ex b/lib/aprsme_web/live/map_live/popup_component.ex index b2635d0..53db3b7 100644 --- a/lib/aprsme_web/live/map_live/popup_component.ex +++ b/lib/aprsme_web/live/map_live/popup_component.ex @@ -5,8 +5,6 @@ defmodule AprsmeWeb.MapLive.PopupComponent do import AprsmeWeb.TimeHelpers import Gettext - alias AprsmeWeb.WeatherUnits - def popup(assigns) do ~H"""
@@ -45,9 +43,9 @@ defmodule AprsmeWeb.MapLive.PopupComponent do "gusts to" )} {@wind_gust} {@gust_unit}
{gettext(AprsmeWeb.Gettext, "Pressure:")} {@pressure} hPa
- {gettext(AprsmeWeb.Gettext, "Rain (1h):")} {@rain_1h} {@rain_unit}
- {gettext(AprsmeWeb.Gettext, "Rain (24h):")} {@rain_24h} {@rain_unit}
- {gettext(AprsmeWeb.Gettext, "Rain (since midnight):")} {@rain_since_midnight} {@rain_unit}
+ {gettext(AprsmeWeb.Gettext, "Rain (1h):")} {@rain_1h} {@rain_1h_unit}
+ {gettext(AprsmeWeb.Gettext, "Rain (24h):")} {@rain_24h} {@rain_24h_unit}
+ {gettext(AprsmeWeb.Gettext, "Rain (since midnight):")} {@rain_since_midnight} {@rain_since_midnight_unit}
<% end %>
""" diff --git a/mix.exs b/mix.exs index e1ccd54..6de4c37 100644 --- a/mix.exs +++ b/mix.exs @@ -128,7 +128,7 @@ defmodule Aprsme.MixProject do end defp sentry_package_source_code(release) do - Mix.Task.run("sentry.package_source_code", ["--release", release.path]) + Mix.Task.run("sentry.package_source_code", [release.path]) release end