{/* Tab bar */}
-
@@ -72,6 +75,7 @@ export const PotaSotaPanel = ({
loading={potaLoading}
showOnMap={showPOTA}
onToggleMap={onTogglePOTA}
+ onSpotClick={onPOTASpotClick}
/>
) : activeTab === 'sota' ? (
) : (
)}
diff --git a/src/components/SOTAPanel.jsx b/src/components/SOTAPanel.jsx
index 2fd016be..7115e6c2 100644
--- a/src/components/SOTAPanel.jsx
+++ b/src/components/SOTAPanel.jsx
@@ -65,7 +65,17 @@ export const SOTAPanel = ({ data, loading, showOnMap, onToggleMap, onSpotClick }
{spot.ref}
- {spot.freq}
+ {(() => {
+ if (!spot.freq) return '?';
+ const freqVal = parseFloat(spot.freq);
+ if (freqVal > 1000) {
+ // It's in kHz, convert to MHz
+ return (freqVal / 1000).toFixed(3);
+ } else {
+ // Already in MHz
+ return freqVal.toFixed(3);
+ }
+ })()}
{spot.time}
diff --git a/src/components/WWFFPanel.jsx b/src/components/WWFFPanel.jsx
index 964ed215..ed6fc48a 100644
--- a/src/components/WWFFPanel.jsx
+++ b/src/components/WWFFPanel.jsx
@@ -12,13 +12,14 @@ export const WWFFPanel = ({
onToggleMap,
showLabelsOnMap = true,
onToggleLabelsOnMap,
+ onSpotClick,
}) => {
return (
-
@@ -61,7 +62,7 @@ export const WWFFPanel = ({
)}
{loading ? (
@@ -70,14 +71,16 @@ export const WWFFPanel = ({
) : data && data.length > 0 ? (
{data.map((spot, i) => (
-
onSpotClick?.(spot)}
+ style={{
display: 'grid',
gridTemplateColumns: '62px 62px 58px 1fr',
gap: '4px',
padding: '3px 0',
- borderBottom: i < data.length - 1 ? '1px solid var(--border-color)' : 'none'
+ borderBottom: i < data.length - 1 ? '1px solid var(--border-color)' : 'none',
+ cursor: 'pointer'
}}
>
@@ -87,7 +90,17 @@ export const WWFFPanel = ({
{spot.ref}
- {spot.freq}
+ {(() => {
+ if (!spot.freq) return '?';
+ const freqVal = parseFloat(spot.freq);
+ if (freqVal > 1000) {
+ // It's in kHz, convert to MHz
+ return (freqVal / 1000).toFixed(3);
+ } else {
+ // Already in MHz
+ return freqVal.toFixed(3);
+ }
+ })()}
{spot.time}
diff --git a/src/contexts/RigContext.jsx b/src/contexts/RigContext.jsx
index 0dd1c37b..ce644657 100644
--- a/src/contexts/RigContext.jsx
+++ b/src/contexts/RigContext.jsx
@@ -182,7 +182,17 @@ export const RigProvider = ({ children, rigConfig }) => {
// Handle spot object (recursive call)
if (typeof freqInput === 'object' && freqInput !== null) {
const spot = freqInput;
- const f = spot.freq || spot.freqMHz;
+ let f;
+
+ // WSJT-X decodes have dialFrequency (VFO frequency)
+ // The freq field is just the audio delta offset, not part of the tune frequency
+ if (spot.dialFrequency) {
+ f = spot.dialFrequency; // Use dial frequency directly
+ } else {
+ // For other spot types (DX Cluster, POTA, etc.)
+ f = spot.freq || spot.freqMHz;
+ }
+
const m = spot.mode || modeInput;
if (f) {
tuneTo(f, m);
diff --git a/src/hooks/usePOTASpots.js b/src/hooks/usePOTASpots.js
index 3a2ec7bd..1ef10a3b 100644
--- a/src/hooks/usePOTASpots.js
+++ b/src/hooks/usePOTASpots.js
@@ -9,23 +9,23 @@ import { apiFetch } from '../utils/apiFetch';
// Convert grid square to lat/lon
function gridToLatLon(grid) {
if (!grid || grid.length < 4) return null;
-
+
const g = grid.toUpperCase();
const lon = (g.charCodeAt(0) - 65) * 20 - 180;
const lat = (g.charCodeAt(1) - 65) * 10 - 90;
const lonMin = parseInt(g[2]) * 2;
const latMin = parseInt(g[3]) * 1;
-
+
let finalLon = lon + lonMin + 1;
let finalLat = lat + latMin + 0.5;
-
+
if (grid.length >= 6) {
- const lonSec = (g.charCodeAt(4) - 65) * (2/24);
- const latSec = (g.charCodeAt(5) - 65) * (1/24);
- finalLon = lon + lonMin + lonSec + (1/24);
- finalLat = lat + latMin + latSec + (0.5/24);
+ const lonSec = (g.charCodeAt(4) - 65) * (2 / 24);
+ const latSec = (g.charCodeAt(5) - 65) * (1 / 24);
+ finalLon = lon + lonMin + lonSec + (1 / 24);
+ finalLat = lat + latMin + latSec + (0.5 / 24);
}
-
+
return { lat: finalLat, lon: finalLon };
}
@@ -41,17 +41,17 @@ export const usePOTASpots = () => {
const res = await apiFetch('/api/pota/spots');
if (res?.ok) {
const spots = await res.json();
-
+
// Filter out QRT spots and nearly-expired spots, then sort by most recent
const validSpots = spots
.filter(s => {
// Filter out QRT (operator signed off)
const comments = (s.comments || '').toUpperCase().trim();
if (comments === 'QRT' || comments.startsWith('QRT ') || comments.startsWith('QRT,')) return false;
-
+
// Filter out spots expiring within 60 seconds
if (typeof s.expire === 'number' && s.expire < 60) return false;
-
+
return true;
})
.sort((a, b) => {
@@ -60,12 +60,12 @@ export const usePOTASpots = () => {
const timeB = b.spotTime ? new Date(b.spotTime).getTime() : 0;
return timeB - timeA;
});
-
+
setData(validSpots.map(s => {
// Use API coordinates, fall back to grid square
let lat = s.latitude ? parseFloat(s.latitude) : null;
let lon = s.longitude ? parseFloat(s.longitude) : null;
-
+
if ((!lat || !lon) && s.grid6) {
const loc = gridToLatLon(s.grid6);
if (loc) { lat = loc.lat; lon = loc.lon; }
@@ -74,28 +74,34 @@ export const usePOTASpots = () => {
const loc = gridToLatLon(s.grid4);
if (loc) { lat = loc.lat; lon = loc.lon; }
}
-
+
+
+ // POTA API returns frequency in kHz as a string (e.g., "7160" or "433240")
+ // Convert to MHz for consistency with SOTA and proper rig control
+ const freqKhz = parseFloat(s.frequency);
+ const freqMhz = !isNaN(freqKhz) ? freqKhz / 1000 : null;
+
return {
- call: s.activator,
- ref: s.reference,
- freq: s.frequency,
+ call: s.activator,
+ ref: s.reference,
+ freq: freqMhz ? freqMhz.toString() : s.frequency, // Convert to MHz string
mode: s.mode,
name: s.name || s.locationDesc,
locationDesc: s.locationDesc,
lat,
lon,
- time: s.spotTime ? new Date(s.spotTime).toISOString().substr(11,5)+'z' : '',
+ time: s.spotTime ? new Date(s.spotTime).toISOString().substr(11, 5) + 'z' : '',
expire: s.expire || 0
};
}));
}
- } catch (err) {
- console.error('POTA error:', err);
- } finally {
- setLoading(false);
+ } catch (err) {
+ console.error('POTA error:', err);
+ } finally {
+ setLoading(false);
}
};
-
+
fetchPOTA();
const interval = setInterval(fetchPOTA, 120 * 1000); // 2 minutes
fetchRefPOTA.current = fetchPOTA;
diff --git a/src/hooks/useWWFFSpots.js b/src/hooks/useWWFFSpots.js
index e0417c74..005e8d43 100644
--- a/src/hooks/useWWFFSpots.js
+++ b/src/hooks/useWWFFSpots.js
@@ -18,7 +18,7 @@ export const useWWFFSpots = () => {
const res = await apiFetch('/api/wwff/spots');
if (res.ok) {
const spots = await res.json();
-
+
// Filter out QRT spots and nearly-expired spots, then sort by most recent
const validSpots = spots
.filter(s => {
@@ -28,7 +28,7 @@ export const useWWFFSpots = () => {
// We should also time it out if it's more than 60 minutes old
if (Math.floor(Date.now() / 1000) - s.spot_time > 3600) return false;
-
+
return true;
})
.sort((a, b) => {
@@ -37,33 +37,38 @@ export const useWWFFSpots = () => {
const timeB = b.spot_time ? b.spot_time : 0;
return timeB - timeA;
});
-
+
setData(validSpots.map(s => {
// Use API coordinates
let lat = s.latitude ? parseFloat(s.latitude) : null;
let lon = s.longitude ? parseFloat(s.longitude) : null;
-
+
+ // WWFF API returns frequency_khz as a number (e.g., 7160 or 433240)
+ // Convert to MHz for consistency with POTA/SOTA and proper rig control
+ const freqKhz = parseFloat(s.frequency_khz);
+ const freqMhz = !isNaN(freqKhz) ? freqKhz / 1000 : null;
+
return {
- call: s.activator,
- ref: s.reference,
- freq: s.frequency_khz,
+ call: s.activator,
+ ref: s.reference,
+ freq: freqMhz ? freqMhz.toString() : s.frequency_khz, // Convert to MHz string
mode: s.mode,
name: s.reference_name,
remarks: s.remarks,
lat,
lon,
- time: s.spot_time ? s.spot_time_formatted.substr(11,5)+'z' : '',
+ time: s.spot_time ? s.spot_time_formatted.substr(11, 5) + 'z' : '',
expire: 0
};
}));
}
- } catch (err) {
- console.error('WWFF error:', err);
- } finally {
- setLoading(false);
+ } catch (err) {
+ console.error('WWFF error:', err);
+ } finally {
+ setLoading(false);
}
};
-
+
fetchWWFF();
fetchRef.current = fetchWWFF;
const interval = setInterval(fetchWWFF, 120 * 1000); // 2 minutes - reduced from 1 to save bandwidth
diff --git a/src/layouts/ClassicLayout.jsx b/src/layouts/ClassicLayout.jsx
index 73c3b986..b27eeb4d 100644
--- a/src/layouts/ClassicLayout.jsx
+++ b/src/layouts/ClassicLayout.jsx
@@ -54,6 +54,12 @@ export default function ClassicLayout(props) {
const { tuneTo } = useRig();
+ // Handler for POTA/WWFF/SOTA spot clicks
+ const handleParkSpotClick = (spot) => {
+ // tuneTo() in RigContext handles spot objects and all frequency conversions
+ tuneTo(spot);
+ };
+
return config.layout === 'classic' ? (
{
+ // tuneTo() in RigContext handles spot objects and all frequency conversions
+ tuneTo(spot);
+ };
+
return (