aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/app/Application.js1
-rw-r--r--web/app/AttributeFormatter.js11
-rw-r--r--web/app/model/Server.js3
-rw-r--r--web/app/model/User.js3
-rw-r--r--web/app/store/CoordinateFormats.js56
-rw-r--r--web/app/view/ServerDialog.js8
-rw-r--r--web/app/view/UserDialog.js8
-rw-r--r--web/l10n/en.json4
8 files changed, 90 insertions, 4 deletions
diff --git a/web/app/Application.js b/web/app/Application.js
index 4671a82..c2e0e77 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -52,6 +52,7 @@ Ext.define('Traccar.Application', {
'MapTypes',
'DistanceUnits',
'SpeedUnits',
+ 'CoordinateFormats',
'CommandTypes',
'TimeUnits',
'Languages',
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index e206457..c319804 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
Ext.define('Traccar.AttributeFormatter', {
singleton: true,
- coordinateFormatter: function (value) {
- return value.toFixed(Traccar.Style.coordinatePrecision);
+ coordinateFormatter: function (key, value) {
+ return Ext.getStore('CoordinateFormats').formatValue(key, value, Traccar.app.getPreference('coordinateFormat'));
},
speedFormatter: function (value) {
@@ -63,8 +63,11 @@ Ext.define('Traccar.AttributeFormatter', {
},
getFormatter: function (key) {
+ var self = this;
if (key === 'latitude' || key === 'longitude') {
- return this.coordinateFormatter;
+ return function (value) {
+ return self.coordinateFormatter(key, value);
+ };
} else if (key === 'speed') {
return this.speedFormatter;
} else if (key === 'course') {
diff --git a/web/app/model/Server.js b/web/app/model/Server.js
index 4fe8efd..be23289 100644
--- a/web/app/model/Server.js
+++ b/web/app/model/Server.js
@@ -59,6 +59,9 @@ Ext.define('Traccar.model.Server', {
name: 'forceSettings',
type: 'boolean'
}, {
+ name: 'coordinateFormat',
+ type: 'string'
+ }, {
name: 'attributes'
}],
diff --git a/web/app/model/User.js b/web/app/model/User.js
index 8c7638f..718c571 100644
--- a/web/app/model/User.js
+++ b/web/app/model/User.js
@@ -59,6 +59,9 @@ Ext.define('Traccar.model.User', {
name: 'twelveHourFormat',
type: 'boolean'
}, {
+ name: 'coordinateFormat',
+ type: 'string'
+ }, {
name: 'attributes'
}],
diff --git a/web/app/store/CoordinateFormats.js b/web/app/store/CoordinateFormats.js
new file mode 100644
index 0000000..9d79c65
--- /dev/null
+++ b/web/app/store/CoordinateFormats.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+Ext.define('Traccar.store.CoordinateFormats', {
+ extend: 'Ext.data.Store',
+ fields: ['key', 'name'],
+
+ data: [{
+ key: 'dd',
+ name: Strings.sharedDecimalDegrees
+ }, {
+ key: 'ddm',
+ name: Strings.sharedDegreesDecimalMinutes
+ }, {
+ key: 'dms',
+ name: Strings.sharedDegreesMinutesSeconds
+ }],
+
+ formatValue: function (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(Traccar.Style.coordinatePrecision) + '\' ' + 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(Traccar.Style.coordinatePrecision) + '°';
+ }
+ }
+});
diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js
index 14af183..c16a75d 100644
--- a/web/app/view/ServerDialog.js
+++ b/web/app/view/ServerDialog.js
@@ -96,6 +96,14 @@ Ext.define('Traccar.view.ServerDialog', {
name: 'forceSettings',
fieldLabel: Strings.serverForceSettings,
allowBlank: false
+ }, {
+ xtype: 'combobox',
+ name: 'coordinateFormat',
+ fieldLabel: Strings.settingsCoordinateFormat,
+ store: 'CoordinateFormats',
+ displayField: 'name',
+ valueField: 'key',
+ editable: false
}]
},
diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js
index f717da7..196032f 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/UserDialog.js
@@ -102,6 +102,14 @@ Ext.define('Traccar.view.UserDialog', {
name: 'twelveHourFormat',
fieldLabel: Strings.settingsTwelveHourFormat,
allowBlank: false
+ }, {
+ xtype: 'combobox',
+ name: 'coordinateFormat',
+ fieldLabel: Strings.settingsCoordinateFormat,
+ store: 'CoordinateFormats',
+ displayField: 'name',
+ valueField: 'key',
+ editable: false
}]
},
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 6dbcb3d..45b3138 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -15,6 +15,9 @@
"sharedHour": "Hour",
"sharedMinute": "Minute",
"sharedSecond": "Second",
+ "sharedDecimalDegrees": "Decimal Degrees",
+ "sharedDegreesDecimalMinutes": "Degrees Decimal Minutes",
+ "sharedDegreesMinutesSeconds": "Degrees Minutes Seconds",
"sharedName": "Name",
"sharedDescription": "Description",
"sharedSearch": "Search",
@@ -64,6 +67,7 @@
"settingsUsers": "Users",
"settingsSpeedUnit": "Speed",
"settingsTwelveHourFormat": "12-hour Format",
+ "settingsCoordinateFormat": "Coordinates Format",
"reportTitle": "Reports",
"reportDevice": "Device",
"reportGroup": "Group",
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 06:52:04 +0000