diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-06-20 18:20:49 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 18:20:49 +1200 |
| commit | 58eba78776e0ba7f672711268d2c1aaa6d806a85 (patch) | |
| tree | b88916492f09fa1d7c0b0625eb4def259faf5cc1 | |
| parent | 5a6044faac45b377efabe363655ec21790bd955b (diff) | |
| parent | 8429665c4ba061897e5e225792a2ab7350583c40 (diff) | |
| download | trackermap-web-58eba78776e0ba7f672711268d2c1aaa6d806a85.tar.gz trackermap-web-58eba78776e0ba7f672711268d2c1aaa6d806a85.tar.bz2 trackermap-web-58eba78776e0ba7f672711268d2c1aaa6d806a85.zip | |
Merge pull request #508 from Abyss777/select_zoom
Implement zoom map on select
| -rw-r--r-- | web/app/store/ServerAttributes.js | 7 | ||||
| -rw-r--r-- | web/app/store/UserAttributes.js | 7 | ||||
| -rw-r--r-- | web/app/view/map/MapMarkerController.js | 4 | ||||
| -rw-r--r-- | web/l10n/en.json | 1 |
4 files changed, 19 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); + } } } diff --git a/web/l10n/en.json b/web/l10n/en.json index f8ac447e..1c10c13e 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -74,6 +74,7 @@ "attributeProcessingCopyAttributes": "Processing: Copy Attributes", "attributeColor": "Color", "attributeWebLiveRouteLength": "Web: Live Route Length", + "attributeWebSelectZoom": "Web: Zoom On Select", "attributeMailSmtpHost": "Mail: SMTP Host", "attributeMailSmtpPort": "Mail: SMTP Port", "attributeMailSmtpStarttlsEnable": "Mail: SMTP STARTTLS Enable", |