debug cleanup
This commit is contained in:
parent
c40e85d47a
commit
b71ae879e9
2 changed files with 1 additions and 38 deletions
|
|
@ -61,16 +61,11 @@ let MapAPRSMap = {
|
||||||
try {
|
try {
|
||||||
const centerData = self.el.dataset.center;
|
const centerData = self.el.dataset.center;
|
||||||
const zoomData = self.el.dataset.zoom;
|
const zoomData = self.el.dataset.zoom;
|
||||||
console.log("Map data attributes - center:", centerData, "zoom:", zoomData);
|
|
||||||
console.log("Full element dataset:", self.el.dataset);
|
|
||||||
console.log("Window location:", window.location.href);
|
|
||||||
console.log("Element HTML:", self.el.outerHTML.substring(0, 200));
|
|
||||||
|
|
||||||
if (!centerData || !zoomData) throw new Error("Missing map data attributes");
|
if (!centerData || !zoomData) throw new Error("Missing map data attributes");
|
||||||
initialCenter = JSON.parse(centerData);
|
initialCenter = JSON.parse(centerData);
|
||||||
initialZoom = parseInt(zoomData);
|
initialZoom = parseInt(zoomData);
|
||||||
|
|
||||||
console.log("Parsed initial values - center:", initialCenter, "zoom:", initialZoom);
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
!initialCenter ||
|
!initialCenter ||
|
||||||
|
|
@ -549,8 +544,6 @@ let MapAPRSMap = {
|
||||||
|
|
||||||
// Zoom to location
|
// Zoom to location
|
||||||
self.handleEvent("zoom_to_location", (data: { lat: number; lng: number; zoom?: number }) => {
|
self.handleEvent("zoom_to_location", (data: { lat: number; lng: number; zoom?: number }) => {
|
||||||
console.log("Received zoom_to_location event:", data);
|
|
||||||
|
|
||||||
if (!self.map) {
|
if (!self.map) {
|
||||||
console.error("Map not initialized, cannot zoom");
|
console.error("Map not initialized, cannot zoom");
|
||||||
return;
|
return;
|
||||||
|
|
@ -560,8 +553,6 @@ let MapAPRSMap = {
|
||||||
const lat = parseFloat(data.lat.toString());
|
const lat = parseFloat(data.lat.toString());
|
||||||
const lng = parseFloat(data.lng.toString());
|
const lng = parseFloat(data.lng.toString());
|
||||||
const zoom = parseInt(data.zoom?.toString() || "12");
|
const zoom = parseInt(data.zoom?.toString() || "12");
|
||||||
|
|
||||||
console.log("Zooming to location:", { lat, lng, zoom });
|
|
||||||
|
|
||||||
// Validate coordinates
|
// Validate coordinates
|
||||||
if (isNaN(lat) || isNaN(lng) || lat < -90 || lat > 90 || lng < -180 || lng > 180) {
|
if (isNaN(lat) || isNaN(lng) || lat < -90 || lat > 90 || lng < -180 || lng > 180) {
|
||||||
|
|
|
||||||
|
|
@ -89,8 +89,6 @@ defmodule AprsmeWeb.MapLive.Index do
|
||||||
{url_center, url_zoom} = parse_map_params(params)
|
{url_center, url_zoom} = parse_map_params(params)
|
||||||
|
|
||||||
# Check for IP geolocation in session
|
# Check for IP geolocation in session
|
||||||
Logger.info("MapLive: Checking IP geolocation. Session data: #{inspect(session["ip_geolocation"])}")
|
|
||||||
Logger.info("MapLive: URL params: #{inspect(params)}")
|
|
||||||
|
|
||||||
# Check if URL params were explicitly provided (not just defaults)
|
# Check if URL params were explicitly provided (not just defaults)
|
||||||
has_explicit_url_params = params["lat"] || params["lng"] || params["z"]
|
has_explicit_url_params = params["lat"] || params["lng"] || params["z"]
|
||||||
|
|
@ -100,30 +98,20 @@ defmodule AprsmeWeb.MapLive.Index do
|
||||||
%{"lat" => lat, "lng" => lng} when is_number(lat) and is_number(lng) ->
|
%{"lat" => lat, "lng" => lng} when is_number(lat) and is_number(lng) ->
|
||||||
if has_explicit_url_params do
|
if has_explicit_url_params do
|
||||||
# URL params explicitly provided - use them
|
# URL params explicitly provided - use them
|
||||||
Logger.info(
|
|
||||||
"MapLive: Explicit URL params present, using URL center: #{inspect(url_center)}, zoom: #{url_zoom}"
|
|
||||||
)
|
|
||||||
|
|
||||||
{url_center, url_zoom, false}
|
{url_center, url_zoom, false}
|
||||||
else
|
else
|
||||||
# No explicit URL params - use IP geolocation
|
# No explicit URL params - use IP geolocation
|
||||||
geo_center = %{lat: lat, lng: lng}
|
geo_center = %{lat: lat, lng: lng}
|
||||||
Logger.info("MapLive: Using IP geolocation center: #{inspect(geo_center)}, zoom: 12")
|
{geo_center, 11, true}
|
||||||
{geo_center, 12, true}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
_ ->
|
_ ->
|
||||||
# No geolocation available, use URL params or defaults
|
# No geolocation available, use URL params or defaults
|
||||||
Logger.info(
|
|
||||||
"MapLive: No IP geolocation found, using URL/default center: #{inspect(url_center)}, zoom: #{url_zoom}"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Skip initial URL update if no explicit params were provided
|
# Skip initial URL update if no explicit params were provided
|
||||||
{url_center, url_zoom, !has_explicit_url_params}
|
{url_center, url_zoom, !has_explicit_url_params}
|
||||||
end
|
end
|
||||||
|
|
||||||
Logger.info("MapLive: Final map params - center: #{inspect(map_center)}, zoom: #{map_zoom}")
|
|
||||||
|
|
||||||
socket = assign_defaults(socket, one_hour_ago)
|
socket = assign_defaults(socket, one_hour_ago)
|
||||||
|
|
||||||
# Initialize the flag to track if initial historical load is completed
|
# Initialize the flag to track if initial historical load is completed
|
||||||
|
|
@ -137,8 +125,6 @@ defmodule AprsmeWeb.MapLive.Index do
|
||||||
Phoenix.PubSub.subscribe(Aprsme.PubSub, "postgres:aprsme_packets")
|
Phoenix.PubSub.subscribe(Aprsme.PubSub, "postgres:aprsme_packets")
|
||||||
end
|
end
|
||||||
|
|
||||||
Logger.info("MapLive: Mount completed with assigns - map_center: #{inspect(map_center)}, map_zoom: #{map_zoom}")
|
|
||||||
|
|
||||||
{:ok,
|
{:ok,
|
||||||
assign(socket,
|
assign(socket,
|
||||||
map_ready: false,
|
map_ready: false,
|
||||||
|
|
@ -311,12 +297,6 @@ defmodule AprsmeWeb.MapLive.Index do
|
||||||
def handle_event("map_ready", _params, socket) do
|
def handle_event("map_ready", _params, socket) do
|
||||||
require Logger
|
require Logger
|
||||||
|
|
||||||
Logger.info(
|
|
||||||
"map_ready event received - current map_center: #{inspect(socket.assigns.map_center)}, map_zoom: #{socket.assigns.map_zoom}"
|
|
||||||
)
|
|
||||||
|
|
||||||
Logger.info("map_ready - default center for comparison: #{inspect(@default_center)}")
|
|
||||||
|
|
||||||
# Mark map as ready and that we need to load historical packets
|
# Mark map as ready and that we need to load historical packets
|
||||||
socket =
|
socket =
|
||||||
socket
|
socket
|
||||||
|
|
@ -327,16 +307,8 @@ defmodule AprsmeWeb.MapLive.Index do
|
||||||
socket =
|
socket =
|
||||||
if socket.assigns.map_center.lat == @default_center.lat and
|
if socket.assigns.map_center.lat == @default_center.lat and
|
||||||
socket.assigns.map_center.lng == @default_center.lng do
|
socket.assigns.map_center.lng == @default_center.lng do
|
||||||
Logger.info(
|
|
||||||
"MapLive: Map center is default (#{socket.assigns.map_center.lat}, #{socket.assigns.map_center.lng}), not applying geolocation"
|
|
||||||
)
|
|
||||||
|
|
||||||
socket
|
socket
|
||||||
else
|
else
|
||||||
Logger.info(
|
|
||||||
"MapLive: Sending zoom_to_location event - center: #{inspect(socket.assigns.map_center)}, zoom: #{socket.assigns.map_zoom}"
|
|
||||||
)
|
|
||||||
|
|
||||||
push_event(socket, "zoom_to_location", %{
|
push_event(socket, "zoom_to_location", %{
|
||||||
lat: socket.assigns.map_center.lat,
|
lat: socket.assigns.map_center.lat,
|
||||||
lng: socket.assigns.map_center.lng,
|
lng: socket.assigns.map_center.lng,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue