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

Get rid of our reprojection code and use OpenLayers reprojection instead.

Browse source
This commit is contained in:
Tom Hughes 2008-04-16 17:18:45 +00:00
parent 430fa39118
commit b8c500cdbc
4 changed files with 34 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/views/user/_friend_map.rhtml
View file

@ -33,7 +33,7 @@
var marker;
function init(){
var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
var zoom = <%= zoom %>;
<% if params['scale'] and params['scale'].length > 0 then %>
@ -42,10 +42,10 @@
var map = createMap("map");
map.setCenter(centre, zoom);
setMapCenter(centre, zoom);
<% if marker %>
marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)), null, "Your location");
marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null, "Your location");
<% end %>
var near_icon = OpenLayers.Marker.defaultIcon();
@ -53,7 +53,7 @@
var i = nearest.length;
while( i-- ) {
var description = 'Nearby mapper: <a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>'
var nearmarker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat)), near_icon.clone(), description);
var nearmarker = addMarkerToMap(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat), near_icon.clone(), description);
}
map.events.register("click", map, setHome);
@ -63,8 +63,7 @@
closeMapPopup();
if (document.getElementById('updatehome').checked) {
var merc = map.getLonLatFromViewPortPx(e.xy);
var lonlat = mercatorToLonLat(merc);
var lonlat = getEventPosition(e);
document.getElementById('homerow').className = '';
document.getElementById('home_lat').value = lonlat.lat;