map bounds fix

This commit is contained in:
Graham McIntire 2025-06-21 22:19:47 -05:00
parent f3ca970174
commit 1e22a54e47
No known key found for this signature in database
3 changed files with 78 additions and 93 deletions

View file

@ -6,9 +6,9 @@ defmodule Aprs.Release do
@app :aprs @app :aprs
def migrate do def migrate do
require Logger
# Initialize deployment timestamp first # Initialize deployment timestamp first
deployed_at = init() deployed_at = init()
require Logger
Logger.info("Deployment timestamp: #{deployed_at}") Logger.info("Deployment timestamp: #{deployed_at}")
# Run migrations # Run migrations
@ -20,10 +20,6 @@ defmodule Aprs.Release do
{:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version)) {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version))
end end
defp repos do
Application.fetch_env!(@app, :ecto_repos)
end
defp load_app do defp load_app do
Application.load(@app) Application.load(@app)
end end

View file

@ -143,18 +143,14 @@ defmodule AprsWeb.MapLive.Index do
@impl true @impl true
def handle_event("bounds_changed", %{"bounds" => bounds}, socket) do def handle_event("bounds_changed", %{"bounds" => bounds}, socket) do
Logger.debug( Logger.debug("handle_event bounds_changed: #{inspect(bounds)} vs current #{inspect(socket.assigns.map_bounds)}")
"handle_event bounds_changed: #{inspect(bounds)} vs current #{inspect(socket.assigns.map_bounds)}"
)
handle_bounds_update(bounds, socket) handle_bounds_update(bounds, socket)
end end
@impl true @impl true
def handle_event("update_bounds", %{"bounds" => bounds}, socket) do def handle_event("update_bounds", %{"bounds" => bounds}, socket) do
Logger.debug( Logger.debug("handle_event update_bounds: #{inspect(bounds)} vs current #{inspect(socket.assigns.map_bounds)}")
"handle_event update_bounds: #{inspect(bounds)} vs current #{inspect(socket.assigns.map_bounds)}"
)
handle_bounds_update(bounds, socket) handle_bounds_update(bounds, socket)
end end
@ -318,9 +314,7 @@ defmodule AprsWeb.MapLive.Index do
west: bounds["west"] west: bounds["west"]
} }
Logger.debug( Logger.debug("handle_bounds_update: new #{inspect(map_bounds)} vs current #{inspect(socket.assigns.map_bounds)}")
"handle_bounds_update: new #{inspect(map_bounds)} vs current #{inspect(socket.assigns.map_bounds)}"
)
# Validate bounds to prevent invalid coordinates # Validate bounds to prevent invalid coordinates
if map_bounds.north > 90 or map_bounds.south < -90 or if map_bounds.north > 90 or map_bounds.south < -90 or
@ -346,9 +340,7 @@ defmodule AprsWeb.MapLive.Index do
@spec process_bounds_update(map(), Socket.t()) :: Socket.t() @spec process_bounds_update(map(), Socket.t()) :: Socket.t()
defp process_bounds_update(map_bounds, socket) do defp process_bounds_update(map_bounds, socket) do
Logger.debug( Logger.debug("process_bounds_update: Loading historical packets for bounds #{inspect(map_bounds)}")
"process_bounds_update: Loading historical packets for bounds #{inspect(map_bounds)}"
)
# Remove out-of-bounds packets and markers immediately # Remove out-of-bounds packets and markers immediately
new_visible_packets = new_visible_packets =
@ -382,29 +374,21 @@ defmodule AprsWeb.MapLive.Index do
end end
@impl true @impl true
def handle_info({:process_bounds_update, map_bounds}, socket), def handle_info({:process_bounds_update, map_bounds}, socket), do: handle_info_process_bounds_update(map_bounds, socket)
do: handle_info_process_bounds_update(map_bounds, socket)
def handle_info({:delayed_zoom, %{lat: lat, lng: lng}}, socket), def handle_info({:delayed_zoom, %{lat: lat, lng: lng}}, socket), do: handle_info_delayed_zoom(lat, lng, socket)
do: handle_info_delayed_zoom(lat, lng, socket)
def handle_info({:ip_location, %{lat: lat, lng: lng}}, socket), def handle_info({:ip_location, %{lat: lat, lng: lng}}, socket), do: handle_info_ip_location(lat, lng, socket)
do: handle_info_ip_location(lat, lng, socket)
def handle_info(:initialize_replay, socket), do: handle_info_initialize_replay(socket) def handle_info(:initialize_replay, socket), do: handle_info_initialize_replay(socket)
def handle_info(:cleanup_old_packets, socket), do: handle_cleanup_old_packets(socket) def handle_info(:cleanup_old_packets, socket), do: handle_cleanup_old_packets(socket)
def handle_info(:reload_historical_packets, socket), def handle_info(:reload_historical_packets, socket), do: handle_reload_historical_packets(socket)
do: handle_reload_historical_packets(socket)
def handle_info({:postgres_packet, packet}, socket), def handle_info({:postgres_packet, packet}, socket), do: handle_info_postgres_packet(packet, socket)
do: handle_info_postgres_packet(packet, socket)
def handle_info( def handle_info(%Phoenix.Socket.Broadcast{topic: "aprs_messages", event: "packet", payload: packet}, socket),
%Phoenix.Socket.Broadcast{topic: "aprs_messages", event: "packet", payload: packet},
socket
),
do: handle_info({:postgres_packet, packet}, socket) do: handle_info({:postgres_packet, packet}, socket)
# Private handler functions for each message type # Private handler functions for each message type

View file

@ -52,6 +52,10 @@ defmodule AprsWeb.MapLive.MapHelpers do
@spec within_bounds?(map() | tuple(), map()) :: boolean() @spec within_bounds?(map() | tuple(), map()) :: boolean()
def within_bounds?(packet_or_coords, bounds) do def within_bounds?(packet_or_coords, bounds) do
# Handle nil bounds
if is_nil(bounds) do
false
else
to_float = fn to_float = fn
n when is_float(n) -> n when is_float(n) ->
n n
@ -115,4 +119,5 @@ defmodule AprsWeb.MapLive.MapHelpers do
lat_in_bounds && lng_in_bounds lat_in_bounds && lng_in_bounds
end end
end end
end
end end