borg/drone-detector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix jwt-token

Browse Source
This commit is contained in:
Alexander Borg
2025-09-07 14:27:36 +02:00
parent bb712ddc60
commit ab44f83464
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/src/pages/MapView.jsx
View File

@@ -394,17 +394,24 @@ const MapView = () => {
return hasCoords; return hasCoords;
}); });
// Group detections by detector position to handle multiple drones at same detector // Group detections by detector device to handle multiple drones at same detector
const detectionsByDetector = filteredDetections.reduce((acc, detection) => { const detectionsByDetector = filteredDetections.reduce((acc, detection) => {
const key = `${detection.geo_lat}_${detection.geo_lon}`; const key = detection.device_id; // Group by device_id instead of drone coordinates
if (!acc[key]) acc[key] = []; if (!acc[key]) acc[key] = [];
acc[key].push(detection); acc[key].push(detection);
return acc; return acc;
}, {}); }, {});
return Object.entries(detectionsByDetector).flatMap(([detectorKey, detections]) => { return Object.entries(detectionsByDetector).flatMap(([deviceId, detections]) => {
// Find the detector device for these detections
const detectorDevice = devices.find(d => d.id === parseInt(deviceId));
if (!detectorDevice || !detectorDevice.geo_lat || !detectorDevice.geo_lon) {
console.warn('MapView: No device found or missing coordinates for device_id:', deviceId);
return [];
}
return detections.map((detection, droneIndex) => { return detections.map((detection, droneIndex) => {
console.log('MapView: Rendering ring for detection:', detection, 'droneIndex:', droneIndex, 'totalDrones:', detections.length); console.log('MapView: Rendering ring for detection:', detection, 'droneIndex:', droneIndex, 'totalDrones:', detections.length, 'detector device:', detectorDevice);
const opacity = getDetectionOpacity(detection); const opacity = getDetectionOpacity(detection);
const age = getDetectionAge(detection); const age = getDetectionAge(detection);
console.log('MapView: Detection age:', age, 'opacity:', opacity); console.log('MapView: Detection age:', age, 'opacity:', opacity);
@@ -483,9 +490,9 @@ const MapView = () => {
const dashPattern = getDashPattern(detection.drone_type, droneIndex, totalDrones); const dashPattern = getDashPattern(detection.drone_type, droneIndex, totalDrones);
const [latOffset, lonOffset] = getPositionOffset(droneIndex, totalDrones); const [latOffset, lonOffset] = getPositionOffset(droneIndex, totalDrones);
// Ensure coordinates are numbers and properly calculated // Use detector device coordinates (NOT drone coordinates)
const baseLat = parseFloat(detection.geo_lat) || 0; const baseLat = parseFloat(detectorDevice.geo_lat) || 0;
const baseLon = parseFloat(detection.geo_lon) || 0; const baseLon = parseFloat(detectorDevice.geo_lon) || 0;
const centerLat = baseLat + latOffset; const centerLat = baseLat + latOffset;
const centerLon = baseLon + lonOffset; const centerLon = baseLon + lonOffset;