aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-07-04 16:11:31 +0500
committerAbyss777 <abyss@fox5.ru>2016-07-04 16:11:31 +0500
commit6e36522ed8aa7b4d1f6b4a7ac3fabb08de2d0387 (patch)
tree16159d528445f35e19be875e6627b0c139e45070
parent23796ee74a04f87d5dd028dffffa8a992c5c662d (diff)
downloadtrackermap-server-6e36522ed8aa7b4d1f6b4a7ac3fabb08de2d0387.tar.gz
trackermap-server-6e36522ed8aa7b4d1f6b4a7ac3fabb08de2d0387.tar.bz2
trackermap-server-6e36522ed8aa7b4d1f6b4a7ac3fabb08de2d0387.zip
Load area for editing geofence.
-rw-r--r--web/app/view/GeofenceDialogController.js6
-rw-r--r--web/app/view/GeofenceMap.js6
2 files changed, 10 insertions, 2 deletions
diff --git a/web/app/view/GeofenceDialogController.js b/web/app/view/GeofenceDialogController.js
index c8d518514..b04935b9c 100644
--- a/web/app/view/GeofenceDialogController.js
+++ b/web/app/view/GeofenceDialogController.js
@@ -37,10 +37,14 @@ Ext.define('Traccar.view.GeofenceDialogController', {
},
onAreaClick: function (button) {
+ var dialog, record;
+ dialog = button.up('window').down('form');
+ record = dialog.getRecord();
Ext.create('Traccar.view.BaseWindow', {
title: Strings.sharedArea,
items: {
- xtype: 'geofenceMapView'
+ xtype: 'geofenceMapView',
+ area: record.get('area')
}
}).show();
}
diff --git a/web/app/view/GeofenceMap.js b/web/app/view/GeofenceMap.js
index e8a4dc5de..70584f41d 100644
--- a/web/app/view/GeofenceMap.js
+++ b/web/app/view/GeofenceMap.js
@@ -19,7 +19,8 @@ Ext.define('Traccar.view.GeofenceMap', {
xtype: 'geofenceMapView',
requires: [
- 'Traccar.view.GeofenceMapController'
+ 'Traccar.view.GeofenceMapController',
+ 'Traccar.GeofenceConverter'
],
controller: 'geofenceMap',
@@ -56,6 +57,9 @@ Ext.define('Traccar.view.GeofenceMap', {
map = this.map;
this.features = new ol.Collection();
+ if (this.area !== "") {
+ this.features.push(new ol.Feature(Traccar.GeofenceConverter.wktToGeometry(this.mapView, this.area)));
+ }
featureOverlay = new ol.layer.Vector({
source: new ol.source.Vector({
features: this.features