Merge pull request #508 from Abyss777/select_zoom

Implement zoom map on select

3 files changed, 18 insertions, 0 deletions

diff --git a/web/app/store/ServerAttributes.js b/web/app/store/ServerAttributes.js
index 64bac240..05002f16 100644
--- a/web/app/store/ServerAttributes.js
+++ b/web/app/store/ServerAttributes.js
@@ -40,5 +40,12 @@ Ext.define('Traccar.store.ServerAttributes', {
         name: Strings.attributeWebLiveRouteLength,
         valueType: 'number',
         allowDecimals: false
+    }, {
+        key: 'web.selectZoom',
+        name: Strings.attributeWebSelectZoom,
+        valueType: 'number',
+        allowDecimals: false,
+        minValue: Traccar.Style.mapDefaultZoom,
+        maxValue: Traccar.Style.mapMaxZoom
     }]
 });
diff --git a/web/app/store/UserAttributes.js b/web/app/store/UserAttributes.js
index da05d5c8..91a54d04 100644
--- a/web/app/store/UserAttributes.js
+++ b/web/app/store/UserAttributes.js
@@ -72,5 +72,12 @@ Ext.define('Traccar.store.UserAttributes', {
         name: Strings.attributeWebLiveRouteLength,
         valueType: 'number',
         allowDecimals: false
+    }, {
+        key: 'web.selectZoom',
+        name: Strings.attributeWebSelectZoom,
+        valueType: 'number',
+        allowDecimals: false,
+        minValue: Traccar.Style.mapDefaultZoom,
+        maxValue: Traccar.Style.mapMaxZoom
     }]
 });
diff --git a/web/app/view/map/MapMarkerController.js b/web/app/view/map/MapMarkerController.js
index 44067dc6..a9732dd6 100644
--- a/web/app/view/map/MapMarkerController.js
+++ b/web/app/view/map/MapMarkerController.js
@@ -74,6 +74,7 @@ Ext.define('Traccar.view.map.MapMarkerController', {
         this.accuracyCircles = {};
         this.liveRoutes = {};
         this.liveRouteLength = Traccar.app.getAttributePreference('web.liveRouteLength', 10);
+        this.selectZoom = Traccar.app.getAttributePreference('web.selectZoom', 0);
     },
 
     getAreaStyle: function (label, color) {
@@ -454,6 +455,9 @@ Ext.define('Traccar.view.map.MapMarkerController', {
             marker.changed();
             if (center) {
                 this.getView().getMapView().setCenter(marker.getGeometry().getCoordinates());
+                if (this.selectZoom !== 0 && this.selectZoom > this.getView().getMapView().getZoom()) {
+                    this.getView().getMapView().setZoom(this.selectZoom);
+                }
             }
         }