Implementing coordinate formatting

2 files changed, 30 insertions, 4 deletions

diff --git a/modern/src/common/formatter.js b/modern/src/common/formatter.js
index 289a6d94..b70fed3a 100644
--- a/modern/src/common/formatter.js
+++ b/modern/src/common/formatter.js
@@ -81,3 +81,28 @@ export const formatVolume = (value, unit) => {
 export const formatHours = (value) => {
   return moment.duration(value).humanize();
 };
+
+export const coordinateFormatter = (key, value, unit) => {
+  var hemisphere, degrees, minutes, seconds;
+  if (key === 'latitude') {
+    hemisphere = value >= 0 ? 'N' : 'S';
+  } else {
+    hemisphere = value >= 0 ? 'E' : 'W';
+  }
+
+  switch (unit) {
+    case 'ddm':
+      value = Math.abs(value);
+      degrees = Math.floor(value);
+      minutes = (value - degrees) * 60;
+      return degrees + '° ' + minutes.toFixed(6) + '\' ' + hemisphere;
+    case 'dms':
+      value = Math.abs(value);
+      degrees = Math.floor(value);
+      minutes = Math.floor((value - degrees) * 60);
+      seconds = Math.round((value - degrees - minutes / 60) * 3600);
+      return degrees + '° ' + minutes + '\' ' + seconds + '" ' + hemisphere;
+    default:
+      return value.toFixed(6) + '°';
+  }  
+};
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js
index 33ccb348..bbe37e2f 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.js
@@ -1,10 +1,10 @@
 import React, { useState } from 'react';
 import { DataGrid } from '@material-ui/data-grid';
 import t from '../common/localization';
-import { formatPosition, formatDistance, formatSpeed, formatBoolean, formatDate, formatNumber } from '../common/formatter';
+import { formatDistance, formatSpeed, formatBoolean, formatDate, formatNumber, coordinateFormatter } from '../common/formatter';
 import ReportFilter from './ReportFilter';
 import ReportLayoutPage from './ReportLayoutPage';
-import { useAttributePreference } from '../common/preferences';
+import { useAttributePreference, usePreference } from '../common/preferences';
 
 const Filter = ({ setItems }) => {
 
@@ -29,6 +29,7 @@ const Filter = ({ setItems }) => {
 const RouteReportPage = () => {
   const distanceUnit = useAttributePreference('distanceUnit');
   const speedUnit = useAttributePreference('speedUnit');
+  const coordinateFormat = usePreference('coordinateFormat');
 
   const columns = [{
     headerName: t('positionFixTime'),
@@ -41,13 +42,13 @@ const RouteReportPage = () => {
     field: 'latitude',
     type: 'number',
     flex: 1,
-    valueFormatter: ({ value }) => formatNumber(value, 5),
+    valueFormatter: ({ value }) => coordinateFormatter('latitude', value, coordinateFormat),
   }, {
     headerName: t('positionLongitude'),
     field: 'longitude',
     type: 'number',
     flex: 1,
-    valueFormatter: ({ value }) => formatNumber(value, 5),
+    valueFormatter: ({ value }) => coordinateFormatter('longitude', value, coordinateFormat),
   }, {
     headerName: t('positionSpeed'),
     field: 'speed',