recorder: show both barometer and GPS altitude in elevation chart

Author: stweedo

apps/recorder/interface.html

@@ -201,23 +201,14 @@
     scales: { y: { min: 0, max: 100, title: 'Battery %' }, y1: { position: 'right', min: 3.0, max: 4.2, title: 'Voltage (V)', grid: false } }
   },
   steps: { filter: d => d.Steps !== undefined && d.Steps !== "", data: d => parseInt(d.Steps) || 0, label: 'Steps per Interval', color: '#36a2eb', title: 'Step Count Over Time', type: 'bar', cumulative: true },
-  elevation: { 
-    filter: d => (d['Barometer Altitude'] && d['Barometer Altitude'] !== "" && !isNaN(parseFloat(d['Barometer Altitude']))) || (d.Altitude && d.Altitude !== "" && !isNaN(parseFloat(d.Altitude))), 
-    data: d => {
-      if (d['Barometer Altitude'] && d['Barometer Altitude'] !== "" && !isNaN(parseFloat(d['Barometer Altitude']))) {
-        return convertElevation(parseFloat(d['Barometer Altitude'])).value;
-      } else {
-        return convertElevation(parseFloat(d.Altitude)).value;
-      }
-    }, 
-    label: () => convertElevation(1).label, 
-    color: '#8b5cf6', 
+  elevation: {
+    filter: d => (d['Barometer Altitude'] !== undefined && d['Barometer Altitude'] !== "") || (d.Altitude !== undefined && d.Altitude !== ""),
     title: 'Elevation Profile',
-    getTitle: data => {
-      // Check if we have any barometer altitude data
-      const hasBarometerAlt = data.some(d => d['Barometer Altitude'] && d['Barometer Altitude'] !== "" && !isNaN(parseFloat(d['Barometer Altitude'])));
-      return hasBarometerAlt ? 'Elevation Profile (Barometer)' : 'Elevation Profile (GPS)';
-    }
+    datasets: [
+      { key: 'Barometer Altitude', label: 'Altitude (Barometer)', color: '#8b5cf6', yAxis: 'y', convert: convertElevation },
+      { key: 'Altitude', label: 'Altitude (GPS)', color: '#a855f7', yAxis: 'y', convert: convertElevation }
+    ],
+    scales: { y: { title: () => convertElevation(1).label } }
   },
   speed: { filter: d => d.Latitude && d.Longitude && d.Latitude !== "" && d.Longitude !== "", calculate: true, label: () => convertSpeed(1).label, color: '#f59e0b', title: 'Speed Over Time' },
   barometer: {