diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-01 16:13:55 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-01 16:13:55 +1200 |
| commit | 3f4190a60c119f55822b218cc54fff22ff3c2ac5 (patch) | |
| tree | 37c7b37b0deeb5d45b65d6e5f01e2e1a807944fa /web/app/view/map/MapMarkerController.js | |
| parent | a2e350b15065bf9922631944daa95790b7a869a8 (diff) | |
| download | etbsa-traccar-web-3f4190a60c119f55822b218cc54fff22ff3c2ac5.tar.gz etbsa-traccar-web-3f4190a60c119f55822b218cc54fff22ff3c2ac5.tar.bz2 etbsa-traccar-web-3f4190a60c119f55822b218cc54fff22ff3c2ac5.zip | |
Handle report exceptions
Diffstat (limited to 'web/app/view/map/MapMarkerController.js')
| -rw-r--r-- | web/app/view/map/MapMarkerController.js | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/web/app/view/map/MapMarkerController.js b/web/app/view/map/MapMarkerController.js index df4029d..24742ff 100644 --- a/web/app/view/map/MapMarkerController.js +++ b/web/app/view/map/MapMarkerController.js @@ -304,24 +304,25 @@ Ext.define('Traccar.view.map.MapMarkerController', { loadReport: function (store, data) { var i, position, point; - - this.addReportMarkers(store, data); - - this.reportRoute = []; - for (i = 0; i < data.length; i++) { - position = data[i]; - point = ol.proj.fromLonLat([ - position.get('longitude'), - position.get('latitude') - ]); - if (i === 0 || data[i].get('deviceId') !== data[i - 1].get('deviceId')) { - this.reportRoute.push(new ol.Feature({ - geometry: new ol.geom.LineString([]) - })); - this.reportRoute[this.reportRoute.length - 1].setStyle(this.getRouteStyle(data[i].get('deviceId'))); - this.getView().getRouteSource().addFeature(this.reportRoute[this.reportRoute.length - 1]); + if (data) { + this.addReportMarkers(store, data); + + this.reportRoute = []; + for (i = 0; i < data.length; i++) { + position = data[i]; + point = ol.proj.fromLonLat([ + position.get('longitude'), + position.get('latitude') + ]); + if (i === 0 || data[i].get('deviceId') !== data[i - 1].get('deviceId')) { + this.reportRoute.push(new ol.Feature({ + geometry: new ol.geom.LineString([]) + })); + this.reportRoute[this.reportRoute.length - 1].setStyle(this.getRouteStyle(data[i].get('deviceId'))); + this.getView().getRouteSource().addFeature(this.reportRoute[this.reportRoute.length - 1]); + } + this.reportRoute[this.reportRoute.length - 1].getGeometry().appendCoordinate(point); } - this.reportRoute[this.reportRoute.length - 1].getGeometry().appendCoordinate(point); } }, |