Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-01 06:33:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #342 from mikeprimm/master

Browse Source 
Fix zoom range to match selected map
This commit is contained in:
mikeprimm 2011-07-28 21:53:13 -07:00
commit f8f1e77153
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/js/map.js
View File

@ -319,6 +319,11 @@ DynMap.prototype = {
me.world = mapWorld; me.world = mapWorld;
me.maptype = map; me.maptype = map;
me.map.addLayer(me.maptype);
if(me.maptype.options.maxZoom < prevzoom)
prevzoom = me.maptype.options.maxZoom;
me.map.options.maxZoom = me.maptype.options.maxZoom;
me.map.options.minZoom = me.maptype.options.minZoom;
if (projectionChanged || worldChanged) { if (projectionChanged || worldChanged) {
var centerPoint; var centerPoint;
@ -329,11 +334,11 @@ DynMap.prototype = {
else { else {
centerPoint = me.map.getCenter(); centerPoint = me.map.getCenter();
} }
me.map.setView(centerPoint, 0, true); me.map.setView(centerPoint, prevzoom, true);
} }
me.map.addLayer(me.maptype); else {
me.map.setZoom(prevzoom); me.map.setZoom(prevzoom);
}
if (worldChanged) { if (worldChanged) {
$(me).trigger('worldchanged'); $(me).trigger('worldchanged');