aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/app/store/MapTypes.js9
-rw-r--r--web/app/view/ReportController.js6
-rw-r--r--web/app/view/map/BaseMap.js32
-rw-r--r--web/app/view/map/Map.js16
-rw-r--r--web/app/view/map/MapController.js4
-rw-r--r--web/l10n/en.json4
6 files changed, 66 insertions, 5 deletions
diff --git a/web/app/store/MapTypes.js b/web/app/store/MapTypes.js
index f91f366..1564789 100644
--- a/web/app/store/MapTypes.js
+++ b/web/app/store/MapTypes.js
@@ -20,6 +20,15 @@ Ext.define('Traccar.store.MapTypes', {
fields: ['key', 'name'],
data: [{
+ key: 'locationIqStreets',
+ name: Strings.mapLocationIqStreets
+ }, {
+ key: 'locationIqEarth',
+ name: Strings.mapLocationIqEarth
+ }, {
+ key: 'locationIqHybrid',
+ name: Strings.mapLocationIqHybrid
+ }, {
key: 'osm',
name: Strings.mapOsm
}, {
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index cc0fd4a..4241df3 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -528,6 +528,12 @@ Ext.define('Traccar.view.ReportController', {
return Traccar.app.getEventString(value);
}
}, {
+ text: Strings.positionAlarm,
+ dataIndex: 'attributes',
+ renderer: function (value) {
+ return value['alarm'];
+ }
+ }, {
text: Strings.sharedGeofence,
dataIndex: 'geofenceId',
renderer: Traccar.AttributeFormatter.getFormatter('geofenceId')
diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index 507ee7a..7813aa6 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -30,12 +30,13 @@ Ext.define('Traccar.view.map.BaseMap', {
},
initMap: function () {
- var server, layer, type, bingKey, lat, lon, zoom, maxZoom, target, poiLayer, self = this;
+ var server, layer, type, bingKey, locationIqKey, lat, lon, zoom, maxZoom, target, poiLayer, self = this;
server = Traccar.app.getServer();
type = Traccar.app.getPreference('map', null);
bingKey = server.get('bingKey');
+ locationIqKey = Traccar.app.getAttributePreference('locationIqKey', 'pk.0f147952a41c555a5b70614039fd148b');
layer = new ol.layer.Group({
title: Strings.mapLayer,
@@ -88,8 +89,35 @@ Ext.define('Traccar.view.map.BaseMap', {
new ol.layer.Tile({
title: Strings.mapOsm,
type: 'base',
- visible: type === 'osm' || type === 'wikimedia' || !type,
+ visible: type === 'osm',
source: new ol.source.OSM({})
+ }),
+ new ol.layer.Tile({
+ title: Strings.mapLocationIqHybrid,
+ type: 'base',
+ visible: type === 'locationIqHybrid',
+ source: new ol.source.XYZ({
+ url: 'https://{a-c}-tiles.locationiq.com/v3/hybrid/r/{z}/{x}/{y}.jpg?key=' + locationIqKey,
+ attributions: '&copy; <a href="https://locationiq.com/">LocationIQ</a>'
+ })
+ }),
+ new ol.layer.Tile({
+ title: Strings.mapLocationIqEarth,
+ type: 'base',
+ visible: type === 'locationIqEarth',
+ source: new ol.source.XYZ({
+ url: 'https://{a-c}-tiles.locationiq.com/v3/earth/r/{z}/{x}/{y}.jpg?key=' + locationIqKey,
+ attributions: '&copy; <a href="https://locationiq.com/">LocationIQ</a>'
+ })
+ }),
+ new ol.layer.Tile({
+ title: Strings.mapLocationIqStreets,
+ type: 'base',
+ visible: type === 'locationIqStreets' || type === 'wikimedia' || !type,
+ source: new ol.source.XYZ({
+ url: 'https://{a-c}-tiles.locationiq.com/v3/streets/r/{z}/{x}/{y}.png?key=' + locationIqKey,
+ attributions: '&copy; <a href="https://locationiq.com/">LocationIQ</a>'
+ })
})
]
});
diff --git a/web/app/view/map/Map.js b/web/app/view/map/Map.js
index fbaa758..36e81de 100644
--- a/web/app/view/map/Map.js
+++ b/web/app/view/map/Map.js
@@ -66,6 +66,13 @@ Ext.define('Traccar.view.map.Map', {
stateId: 'show-geofences-button',
tooltip: Strings.sharedGeofences
}, {
+ handler: 'showAccuracy',
+ reference: 'showAccuracyButton',
+ glyph: 'xf140@FontAwesome',
+ pressed: true,
+ stateId: 'show-accuracy-button',
+ tooltip: Strings.positionAccuracy
+ }, {
handler: 'showCurrentLocation',
glyph: 'xf124@FontAwesome',
tooltip: Strings.mapCurrentLocation
@@ -95,6 +102,10 @@ Ext.define('Traccar.view.map.Map', {
return this.accuracySource;
},
+ getAccuracyLayer: function () {
+ return this.accuracyLayer;
+ },
+
getRouteSource: function () {
return this.routeSource;
},
@@ -133,10 +144,11 @@ Ext.define('Traccar.view.map.Map', {
}));
this.accuracySource = new ol.source.Vector({});
- this.map.addLayer(new ol.layer.Vector({
+ this.accuracyLayer = new ol.layer.Vector({
name: 'accuracyLayer',
source: this.accuracySource
- }));
+ });
+ this.map.addLayer(this.accuracyLayer);
this.markersSource = new ol.source.Vector({});
this.map.addLayer(new ol.layer.Vector({
diff --git a/web/app/view/map/MapController.js b/web/app/view/map/MapController.js
index 7ba0ee3..d025b58 100644
--- a/web/app/view/map/MapController.js
+++ b/web/app/view/map/MapController.js
@@ -68,6 +68,10 @@ Ext.define('Traccar.view.map.MapController', {
this.getView().getLiveRouteLayer().setVisible(button.pressed);
},
+ showAccuracy: function (button) {
+ this.getView().getAccuracyLayer().setVisible(button.pressed);
+ },
+
getMapState: function () {
var zoom, center, projection;
projection = this.getView().getMapView().getProjection();
diff --git a/web/l10n/en.json b/web/l10n/en.json
index fae517b..ff5f61a 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -263,6 +263,9 @@
"mapMapboxSatellite": "Mapbox Satellite",
"mapMapTilerBasic": "MapTiler Basic",
"mapMapTilerHybrid": "MapTiler Hybrid",
+ "mapLocationIqStreets": "LocationIQ Streets",
+ "mapLocationIqEarth": "LocationIQ Earth",
+ "mapLocationIqHybrid": "LocationIQ Hybrid",
"mapShapePolygon": "Polygon",
"mapShapeCircle": "Circle",
"mapShapePolyline": "Polyline",
@@ -375,7 +378,6 @@
"alarmJamming": "Jamming",
"alarmTemperature": "Temperature",
"alarmParking": "Parking",
- "alarmShock": "Shock",
"alarmBonnet": "Bonnet",
"alarmFootBrake": "Foot Brake",
"alarmFuelLeak": "Fuel Leak",
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 12:21:23 +0000