Merge pull request #572 from accius/Staging

Staging

Author: accius

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openhamclock",
-  "version": "15.6.1",
+  "version": "15.6.2",
   "description": "Amateur Radio Dashboard - A modern web-based HamClock alternative",
   "main": "electron/main.js",
   "scripts": {

src/App.jsx

@@ -62,13 +62,6 @@ const App = () => {
   const [showPSKFilters, setShowPSKFilters] = useState(false);
   const [layoutResetKey, setLayoutResetKey] = useState(0);
   const [, setBandColorChangeVersion] = useState(0);
-  const [tempUnit, setTempUnit] = useState(() => {
-    try {
-      return localStorage.getItem('openhamclock_tempUnit') || 'F';
-    } catch {
-      return 'F';
-    }
-  });
   const [updateInProgress, setUpdateInProgress] = useState(false);
 
   useEffect(() => {
@@ -175,8 +168,8 @@ const App = () => {
   const propagation = usePropagation(config.location, dxLocation, config.propagation);
   const mySpots = useMySpots(config.callsign);
   const satellites = useSatellites(config.location);
-  const localWeather = useWeather(config.location, tempUnit);
-  const dxWeather = useWeather(dxLocation, tempUnit);
+  const localWeather = useWeather(config.location, config.units);
+  const dxWeather = useWeather(dxLocation, config.units);
   const pskReporter = usePSKReporter(config.callsign, {
     minutes: config.lowMemoryMode ? 5 : 30,
     enabled: config.callsign !== 'N0CALL',
@@ -296,8 +289,6 @@ const App = () => {
     handleToggleDxLock,
     deSunTimes,
     dxSunTimes,
-    tempUnit,
-    setTempUnit,
     localWeather,
     dxWeather,
     spaceWeather,

src/DockableApp.jsx

@@ -77,8 +77,6 @@ export const DockableApp = ({
   // Weather
   localWeather,
   dxWeather,
-  tempUnit,
-  setTempUnit,
   showDxWeather,
 
   // Space weather & solar
@@ -406,13 +404,7 @@ export const DockableApp = ({
 
       <WeatherPanel
         weatherData={localWeather}
-        tempUnit={tempUnit}
-        onTempUnitChange={(unit) => {
-          setTempUnit(unit);
-          try {
-            localStorage.setItem('openhamclock_tempUnit', unit);
-          } catch {}
-        }}
+        units={config.units}
         nodeId={nodeId}
       />
     </div>
@@ -517,13 +509,7 @@ export const DockableApp = ({
         {showDxWeather && (
           <WeatherPanel
             weatherData={dxWeather}
-            tempUnit={tempUnit}
-            onTempUnitChange={(unit) => {
-              setTempUnit(unit);
-              try {
-                localStorage.setItem('openhamclock_tempUnit', unit);
-              } catch {}
-            }}
+            units={config.units}
             nodeId={nodeId}
           />
         )}
@@ -862,13 +848,7 @@ export const DockableApp = ({
         case 'ambient':
           content = (
             <AmbientPanel
-              tempUnit={tempUnit}
-              onTempUnitChange={(unit) => {
-                setTempUnit(unit);
-                try {
-                  localStorage.setItem('openhamclock_tempUnit', unit);
-                } catch {}
-              }}
+              units={config.units}
             />
           );
           break;
@@ -909,7 +889,6 @@ export const DockableApp = ({
       deSunTimes,
       dxSunTimes,
       showDxWeather,
-      tempUnit,
       localWeather,
       dxWeather,
       solarIndices,

src/components/AmbientPanel.jsx

@@ -92,9 +92,9 @@ function fmtBoolOk(v) {
   return v ? 'OK' : 'LOW';
 }
 
-export default function AmbientPanel({ tempUnit = 'F' }) {
+export default function AmbientPanel({ units = 'imperial' }) {
   // ✅ Hooks must always run in the same order
-  const ambient = useAmbientWeather(tempUnit);
+  const ambient = useAmbientWeather(units);
   const w = ambient.data;
 
   const [prefs, setPrefs] = useState(loadPanelPrefs);
@@ -104,7 +104,7 @@ export default function AmbientPanel({ tempUnit = 'F' }) {
   }, [prefs]);
 
   // ✅ Derive units safely even when w is null
-  const deg = `°${w?.tempUnit || tempUnit}`;
+  const deg = `°${w?.tempUnit || (units === 'metric' ? 'C' : 'F')}`;
   const windUnit = w?.windUnit || 'mph';
   const rainUnit = w?.rainUnit || 'in';
   const pressureUnit = w?.pressureUnit || 'inHg';

src/components/WeatherPanel.jsx

@@ -17,8 +17,7 @@ import { usePanelResize } from '../contexts';
 
 export const WeatherPanel = ({
   location,
-  tempUnit,
-  onTempUnitChange,
+  units = 'imperial',
   nodeId,
   weatherData, // Optional: pre-fetched { data, loading, error } from useWeather
 }) => {
@@ -63,7 +62,7 @@ export const WeatherPanel = ({
   }, [weatherExpanded, nodeId, requestResize, resetSize]);
 
   // Use pre-fetched data if provided, otherwise fetch our own
-  const ownWeather = useWeather(weatherData ? null : location, tempUnit);
+  const ownWeather = useWeather(weatherData ? null : location, units);
   const weather = weatherData || ownWeather;
 
   const { data: w, loading, error } = weather;
@@ -128,7 +127,7 @@ export const WeatherPanel = ({
   // No data, no error, no loading — location probably not set
   if (!w) return null;
 
-  const deg = `°${w.tempUnit || tempUnit}`;
+  const deg = `°${w.tempUnit || (units === 'metric' ? 'C' : 'F')}`;
   const wind = t(`weather.unit.${w.windUnit === 'km/h' ? 'kmh' : 'mph'}`);
   const vis = t(`weather.unit.${w.visUnit === 'km' ? 'km' : 'mi'}`);
 
@@ -192,30 +191,6 @@ export const WeatherPanel = ({
             ▼
           </span>
         </div>
-        {/* F/C toggle */}
-        {onTempUnitChange && (
-          <button
-            onClick={(e) => {
-              e.stopPropagation();
-              onTempUnitChange(tempUnit === 'F' ? 'C' : 'F');
-            }}
-            style={{
-              background: 'var(--bg-tertiary)',
-              border: '1px solid var(--border-color)',
-              color: 'var(--text-secondary)',
-              fontSize: '10px',
-              padding: '1px 5px',
-              borderRadius: '3px',
-              cursor: 'pointer',
-              fontFamily: 'JetBrains Mono, monospace',
-              fontWeight: '600',
-              flexShrink: 0,
-            }}
-            title={t('weather.switchUnit', { unit: tempUnit === 'F' ? 'C' : 'F' })}
-          >
-            °{tempUnit === 'F' ? 'C' : 'F'}
-          </button>
-        )}
       </div>
 
       {/* Error badge — show when data is stale but we have cached data */}
@@ -299,7 +274,7 @@ export const WeatherPanel = ({
               <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                 <span style={{ color: 'var(--text-muted)' }}>{t('weather.pressure')}</span>
                 <span style={{ color: 'var(--text-secondary)' }}>
-                  {w.pressure} {t('weather.hpa')}
+                  {w.pressure} {w.pressureUnit || t('weather.hpa')}
                 </span>
               </div>
             )}

src/components/WhatsNew.jsx

@@ -9,6 +9,28 @@ import { useState, useEffect } from 'react';
 // Add new versions at the TOP of this array.
 // Each entry: { version, date, heading, features: [...] }
 const CHANGELOG = [
+  {
+    version: '15.6.2',
+    date: '2026-02-22',
+    heading: 'Surprise! Sunday Updates',
+    features: [
+      {
+        icon: '🌡️',
+        title: 'Unified Weather Units',
+        desc: 'Weather displays now follow the global Settings unit choice (metric/imperial) everywhere — no more separate °F/°C toggle button inside each weather panel. Pressure reads correctly per system: hPa for metric, inHg for imperial. One setting, consistent behavior across all layouts.',
+      },
+      {
+        icon: '🔀',
+        title: 'Staging Branch Merge Cleanup',
+        desc: 'Resolved merge conflicts across DockableApp and WorldMap bringing all Staging features cleanly into the codebase: WWBOTA spots & labels, DX weather overlays, night darkness slider, and the map legend toggle. Zero conflict markers, zero duplicate functions.',
+      },
+      {
+        icon: '🗺️',
+        title: 'WWFF Legend Badge Fix',
+        desc: 'The WWFF entry in the map legend was rendering taller than POTA/SOTA/WWBOTA because the ▼ symbol and text could wrap to two lines. Fixed with a non-breaking space to match all other legend badges.',
+      },
+    ],
+  },
   {
     version: '15.6.1',
     date: '2026-02-25',

src/components/WorldMap.jsx

@@ -2256,7 +2256,7 @@ export const WorldMap = ({
                   fontWeight: '600',
                 }}
               >
-                ▼ WWFF
+                ▼ WWFF
               </span>
             </div>
           )}

src/hooks/useAmbientWeather.js

@@ -51,7 +51,7 @@ function getEnv(name) {
   return undefined;
 }
 
-export const useAmbientWeather = (tempUnit = 'F') => {
+export const useAmbientWeather = (units = 'imperial') => {
   const [rawDevice, setRawDevice] = useState(null); // { macAddress, info, lastData }
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
@@ -113,7 +113,7 @@ export const useAmbientWeather = (tempUnit = 'F') => {
   const data = useMemo(() => {
     if (!rawDevice?.lastData) return null;
 
-    const isMetric = tempUnit === 'C';
+    const isMetric = units === 'metric';
     const ld = rawDevice.lastData;
 
     const updatedAtMs = safeNum(ld.dateutc) ?? (ld.date ? Date.parse(ld.date) : null);
@@ -201,7 +201,7 @@ export const useAmbientWeather = (tempUnit = 'F') => {
       rainUnit: isMetric ? 'mm' : 'in',
       pressureUnit: isMetric ? 'hPa' : 'inHg',
     };
-  }, [rawDevice, tempUnit]);
+  }, [rawDevice, units]);
 
   return { data, loading, error };
 };

src/hooks/useWeather.js

@@ -5,7 +5,8 @@
  *   — distributes rate limits across all users instead of concentrating on server.
  *   — optional API key support via localStorage ('ohc_openmeteo_apikey')
  *
- * Always fetches in metric (Celsius, km/h, mm) and converts client-side.
+ * Always fetches in metric (Celsius, km/h, mm) and converts client-side
+ * based on the global `units` setting ('imperial' or 'metric').
  */
 import { useState, useEffect, useRef } from 'react';
 
@@ -67,15 +68,16 @@ const cToF = (c) => (c * 9) / 5 + 32;
 const kmhToMph = (k) => k * 0.621371;
 const mmToInch = (mm) => mm * 0.0393701;
 const kmToMi = (km) => km * 0.621371;
+const hPaToInHg = (hPa) => hPa * 0.02953;
 
 /**
  * Convert raw Open-Meteo API response to display-ready weather data.
  * Exported so WeatherPanel can use pre-fetched data without its own hook.
  */
-export function convertWeatherData(rawData, tempUnit = 'F') {
+export function convertWeatherData(rawData, units = 'imperial') {
   if (!rawData) return null;
 
-  const isMetric = tempUnit === 'C';
+  const isMetric = units === 'metric';
   const current = rawData.current || {};
   const daily = rawData.daily || {};
   const hourly = rawData.hourly || {};
@@ -131,7 +133,12 @@ export function convertWeatherData(rawData, tempUnit = 'F') {
     icon: weather.icon,
     humidity: Math.round(current.relative_humidity_2m || 0),
     dewPoint: convTemp(current.dew_point_2m),
-    pressure: current.pressure_msl ? current.pressure_msl.toFixed(1) : null,
+    pressure: current.pressure_msl
+      ? isMetric
+        ? current.pressure_msl.toFixed(1)
+        : hPaToInHg(current.pressure_msl).toFixed(2)
+      : null,
+    pressureUnit: isMetric ? 'hPa' : 'inHg',
     cloudCover: current.cloud_cover || 0,
     windSpeed: convWind(current.wind_speed_10m),
     windDir: windDirection(current.wind_direction_10m),
@@ -197,7 +204,7 @@ async function fetchOpenMeteoDirect(lat, lon) {
   return data;
 }
 
-export const useWeather = (location, tempUnit = 'F') => {
+export const useWeather = (location, units = 'imperial') => {
   const [rawData, setRawData] = useState(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null); // { message, retryIn }
@@ -255,8 +262,8 @@ export const useWeather = (location, tempUnit = 'F') => {
     };
   }, [location?.lat, location?.lon]);
 
-  // Convert raw API data to display data based on current tempUnit
-  const data = convertWeatherData(rawData, tempUnit);
+  // Convert raw API data to display data based on current units
+  const data = convertWeatherData(rawData, units);
 
   return { data, loading, error };
 };

src/layouts/ModernLayout.jsx

@@ -57,8 +57,6 @@ export default function ModernLayout(props) {
     handleToggleDxLock,
     deSunTimes,
     dxSunTimes,
-    tempUnit,
-    setTempUnit,
     showDxWeather,
     currentTime,
     classicAnalogClock,
@@ -112,13 +110,6 @@ export default function ModernLayout(props) {
     }
   };
 
-  const tempUnitToggle = (unit) => {
-    setTempUnit(unit);
-    try {
-      localStorage.setItem('openhamclock_tempUnit', unit);
-    } catch {}
-  };
-
   // ─── Shared map component ───
   const mapComponent = (style) => (
     <div style={{ position: 'relative', borderRadius: '6px', overflow: 'hidden', ...style }}>
@@ -196,7 +187,7 @@ export default function ModernLayout(props) {
           <span style={{ color: 'var(--accent-purple)', fontWeight: '600' }}>{deSunTimes.sunset}</span>
         </div>
       </div>
-      <WeatherPanel weatherData={localWeather} tempUnit={tempUnit} onTempUnitChange={tempUnitToggle} />
+      <WeatherPanel weatherData={localWeather} units={config.units} />
     </div>
   );
 
@@ -262,7 +253,7 @@ export default function ModernLayout(props) {
           <span style={{ color: 'var(--accent-purple)', fontWeight: '600' }}>{dxSunTimes.sunset}</span>
         </div>
       </div>
-      {showDxWeather && <WeatherPanel weatherData={dxWeather} tempUnit={tempUnit} onTempUnitChange={tempUnitToggle} />}
+      {showDxWeather && <WeatherPanel weatherData={dxWeather} units={config.units} />}
     </div>
   );