- <%= for ring <- @estimate.rings do %>
+ <%= for tier <- @estimate.tiers do %>
- {ring.label}
- ({ring.rx_dbm} dBm) → {ring.radius_km} km
+ {tier.label}
+ (≥ {tier.min_dbm} dBm)
<% end %>
diff --git a/test/microwaveprop/beacons/range_estimate_test.exs b/test/microwaveprop/beacons/range_estimate_test.exs
index 3fdfd703..d34b5f53 100644
--- a/test/microwaveprop/beacons/range_estimate_test.exs
+++ b/test/microwaveprop/beacons/range_estimate_test.exs
@@ -49,48 +49,68 @@ defmodule Microwaveprop.Beacons.RangeEstimateTest do
end
describe "estimate/1" do
- test "returns a map with band info, score, and a list of rings" do
+ test "returns a map with band info, center score, and per-grid cells" do
result = RangeEstimate.estimate(beacon())
assert result.band_mhz == 10_000
- assert is_integer(result.score) or is_float(result.score)
+ assert is_integer(result.center_score) or is_float(result.center_score)
assert is_float(result.eirp_dbm)
- assert is_list(result.rings)
- assert length(result.rings) > 0
+ assert is_list(result.cells)
+ assert length(result.cells) > 0
+ assert result.grid_step == 0.125
+ assert is_list(result.tiers)
end
- test "rings are ordered strongest-to-weakest with increasing radius" do
- result = RangeEstimate.estimate(beacon())
- radii = Enum.map(result.rings, & &1.radius_km)
- assert radii == Enum.sort(radii)
- end
-
- test "each ring carries a label, color, threshold, and radius_km" do
+ test "each cell carries lat/lon, distance, rx_dbm, tier label/color" do
result = RangeEstimate.estimate(beacon())
- for ring <- result.rings do
- assert is_binary(ring.label)
- assert is_binary(ring.color)
- assert is_number(ring.rx_dbm)
- assert is_float(ring.radius_km)
- assert ring.radius_km >= 0.0
+ for cell <- result.cells do
+ assert is_float(cell.lat)
+ assert is_float(cell.lon)
+ assert is_float(cell.distance_km)
+ assert is_integer(cell.rx_dbm)
+ assert is_binary(cell.label)
+ assert is_binary(cell.color)
+ # Detection floor enforced
+ assert cell.rx_dbm >= -145
end
end
- test "a more powerful beacon produces larger rings" do
+ test "cells closer to the beacon have stronger rx_dbm" do
+ result = RangeEstimate.estimate(beacon())
+
+ [closest | _] = Enum.sort_by(result.cells, & &1.distance_km)
+ [farthest | _] = Enum.sort_by(result.cells, &(-&1.distance_km))
+
+ assert closest.rx_dbm > farthest.rx_dbm
+ end
+
+ test "a more powerful beacon produces more cells" do
weak = RangeEstimate.estimate(beacon(power_mw: 10.0))
strong = RangeEstimate.estimate(beacon(power_mw: 10_000.0))
-
- weakest_weak = List.last(weak.rings).radius_km
- weakest_strong = List.last(strong.rings).radius_km
- assert weakest_strong > weakest_weak
+ assert length(strong.cells) > length(weak.cells)
end
test "uses a default score of 50 when no propagation data exists" do
result = RangeEstimate.estimate(beacon())
- # No scores in test DB → score defaults
- assert result.score == 50
+ # No scores in test DB → center defaults, cells all use 50.
+ assert result.center_score == 50
assert result.valid_time == nil
+
+ # All cells should have score 50 when there's no HRRR data.
+ assert Enum.all?(result.cells, fn c -> c.score == 50 end)
+ end
+
+ test "cells align with the 0.125° HRRR grid" do
+ result = RangeEstimate.estimate(beacon())
+
+ for cell <- result.cells do
+ # lat and lon should both be multiples of 0.125
+ lat_mod = abs(cell.lat / 0.125 - round(cell.lat / 0.125))
+ lon_mod = abs(cell.lon / 0.125 - round(cell.lon / 0.125))
+ assert lat_mod < 0.01
+ assert lon_mod < 0.01
+ end
end
end
end