diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-10-12 16:41:59 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-12 16:41:59 +1300 |
commit | 56d37a27017a1e47ec858195d910b438377d47b9 (patch) | |
tree | d0abcfc085e8467acc71b3bdc1f8982d4cf24e2c /web/app/view/MapController.js | |
parent | 401ee249a4c7b0de5eeaf32d1cbee4fd0d82a7a8 (diff) | |
parent | 561f459f3386f44c12da315e46b5275ba7d4a3cf (diff) | |
download | etbsa-traccar-web-56d37a27017a1e47ec858195d910b438377d47b9.tar.gz etbsa-traccar-web-56d37a27017a1e47ec858195d910b438377d47b9.tar.bz2 etbsa-traccar-web-56d37a27017a1e47ec858195d910b438377d47b9.zip |
Merge pull request #295 from Abyss777/show_geofences
Always show geofences on the Map
Diffstat (limited to 'web/app/view/MapController.js')
-rw-r--r-- | web/app/view/MapController.js | 67 |
1 files changed, 66 insertions, 1 deletions
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js index 59fd285..c247786 100644 --- a/web/app/view/MapController.js +++ b/web/app/view/MapController.js @@ -21,7 +21,8 @@ Ext.define('Traccar.view.MapController', { requires: [ 'Traccar.model.Position', - 'Traccar.model.Device' + 'Traccar.model.Device', + 'Traccar.GeofenceConverter' ], config: { @@ -45,6 +46,12 @@ Ext.define('Traccar.view.MapController', { '#ReportRoute': { load: 'loadReport', clear: 'clearReport' + }, + '#Geofences': { + load: 'showGeofences', + add: 'updateGeofences', + update: 'updateGeofences', + remove: 'updateGeofences' } }, component: { @@ -58,6 +65,20 @@ Ext.define('Traccar.view.MapController', { init: function () { this.latestMarkers = {}; this.reportMarkers = {}; + this.getView().header = { + xtype: 'header', + title: Strings.mapTitle, + items: [{ + xtype: 'button', + handler: 'showGeofences', + reference: 'showGeofencesButton', + glyph: 'xf21d@FontAwesome', + enableToggle: true, + pressed: true, + tooltip: Strings.sharedGeofences, + tooltipType: 'title' + }] + }; }, getDeviceColor: function (device) { @@ -321,5 +342,49 @@ Ext.define('Traccar.view.MapController', { center = ol.proj.transform(this.getView().getMapView().getCenter(), projection, 'EPSG:4326'); zoom = this.getView().getMapView().getZoom(); this.fireEvent('mapstate', center[1], center[0], zoom); + }, + + getGeofenceStyle: function (label) { + return new ol.style.Style({ + fill: new ol.style.Fill({ + color: Traccar.Style.mapGeofenceOverlay + }), + stroke: new ol.style.Stroke({ + color: Traccar.Style.mapGeofenceColor, + width: Traccar.Style.mapGeofenceWidth + }), + text: new ol.style.Text({ + text: label, + fill: new ol.style.Fill({ + color: Traccar.Style.mapGeofenceTextColor + }), + stroke: new ol.style.Stroke({ + color: Traccar.Style.mapTextStrokeColor, + width: Traccar.Style.mapTextStrokeWidth + }), + font : Traccar.Style.mapTextFont + }) + }); + }, + + showGeofences: function () { + if (this.lookupReference('showGeofencesButton').pressed) { + Ext.getStore('Geofences').each(function (geofence) { + var feature = new ol.Feature(Traccar.GeofenceConverter + .wktToGeometry(this.getView().getMapView(), geofence.get('area'))); + feature.setStyle(this.getGeofenceStyle(geofence.get('name'))); + this.getView().getGeofencesSource().addFeature(feature); + return true; + }, this); + } else { + this.getView().getGeofencesSource().clear(); + } + }, + + updateGeofences: function () { + if (this.lookupReference('showGeofencesButton').pressed) { + this.getView().getGeofencesSource().clear(); + this.showGeofences(); + } } }); |