aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-11-08 14:11:58 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-11-08 14:11:58 +1300
commit2c71e521f5e2f60627d0c3df4b6649751dea1035 (patch)
tree833addc80c62b851cb008e965e3b5c88eb61e2c8
parentcdd83e0d13961c3465c7faf554ea8c709bd761b3 (diff)
downloadtraccar-server-2c71e521f5e2f60627d0c3df4b6649751dea1035.tar.gz
traccar-server-2c71e521f5e2f60627d0c3df4b6649751dea1035.tar.bz2
traccar-server-2c71e521f5e2f60627d0c3df4b6649751dea1035.zip
Handle map marker selections
-rw-r--r--web/app/view/DevicesController.js7
-rw-r--r--web/app/view/MapController.js31
-rw-r--r--web/app/view/ReportController.js11
3 files changed, 35 insertions, 14 deletions
diff --git a/web/app/view/DevicesController.js b/web/app/view/DevicesController.js
index dd3ca5a05..c29854d12 100644
--- a/web/app/view/DevicesController.js
+++ b/web/app/view/DevicesController.js
@@ -27,6 +27,7 @@ Ext.define('Traccar.view.DevicesController', {
listen: {
controller: {
'*': {
+ selectDevice: 'selectDevice',
selectReport: 'selectReport'
}
}
@@ -87,10 +88,14 @@ Ext.define('Traccar.view.DevicesController', {
this.lookupReference('toolbarRemoveButton').setDisabled(empty);
this.lookupReference('deviceCommandButton').setDisabled(empty);
if (!empty) {
- this.fireEvent('selectDevice', selected.getLastSelected());
+ this.fireEvent('selectDevice', selected.getLastSelected(), true);
}
},
+ selectDevice: function (device, center) {
+ this.getView().getSelectionModel().select([device], false, true);
+ },
+
selectReport: function (position) {
if (position !== undefined) {
this.getView().getSelectionModel().deselectAll();
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 15bc24cdf..263587877 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -50,7 +50,7 @@ Ext.define('Traccar.view.MapController', {
},
updateLatest: function (store, data) {
- var i, position, geometry, deviceId, name, marker, style;
+ var i, position, geometry, device, deviceId, name, marker, style;
if (!Ext.isArray(data)) {
data = [data];
@@ -59,6 +59,7 @@ Ext.define('Traccar.view.MapController', {
for (i = 0; i < data.length; i++) {
position = data[i];
deviceId = position.get('deviceId');
+ device = Ext.getStore('Devices').findRecord('id', deviceId, 0, false, false, true);
geometry = new ol.geom.Point(ol.proj.fromLonLat([
position.get('longitude'),
@@ -70,13 +71,13 @@ Ext.define('Traccar.view.MapController', {
marker.setGeometry(geometry);
} else {
marker = new ol.Feature(geometry);
+ marker.set('record', device);
this.latestMarkers[deviceId] = marker;
this.getView().getVectorSource().addFeature(marker);
style = this.getLatestMarker();
style.getImage().setRotation(position.get('course'));
- style.getText().setText(
- Ext.getStore('Devices').findRecord('id', deviceId, 0, false, false, true).get('name'));
+ style.getText().setText(device.get('name'));
marker.setStyle(style);
}
}
@@ -103,6 +104,7 @@ Ext.define('Traccar.view.MapController', {
geometry = new ol.geom.Point(point);
marker = new ol.Feature(geometry);
+ marker.set('record', position);
this.reportMarkers[position.get('id')] = marker;
this.getView().getVectorSource().addFeature(marker);
@@ -190,7 +192,7 @@ Ext.define('Traccar.view.MapController', {
});
},
- selectMarker: function (marker) {
+ selectMarker: function (marker, center) {
if (this.selectedMarker) {
this.selectedMarker.setStyle(
this.resizeMarker(this.selectedMarker.getStyle(), Traccar.Style.mapRadiusNormal));
@@ -199,21 +201,30 @@ Ext.define('Traccar.view.MapController', {
if (marker) {
marker.setStyle(
this.resizeMarker(marker.getStyle(), Traccar.Style.mapRadiusSelected));
- this.getView().getMapView().setCenter(marker.getGeometry().getCoordinates());
+ if (center) {
+ this.getView().getMapView().setCenter(marker.getGeometry().getCoordinates());
+ }
}
this.selectedMarker = marker;
},
- selectDevice: function (device) {
- this.selectMarker(this.latestMarkers[device.get('id')]);
+ selectDevice: function (device, center) {
+ this.selectMarker(this.latestMarkers[device.get('id')], center);
},
- selectReport: function (position) {
- this.selectMarker(this.reportMarkers[position.get('id')]);
+ selectReport: function (position, center) {
+ this.selectMarker(this.reportMarkers[position.get('id')], center);
},
selectFeature: function (feature) {
- console.log(feature);
+ var record = feature.get('record');
+ if (record) {
+ if (record instanceof Traccar.model.Device) {
+ this.fireEvent('selectDevice', record, false);
+ } else {
+ this.fireEvent('selectReport', record, false);
+ }
+ }
}
});
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 660fe786d..9c2abcc71 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -22,7 +22,8 @@ Ext.define('Traccar.view.ReportController', {
listen: {
controller: {
'*': {
- selectDevice: 'selectDevice'
+ selectDevice: 'selectDevice',
+ selectReport: 'selectReport'
}
}
}
@@ -63,13 +64,17 @@ Ext.define('Traccar.view.ReportController', {
onSelectionChange: function (selected) {
if (selected.getCount() > 0) {
- this.fireEvent('selectReport', selected.getLastSelected());
+ this.fireEvent('selectReport', selected.getLastSelected(), true);
}
},
selectDevice: function (device) {
- if (device !== undefined) {
+ if (device) {
this.getView().getSelectionModel().deselectAll();
}
+ },
+
+ selectReport: function (position, center) {
+ this.getView().getSelectionModel().select([position], false, true);
}
});