<.input field={@edit_form[:station1]} type="text" label="Station 1" />
<.input field={@edit_form[:grid1]} type="text" label="Grid 1" />
+ <.input
+ field={@edit_form[:height1_ft]}
+ type="number"
+ label="Height 1 (ft AGL)"
+ min="0"
+ max="1000"
+ placeholder="Optional"
+ />
<.input field={@edit_form[:station2]} type="text" label="Station 2" />
<.input field={@edit_form[:grid2]} type="text" label="Grid 2" />
+ <.input
+ field={@edit_form[:height2_ft]}
+ type="number"
+ label="Height 2 (ft AGL)"
+ min="0"
+ max="1000"
+ placeholder="Optional"
+ />
<.input field={@edit_form[:band]} type="select" label="Band" options={@band_options} />
@@ -1647,16 +1665,18 @@ defmodule MicrowavepropWeb.ContactLive.Show do
{:ok, profile} <- safe_fetch_elevation(lat1, lon1, lat2, lon2) do
freq_ghz = band_to_ghz(contact.band)
dist_km = haversine_km(lat1, lon1, lat2, lon2)
- # Assume both stations are at 10 ft (3.048 m) AGL so the path
- # analysis doesn't pretend the antennas are sitting on the dirt.
- ant_ht_m = 3.048
- analysis = TerrainAnalysis.analyse(profile, dist_km, freq_ghz, ant_ht_a: ant_ht_m, ant_ht_b: ant_ht_m)
+ # Default to 10 ft (3.048 m) AGL when the operator didn't record an
+ # antenna height — better than pretending the antenna is on the dirt.
+ default_ht_m = 3.048
+ ant_ht_a_m = ft_to_m(contact.height1_ft) || default_ht_m
+ ant_ht_b_m = ft_to_m(contact.height2_ft) || default_ht_m
+ analysis = TerrainAnalysis.analyse(profile, dist_km, freq_ghz, ant_ht_a: ant_ht_a_m, ant_ht_b: ant_ht_b_m)
fwd_az = initial_bearing(lat1, lon1, lat2, lon2)
rev_az = initial_bearing(lat2, lon2, lat1, lon1)
- tx_elev = hd(profile).elev + ant_ht_m
- rx_elev = List.last(profile).elev + ant_ht_m
+ tx_elev = hd(profile).elev + ant_ht_a_m
+ rx_elev = List.last(profile).elev + ant_ht_b_m
fwd_el = elevation_angle(tx_elev, rx_elev, dist_km * 1000)
rev_el = elevation_angle(rx_elev, tx_elev, dist_km * 1000)
@@ -1804,7 +1824,7 @@ defmodule MicrowavepropWeb.ContactLive.Show do
defp mark_likely_duct(ducts, tx_elev, rx_elev) do
avg_elev = (tx_elev + rx_elev) / 2
- {likely_idx, _} =
+ {_, likely_idx} =
ducts
|> Enum.with_index()
|> Enum.min_by(fn {d, _idx} ->
@@ -1838,6 +1858,9 @@ defmodule MicrowavepropWeb.ContactLive.Show do
|> Kernel./(1000)
end
+ defp ft_to_m(nil), do: nil
+ defp ft_to_m(ft) when is_integer(ft), do: ft * 0.3048
+
defp haversine_km(lat1, lon1, lat2, lon2) do
dlat = deg_to_rad(lat2 - lat1)
dlon = deg_to_rad(lon2 - lon1)
@@ -1937,7 +1960,7 @@ defmodule MicrowavepropWeb.ContactLive.Show do
summary =
build_summary(terrain, elevation_profile, hrrr, soundings, dist_km, band_mhz, contact)
- details = build_details(hrrr, hrrr_path, soundings, elevation_profile, band_mhz)
+ details = build_details(hrrr, hrrr_path, soundings, elevation_profile, band_mhz, contact)
%{
summary: summary,
@@ -2137,9 +2160,10 @@ defmodule MicrowavepropWeb.ContactLive.Show do
defp band_summary(_, _), do: nil
- defp build_details(hrrr, hrrr_path, soundings, elevation_profile, _band_mhz) do
+ defp build_details(hrrr, hrrr_path, soundings, elevation_profile, _band_mhz, contact) do
Enum.reject(
[
+ antenna_heights_detail(contact),
refractivity_detail(hrrr),
boundary_layer_detail(hrrr),
path_duct_count_detail(hrrr_path),
@@ -2150,6 +2174,21 @@ defmodule MicrowavepropWeb.ContactLive.Show do
)
end
+ defp antenna_heights_detail(%{height1_ft: h1, height2_ft: h2} = contact) when is_integer(h1) or is_integer(h2) do
+ s1 = contact.station1 || "Station 1"
+ s2 = contact.station2 || "Station 2"
+
+ parts =
+ Enum.reject(
+ [if(is_integer(h1), do: "#{s1} @ #{h1} ft AGL"), if(is_integer(h2), do: "#{s2} @ #{h2} ft AGL")],
+ &is_nil/1
+ )
+
+ "Antenna heights: #{Enum.join(parts, ", ")}."
+ end
+
+ defp antenna_heights_detail(_), do: nil
+
defp path_duct_count_detail(hrrr_path) when is_list(hrrr_path) and hrrr_path != [] do
total = length(hrrr_path)
ducting = Enum.count(hrrr_path, &(&1 && &1.ducting_detected))
diff --git a/lib/microwaveprop_web/live/submit_live.ex b/lib/microwaveprop_web/live/submit_live.ex
index d4b59d99..77d37be2 100644
--- a/lib/microwaveprop_web/live/submit_live.ex
+++ b/lib/microwaveprop_web/live/submit_live.ex
@@ -324,7 +324,7 @@ defmodule MicrowavepropWeb.SubmitLive do
defp single_contact_form(assigns) do
~H"""
<.form for={@form} id="contact-form" phx-change="validate" phx-submit="save" class="space-y-4">
-
+
<.input field={@form[:station1]} type="text" label="Station 1" placeholder="W5XD" required />
<.input
field={@form[:grid1]}
@@ -334,6 +334,14 @@ defmodule MicrowavepropWeb.SubmitLive do
phx-debounce="blur"
required
/>
+ <.input
+ field={@form[:height1_ft]}
+ type="number"
+ label="Height 1 (ft AGL)"
+ min="0"
+ max="1000"
+ placeholder="Optional"
+ />
<.input field={@form[:station2]} type="text" label="Station 2" placeholder="K5TR" required />
<.input
field={@form[:grid2]}
@@ -343,10 +351,19 @@ defmodule MicrowavepropWeb.SubmitLive do
phx-debounce="blur"
required
/>
+ <.input
+ field={@form[:height2_ft]}
+ type="number"
+ label="Height 2 (ft AGL)"
+ min="0"
+ max="1000"
+ placeholder="Optional"
+ />
Be as specific as possible with grid squares (8 characters preferred, e.g. EM12kp37).
+ Antenna heights are optional but improve terrain-clearance analysis.
diff --git a/priv/repo/migrations/20260418204008_add_height_ft_to_contacts.exs b/priv/repo/migrations/20260418204008_add_height_ft_to_contacts.exs
new file mode 100644
index 00000000..05b6691b
--- /dev/null
+++ b/priv/repo/migrations/20260418204008_add_height_ft_to_contacts.exs
@@ -0,0 +1,10 @@
+defmodule Microwaveprop.Repo.Migrations.AddHeightFtToContacts do
+ use Ecto.Migration
+
+ def change do
+ alter table(:contacts) do
+ add :height1_ft, :integer
+ add :height2_ft, :integer
+ end
+ end
+end
diff --git a/test/microwaveprop/radio/contact_edit_test.exs b/test/microwaveprop/radio/contact_edit_test.exs
index 8688b073..191b7b5e 100644
--- a/test/microwaveprop/radio/contact_edit_test.exs
+++ b/test/microwaveprop/radio/contact_edit_test.exs
@@ -5,6 +5,30 @@ defmodule Microwaveprop.Radio.ContactEditTest do
alias Microwaveprop.Radio
alias Microwaveprop.Radio.Contact
alias Microwaveprop.Radio.ContactEdit
+ alias Microwaveprop.Terrain.ElevationClient
+ alias Microwaveprop.Weather.HrrrClient
+ alias Microwaveprop.Weather.IemClient
+
+ setup do
+ # Height edits auto-enqueue TerrainProfileWorker (which Oban runs
+ # inline in tests). Stub the external data sources so the job can
+ # complete without hitting the network.
+ Req.Test.stub(ElevationClient, fn conn ->
+ params = Plug.Conn.fetch_query_params(conn).query_params
+ lat_count = params["latitude"] |> String.split(",") |> length()
+ Req.Test.json(conn, %{"elevation" => List.duplicate(200.0, lat_count)})
+ end)
+
+ Req.Test.stub(HrrrClient, fn conn ->
+ Plug.Conn.send_resp(conn, 404, "not found")
+ end)
+
+ Req.Test.stub(IemClient, fn conn ->
+ Plug.Conn.send_resp(conn, 404, "not found")
+ end)
+
+ :ok
+ end
@contact_attrs %{
station1: "W5ISP",
@@ -120,6 +144,39 @@ defmodule Microwaveprop.Radio.ContactEditTest do
refute changeset.valid?
end
+ test "accepts integer height1_ft and height2_ft", %{contact: contact, user: user} do
+ changeset =
+ ContactEdit.changeset(%ContactEdit{}, %{
+ contact_id: contact.id,
+ user_id: user.id,
+ proposed_changes: %{"height1_ft" => 25, "height2_ft" => 60}
+ })
+
+ assert changeset.valid?
+ end
+
+ test "rejects non-integer height1_ft", %{contact: contact, user: user} do
+ changeset =
+ ContactEdit.changeset(%ContactEdit{}, %{
+ contact_id: contact.id,
+ user_id: user.id,
+ proposed_changes: %{"height1_ft" => "tall"}
+ })
+
+ refute changeset.valid?
+ end
+
+ test "rejects out-of-range height2_ft", %{contact: contact, user: user} do
+ changeset =
+ ContactEdit.changeset(%ContactEdit{}, %{
+ contact_id: contact.id,
+ user_id: user.id,
+ proposed_changes: %{"height2_ft" => 9999}
+ })
+
+ refute changeset.valid?
+ end
+
test "validates mode value", %{contact: contact, user: user} do
changeset =
ContactEdit.changeset(%ContactEdit{}, %{
@@ -301,6 +358,26 @@ defmodule Microwaveprop.Radio.ContactEditTest do
assert {:error, :no_changes} =
Radio.apply_owner_edit(contact, user, %{"station1" => contact.station1})
end
+
+ test "owner can set height1_ft and height2_ft", %{user: user} do
+ contact = owned_contact(user)
+
+ assert {:ok, updated} =
+ Radio.apply_owner_edit(contact, user, %{"height1_ft" => 20, "height2_ft" => 75})
+
+ assert updated.height1_ft == 20
+ assert updated.height2_ft == 75
+ end
+
+ test "height change resets terrain_status so terrain is re-analyzed", %{user: user} do
+ contact = owned_contact(user)
+ contact = contact |> Ecto.Changeset.change(terrain_status: :complete) |> Repo.update!()
+
+ {:ok, updated} = Radio.apply_owner_edit(contact, user, %{"height1_ft" => 30})
+
+ assert updated.height1_ft == 30
+ assert updated.terrain_status == :pending
+ end
end
describe "Radio.owner?/2" do
diff --git a/test/microwaveprop/radio/contact_test.exs b/test/microwaveprop/radio/contact_test.exs
index efa3279f..7526602c 100644
--- a/test/microwaveprop/radio/contact_test.exs
+++ b/test/microwaveprop/radio/contact_test.exs
@@ -42,5 +42,35 @@ defmodule Microwaveprop.Radio.ContactTest do
assert Decimal.equal?(contact.band, Decimal.new("144.2"))
assert Decimal.equal?(contact.distance_km, Decimal.new("623.4"))
end
+
+ test "accepts optional height1_ft and height2_ft" do
+ attrs = Map.merge(@valid_attrs, %{height1_ft: 25, height2_ft: 60})
+ changeset = Contact.changeset(%Contact{}, attrs)
+ assert changeset.valid?
+ assert {:ok, contact} = Repo.insert(changeset)
+ assert contact.height1_ft == 25
+ assert contact.height2_ft == 60
+ end
+ end
+
+ describe "submission_changeset/2" do
+ @submission_attrs %{
+ "station1" => "W1AW",
+ "station2" => "K3LR",
+ "qso_timestamp" => "2026-03-28T12:00:00Z",
+ "grid1" => "FN31pr",
+ "grid2" => "EN91jm",
+ "mode" => "SSB",
+ "band" => Decimal.new("144"),
+ "submitter_email" => "test@example.com"
+ }
+
+ test "accepts height1_ft and height2_ft" do
+ attrs = Map.merge(@submission_attrs, %{"height1_ft" => 10, "height2_ft" => 50})
+ changeset = Contact.submission_changeset(%Contact{}, attrs)
+ assert changeset.valid?, inspect(errors_on(changeset))
+ assert Ecto.Changeset.get_field(changeset, :height1_ft) == 10
+ assert Ecto.Changeset.get_field(changeset, :height2_ft) == 50
+ end
end
end