Add live transmitter position (status) alongside logged points
devices/<serial>/log messages now carry a "type": "log" or "status". "log" persists a LocatePoint as before; "status" carries the same position + telemetry shape but is broadcast live over the job's realtime channel without touching locate_points — it's a current- position update, not a recorded point. The job map renders the latest status as a blue "you are here" marker (with a soft accuracy-radius halo) that moves in place as new updates arrive, separate from the colored polyline of logged points. Clicking it shows the same detail readout as a logged point. The simulator gained a message-type toggle (Log point / Status update) so both paths can be exercised from /sim. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
/// <reference types="google.maps" />
|
||||
import { APIProvider, InfoWindow, Map as GoogleMap, useMap } from '@vis.gl/react-google-maps';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { JobMapProps, MapPoint, pointDetailRows, UTILITY_COLORS } from '../types';
|
||||
import { JobMapProps, LiveStatus, liveStatusToMapPoint, MapPoint, pointDetailRows, UTILITY_COLORS } from '../types';
|
||||
|
||||
const API_KEY = process.env.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY || '';
|
||||
const LIVE_COLOR = '#1a73e8';
|
||||
|
||||
const DEFAULT_CENTER = { lat: 39.5, lng: -98.35 }; // continental US
|
||||
const DEFAULT_ZOOM = 4;
|
||||
@@ -95,6 +96,80 @@ function PointsLayer({
|
||||
return null;
|
||||
}
|
||||
|
||||
// Renders the transmitter's current position as a "blue dot" (marker + soft
|
||||
// accuracy halo), updated in place as new status messages arrive.
|
||||
function LiveMarker({ status, onSelect }: { status: LiveStatus | null; onSelect: (point: MapPoint) => void }) {
|
||||
const map = useMap();
|
||||
const markerRef = useRef<google.maps.Marker | null>(null);
|
||||
const haloRef = useRef<google.maps.Circle | null>(null);
|
||||
const statusRef = useRef(status);
|
||||
statusRef.current = status;
|
||||
const onSelectRef = useRef(onSelect);
|
||||
onSelectRef.current = onSelect;
|
||||
|
||||
useEffect(() => {
|
||||
if (!map) {
|
||||
return;
|
||||
}
|
||||
if (!status) {
|
||||
markerRef.current?.setMap(null);
|
||||
haloRef.current?.setMap(null);
|
||||
markerRef.current = null;
|
||||
haloRef.current = null;
|
||||
return;
|
||||
}
|
||||
|
||||
const position = { lat: status.lat, lng: status.lng };
|
||||
|
||||
if (!markerRef.current) {
|
||||
markerRef.current = new google.maps.Marker({
|
||||
map,
|
||||
position,
|
||||
zIndex: 999,
|
||||
cursor: 'pointer',
|
||||
icon: {
|
||||
path: google.maps.SymbolPath.CIRCLE,
|
||||
scale: 8,
|
||||
fillColor: LIVE_COLOR,
|
||||
fillOpacity: 1,
|
||||
strokeColor: '#ffffff',
|
||||
strokeWeight: 2,
|
||||
},
|
||||
});
|
||||
markerRef.current.addListener('click', () => {
|
||||
if (statusRef.current) {
|
||||
onSelectRef.current(liveStatusToMapPoint(statusRef.current));
|
||||
}
|
||||
});
|
||||
haloRef.current = new google.maps.Circle({
|
||||
map,
|
||||
center: position,
|
||||
radius: status.hAccuracy ?? 5,
|
||||
fillColor: LIVE_COLOR,
|
||||
fillOpacity: 0.15,
|
||||
strokeColor: LIVE_COLOR,
|
||||
strokeOpacity: 0.3,
|
||||
strokeWeight: 1,
|
||||
clickable: false,
|
||||
});
|
||||
} else {
|
||||
markerRef.current.setPosition(position);
|
||||
haloRef.current?.setCenter(position);
|
||||
haloRef.current?.setRadius(status.hAccuracy ?? 5);
|
||||
}
|
||||
}, [map, status]);
|
||||
|
||||
useEffect(
|
||||
() => () => {
|
||||
markerRef.current?.setMap(null);
|
||||
haloRef.current?.setMap(null);
|
||||
},
|
||||
[],
|
||||
);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
function PointDetails({ point, onClose }: { point: MapPoint; onClose: () => void }) {
|
||||
return (
|
||||
<InfoWindow position={{ lat: point.lat, lng: point.lng }} onCloseClick={onClose}>
|
||||
@@ -114,7 +189,7 @@ function PointDetails({ point, onClose }: { point: MapPoint; onClose: () => void
|
||||
);
|
||||
}
|
||||
|
||||
export default function GoogleJobMap({ points, fitBounds = true, heightPx = 480 }: JobMapProps) {
|
||||
export default function GoogleJobMap({ points, liveStatus = null, fitBounds = true, heightPx = 480 }: JobMapProps) {
|
||||
const [selected, setSelected] = useState<MapPoint | null>(null);
|
||||
|
||||
if (!API_KEY) {
|
||||
@@ -136,8 +211,17 @@ export default function GoogleJobMap({ points, fitBounds = true, heightPx = 480
|
||||
}
|
||||
|
||||
// A point can be re-fetched (new object identity) between renders; keep the
|
||||
// InfoWindow anchored to the latest copy of the same point by id.
|
||||
const selectedCurrent = selected ? (points.find((p) => p.id === selected.id) ?? selected) : null;
|
||||
// InfoWindow anchored to the latest copy of the same point by id. The live
|
||||
// marker's "point" is synthesized fresh from liveStatus each time.
|
||||
const selectedCurrent = (() => {
|
||||
if (!selected) {
|
||||
return null;
|
||||
}
|
||||
if (selected.id.startsWith('live-')) {
|
||||
return liveStatus ? liveStatusToMapPoint(liveStatus) : null;
|
||||
}
|
||||
return points.find((p) => p.id === selected.id) ?? selected;
|
||||
})();
|
||||
|
||||
return (
|
||||
<div style={{ height: heightPx, borderRadius: 8, overflow: 'hidden' }}>
|
||||
@@ -150,6 +234,7 @@ export default function GoogleJobMap({ points, fitBounds = true, heightPx = 480
|
||||
onClick={() => setSelected(null)}
|
||||
>
|
||||
<PointsLayer points={points} fitBounds={fitBounds} onSelect={setSelected} />
|
||||
<LiveMarker status={liveStatus} onSelect={setSelected} />
|
||||
{selectedCurrent && <PointDetails point={selectedCurrent} onClose={() => setSelected(null)} />}
|
||||
</GoogleMap>
|
||||
</APIProvider>
|
||||
|
||||
@@ -67,8 +67,41 @@ export function pointDetailRows(p: MapPoint): Array<[string, string]> {
|
||||
return rows;
|
||||
}
|
||||
|
||||
// A transmitter's current position, pushed live over the job's realtime
|
||||
// channel. Never persisted as a LocatePoint — just the latest "where is it
|
||||
// right now," replaced in place as new status updates arrive.
|
||||
export interface LiveStatus {
|
||||
deviceId: string;
|
||||
serial: string;
|
||||
lat: number;
|
||||
lng: number;
|
||||
altitude: number | null;
|
||||
utilityType: string;
|
||||
fixType: string;
|
||||
hAccuracy: number | null;
|
||||
vAccuracy: number | null;
|
||||
satellites: number | null;
|
||||
hdop: number | null;
|
||||
depth: number | null;
|
||||
frequencyHz: number | null;
|
||||
currentMa: number | null;
|
||||
signalDb: number | null;
|
||||
gainDb: number | null;
|
||||
locateMode: string | null;
|
||||
phaseDeg: number | null;
|
||||
compassDeg: number | null;
|
||||
distortionPct: number | null;
|
||||
recordedAt: string;
|
||||
}
|
||||
|
||||
export function liveStatusToMapPoint(s: LiveStatus): MapPoint {
|
||||
return { ...s, id: `live-${s.serial}`, sequence: null };
|
||||
}
|
||||
|
||||
export interface JobMapProps {
|
||||
points: MapPoint[];
|
||||
// Live current position of a transmitter, shown as a distinct marker
|
||||
liveStatus?: LiveStatus | null;
|
||||
// Pan/zoom to fit all points whenever their count changes
|
||||
fitBounds?: boolean;
|
||||
heightPx?: number;
|
||||
|
||||
Reference in New Issue
Block a user