aboutsummaryrefslogtreecommitdiff
path: root/web/app/view
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-08-30 16:00:55 +1200
committerGitHub <noreply@github.com>2017-08-30 16:00:55 +1200
commit305d268be14e3eca575f8580018cc31b43e2142c (patch)
treea40e85a8b1237a881e3ac385dd3f68714108cac4 /web/app/view
parentff374f3fb794d75b6657421ee1653f810f2ef4b4 (diff)
parente314abba557cc8b87e67b6399f52b833e7de0751 (diff)
downloadetbsa-traccar-web-305d268be14e3eca575f8580018cc31b43e2142c.tar.gz
etbsa-traccar-web-305d268be14e3eca575f8580018cc31b43e2142c.tar.bz2
etbsa-traccar-web-305d268be14e3eca575f8580018cc31b43e2142c.zip
Merge pull request #566 from Abyss777/max_zoom
Add Max Zoom attribute
Diffstat (limited to 'web/app/view')
-rw-r--r--web/app/view/map/BaseMap.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index c6eb5b4..a0d346e 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -30,7 +30,7 @@ Ext.define('Traccar.view.map.BaseMap', {
},
initMap: function () {
- var server, layer, type, bingKey, lat, lon, zoom, target;
+ var server, layer, type, bingKey, lat, lon, zoom, maxZoom, target;
server = Traccar.app.getServer();
@@ -161,11 +161,12 @@ Ext.define('Traccar.view.map.BaseMap', {
lat = Traccar.app.getPreference('latitude', Traccar.Style.mapDefaultLat);
lon = Traccar.app.getPreference('longitude', Traccar.Style.mapDefaultLon);
zoom = Traccar.app.getPreference('zoom', Traccar.Style.mapDefaultZoom);
+ maxZoom = Traccar.app.getAttributePreference('web.maxZoom', Traccar.Style.mapMaxZoom);
this.mapView = new ol.View({
center: ol.proj.fromLonLat([lon, lat]),
zoom: zoom,
- maxZoom: Traccar.Style.mapMaxZoom
+ maxZoom: maxZoom
});
this.map = new ol.Map({