diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-05-16 16:24:15 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-16 16:24:15 +1200 |
| commit | d869c8342103c5b71668a36ca61f987c26ec9bd4 (patch) | |
| tree | 087ed1b5161f871460e0a1cf4a7c9cbdf64d99c4 /web | |
| parent | da1bb491208934a0a73ec216833bb8e7ead3f235 (diff) | |
| parent | 5af943fc3de89cade17aa5f894ed2fc18713d0cf (diff) | |
| download | etbsa-traccar-web-d869c8342103c5b71668a36ca61f987c26ec9bd4.tar.gz etbsa-traccar-web-d869c8342103c5b71668a36ca61f987c26ec9bd4.tar.bz2 etbsa-traccar-web-d869c8342103c5b71668a36ca61f987c26ec9bd4.zip | |
Merge pull request #676 from Abyss777/geo_polylineDistance
Add polylineDistance Geofence attribute
Diffstat (limited to 'web')
| -rw-r--r-- | web/app/store/GeofenceAttributes.js | 9 | ||||
| -rw-r--r-- | web/l10n/en.json | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/web/app/store/GeofenceAttributes.js b/web/app/store/GeofenceAttributes.js index b8e1535..b1d48c1 100644 --- a/web/app/store/GeofenceAttributes.js +++ b/web/app/store/GeofenceAttributes.js @@ -1,6 +1,6 @@ /* - * Copyright 2017 Anton Tananaev (anton@traccar.org) - * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org) + * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2017 - 2018 Andrey Kunitsyn (andrey@traccar.org) * * 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 @@ -29,5 +29,10 @@ Ext.define('Traccar.store.GeofenceAttributes', { name: Strings.attributeSpeedLimit, valueType: 'number', dataType: 'speed' + }, { + key: 'polylineDistance', + name: Strings.attributePolylineDistance, + valueType: 'number', + dataType: 'distance' }] }); diff --git a/web/l10n/en.json b/web/l10n/en.json index a539525..e8ac555 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -78,6 +78,7 @@ "sharedMaintenance": "Maintenance", "sharedMaintenances": "Maintenances", "attributeSpeedLimit": "Speed Limit", + "attributePolylineDistance": "Polyline Distance", "attributeReportIgnoreOdometer": "Report: Ignore Odometer", "attributeWebReportColor": "Web: Report Color", "attributeDevicePassword": "Device Password", |