Merge pull request #1135 from jinzo/modern-formatter-improvements

Sync old Position Attribute formatters to Modern

2 files changed, 32 insertions, 2 deletions

diff --git a/modern/src/common/components/PositionValue.js b/modern/src/common/components/PositionValue.js
index 132cd648..58841939 100644
--- a/modern/src/common/components/PositionValue.js
+++ b/modern/src/common/components/PositionValue.js
@@ -3,7 +3,21 @@ import { useSelector } from 'react-redux';
 import { Link } from '@mui/material';
 import { Link as RouterLink } from 'react-router-dom';
 import {
-  formatAlarm, formatAltitude, formatBoolean, formatCoordinate, formatCourse, formatDistance, formatNumber, formatNumericHours, formatPercentage, formatSpeed, formatTime, formatTemperature,
+  formatAlarm,
+  formatAltitude,
+  formatBoolean,
+  formatCoordinate,
+  formatCourse,
+  formatDistance,
+  formatNumber,
+  formatNumericHours,
+  formatPercentage,
+  formatSpeed,
+  formatTime,
+  formatTemperature,
+  formatVoltage,
+  formatVolume,
+  formatConsumption,
 } from '../util/formatter';
 import { useAttributePreference, usePreference } from '../util/preferences';
 import { useTranslation } from './LocalizationProvider';
@@ -24,6 +38,7 @@ const PositionValue = ({ position, property, attribute }) => {
   const distanceUnit = useAttributePreference('distanceUnit');
   const altitudeUnit = useAttributePreference('altitudeUnit');
   const speedUnit = useAttributePreference('speedUnit');
+  const volumeUnit = useAttributePreference('volumeUnit');
   const coordinateFormat = usePreference('coordinateFormat');
   const hours12 = usePreference('twelveHourFormat');
 
@@ -38,18 +53,29 @@ const PositionValue = ({ position, property, attribute }) => {
       case 'longitude':
         return formatCoordinate('longitude', value, coordinateFormat);
       case 'speed':
-        return formatSpeed(value, speedUnit, t);
+      case 'obdSpeed':
+        return value != null ? formatSpeed(value, speedUnit, t) : '';
       case 'course':
         return formatCourse(value);
       case 'altitude':
         return formatAltitude(value, altitudeUnit, t);
+      case 'power':
+      case 'battery':
+        return formatVoltage(value, t);
       case 'batteryLevel':
         return value != null ? formatPercentage(value, t) : '';
+      case 'volume':
+        return value != null ? formatVolume(value, volumeUnit, t) : '';
+      case 'fuelConsumption':
+        return value != null ? formatConsumption(value, t) : '';
       case 'coolantTemp':
         return formatTemperature(value);
       case 'alarm':
         return formatAlarm(value, t);
       case 'odometer':
+      case 'serviceOdometer':
+      case 'tripOdometer':
+      case 'obdOdometer':
       case 'distance':
       case 'totalDistance':
         return value != null ? formatDistance(value, distanceUnit, t) : '';
diff --git a/modern/src/common/util/formatter.js b/modern/src/common/util/formatter.js
index 610b8dd0..0f7d2cc8 100644
--- a/modern/src/common/util/formatter.js
+++ b/modern/src/common/util/formatter.js
@@ -19,6 +19,10 @@ export const formatPercentage = (value) => `${value}%`;
 
 export const formatTemperature = (value) => `${value}°C`;
 
+export const formatVoltage = (value, t) => `${value} ${t('sharedVoltAbbreviation')}`;
+
+export const formatConsumption = (value, t) => `${value} ${t('sharedLiterPerHourAbbreviation')}`;
+
 export const formatTime = (value, format, hours12) => {
   if (value) {
     const m = moment(value);