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

Use Math.PI instead of defining it ourselves (and sometimes forgetting).

Browse source
This commit is contained in:
Tom Hughes 2007-06-30 11:25:53 +00:00
parent 4235bdf162
commit 48a3a317bc
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
public/javascripts/map.js
View file

@ -99,16 +99,15 @@ function removeMarkerFromMap(marker){
function mercatorToLonLat(merc) { function mercatorToLonLat(merc) {
var lon = (merc.lon / 20037508.34) * 180; var lon = (merc.lon / 20037508.34) * 180;
var lat = (merc.lat / 20037508.34) * 180; var lat = (merc.lat / 20037508.34) * 180;
var PI = 3.14159265358979323846;
lat = 180/PI * (2 * Math.atan(Math.exp(lat * PI / 180)) - PI / 2); lat = 180/Math.PI * (2 * Math.atan(Math.exp(lat * Math.PI / 180)) - Math.PI / 2);
return new OpenLayers.LonLat(lon, lat); return new OpenLayers.LonLat(lon, lat);
} }
function lonLatToMercator(ll) { function lonLatToMercator(ll) {
var lon = ll.lon * 20037508.34 / 180; var lon = ll.lon * 20037508.34 / 180;
var lat = Math.log(Math.tan((90 + ll.lat) * PI / 360)) / (PI / 180); var lat = Math.log(Math.tan((90 + ll.lat) * Math.PI / 360)) / (Math.PI / 180);
lat = lat * 20037508.34 / 180; lat = lat * 20037508.34 / 180;