X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/237d2ad60dd6b6778603ad274e2f6a168aada259..3458d881af4584e44d72bb682771e3c7a3cf6e68:/app/assets/javascripts/user.js?ds=sidebyside

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 77cb86a8d..25456d04e 100644
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,41 +1,39 @@
 $(document).ready(function () {
-  var map = createMap("map");
+  var map = createMap("map", {
+    zoomControl: true,
+    panZoomControl: false
+  });
 
   if (OSM.home) {
-    setMapCenter(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat), 12);
+    map.setView([OSM.home.lat, OSM.home.lon], 12);
   } else {
-    setMapCenter(new OpenLayers.LonLat(0, 0), 0);
+    map.setView([0, 0], 0);
   }
 
   if ($("#map").hasClass("set_location")) {
-    var marker;
+    var marker = L.marker([0, 0], {icon: getUserIcon()});
 
     if (OSM.home) {
-      marker = addMarkerToMap(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat));
+      marker.setLatLng([OSM.home.lat, OSM.home.lon]);
+      marker.addTo(map);
     }
 
-    map.events.register("click", map, function (e) {
+    map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
-        var lonlat = getEventPosition(e);
-
         $('#homerow').removeClass();
-        $('#home_lat').val(lonlat.lat);
-        $('#home_lon').val(lonlat.lon);
-
-        if (marker) {
-          removeMarkerFromMap(marker);
-        }
+        $('#home_lat').val(e.latlng.lat);
+        $('#home_lon').val(e.latlng.lng);
 
-        marker = addMarkerToMap(lonlat);
+        marker.setLatLng(e.latlng);
+        marker.addTo(map);
       }
     });
   } else {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {
-        var icon = OpenLayers.Marker.defaultIcon();
-        icon.url = OpenLayers.Util.getImageLocation(user.icon);
-        addMarkerToMap(new OpenLayers.LonLat(user.lon, user.lat), icon, user.description);
+        L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map)
+          .bindPopup(user.description);
       }
     });
   }