cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 15165:15373 from trunk.

Browse source
This commit is contained in:
Tom Hughes 2009-05-31 11:32:32 +00:00
parent e9bea64bf6
commit 3d906fe8c6
25 changed files with 191 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/export/start.rjs
View file

@ -327,7 +327,7 @@ page << <<EOJ
var ymax = bounds.top * Math.PI / 180;
var yzoom = Math.LOG2E * (Math.log(2000 * 2 * Math.PI) - Math.log(Math.log((Math.tan(ymax) + 1 / Math.cos(ymax)) / (Math.tan(ymin) + 1 / Math.cos(ymin)))))
return Math.floor(Math.min(xzoom, yzoom));
return Math.min(Math.floor(Math.min(xzoom, yzoom)), 17);
}
function roundScale(scale) {