CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-06 03:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test failure

Browse Source
This commit is contained in:
John Firebaugh
2013-10-17 15:28:10 -04:00
parent 382bd2abd8
commit bd1fac9c48
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/id/renderer/map.js
View File

@@ -269,10 +269,10 @@ iD.Map = function(context) {
return map;
};
function setZoom(z, force) {
if (z === map.zoom() && !force)
function setZoom(_, force) {
if (_ === map.zoom() && !force)
return false;
var scale = 256 * Math.pow(2, z),
var scale = 256 * Math.pow(2, _),
center = pxCenter(),
l = pointLocation(center);
scale = Math.max(1024, Math.min(256 * Math.pow(2, 24), scale));
@@ -287,15 +287,16 @@ iD.Map = function(context) {
return true;
}
function setCenter(loc) {
var t = projection.translate(),
c = pxCenter(),
ll = projection(loc);
if (ll[0] === c[0] && ll[1] === c[1])
function setCenter(_) {
var c = map.center();
if (_[0] === c[0] && _[1] === c[1])
return false;
var t = projection.translate(),
pxC = pxCenter(),
ll = projection(_);
projection.translate([
t[0] - ll[0] + c[0],
t[1] - ll[1] + c[1]]);
t[0] - ll[0] + pxC[0],
t[1] - ll[1] + pxC[1]]);
zoom.translate(projection.translate());
return true;
}