aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
Diffstat (limited to 'web/app')
-rw-r--r--web/app/view/Map.js31
-rw-r--r--web/app/view/MapController.js9
2 files changed, 32 insertions, 8 deletions
diff --git a/web/app/view/Map.js b/web/app/view/Map.js
index 2db7d479d..a2bbdc92c 100644
--- a/web/app/view/Map.js
+++ b/web/app/view/Map.js
@@ -39,13 +39,17 @@ Ext.define('Traccar.view.Map', {
return this.latestSource;
},
+ getRouteSource: function () {
+ return this.routeSource;
+ },
+
getReportSource: function () {
return this.reportSource;
},
listeners: {
afterrender: function () {
- var user, server, layer, type, bingKey, latestLayer, reportLayer, lat, lon, zoom, target;
+ var user, server, layer, type, bingKey, latestLayer, routeLayer, reportLayer, lat, lon, zoom, target;
user = Traccar.app.getUser();
server = Traccar.app.getServer();
@@ -87,9 +91,30 @@ Ext.define('Traccar.view.Map', {
source: this.latestSource
});
+ this.routeSource = new ol.source.Vector({});
+ routeLayer = new ol.layer.Vector({
+ source: this.routeSource
+ });
+
this.reportSource = new ol.source.Vector({});
reportLayer = new ol.layer.Vector({
- source: this.reportSource
+ source: new ol.source.Cluster({
+ distance: 40,
+ source: this.reportSource
+ }),
+ style: function (feature, resolution) {
+ style = [new ol.style.Style({
+ image: new ol.style.Circle({
+ radius: feature.get('radius'),
+ fill: new ol.style.Fill({
+ color: [255, 153, 0, Math.min(0.8, 0.4 + (feature.get('features').length / 100))]
+ })
+ }),
+ text: new ol.style.Text({
+ text: feature.get('features').length.toString()
+ })
+ })];
+ }
});
lat = user.get('latitude') || server.get('latitude') || Traccar.Style.mapDefaultLat;
@@ -104,7 +129,7 @@ Ext.define('Traccar.view.Map', {
this.map = new ol.Map({
target: this.body.dom.id,
- layers: [layer, latestLayer, reportLayer],
+ layers: [layer, routeLayer, reportLayer, latestLayer],
view: this.mapView
});
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 3d86cc4ff..2b441399b 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -141,7 +141,7 @@ Ext.define('Traccar.view.MapController', {
geometry: new ol.geom.LineString([])
});
this.reportRoute.setStyle(this.getRouteStyle());
- this.getView().getReportSource().addFeature(this.reportRoute);
+ this.getView().getRouteSource().addFeature(this.reportRoute);
for (i = 0; i < data.length; i++) {
position = data[i];
@@ -169,18 +169,17 @@ Ext.define('Traccar.view.MapController', {
},
clearReport: function (store) {
- var reportSource, key;
- reportSource = this.getView().getReportSource();
+ var key;
if (this.reportRoute) {
- reportSource.removeFeature(this.reportRoute);
+ this.getView().getRouteSource().removeFeature(this.reportRoute);
this.reportRoute = null;
}
if (this.reportMarkers) {
for (key in this.reportMarkers) {
if (this.reportMarkers.hasOwnProperty(key)) {
- reportSource.removeFeature(this.reportMarkers[key]);
+ this.getView().getReportSource().removeFeature(this.reportMarkers[key]);
}
}
this.reportMarkers = {};