X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7dbc27fd672dc8649bf036334521aca4413ff09e..c18d684ddad7b4b23b403c543b40a35ed6a3f6ee:/app/views/user/_friend_map.rhtml?ds=sidebyside

diff --git a/app/views/user/_friend_map.rhtml b/app/views/user/_friend_map.rhtml
index 05589ac09..33d6e1f85 100644
--- a/app/views/user/_friend_map.rhtml
+++ b/app/views/user/_friend_map.rhtml
@@ -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,18 +53,19 @@
     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);
+    if (document.getElementById('updatehome')) {
+      map.events.register("click", map, setHome);
+    }
   }        
 
   function setHome( e ) { 
     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;
@@ -74,7 +75,7 @@
         removeMarkerFromMap(marker);
       }
 
-      marker = addMarkerToMap(merc, null, "Your location");
+      marker = addMarkerToMap(lonlat, null, "Your location");
     }
   }