Merge remote-tracking branch 'osmlab/id-editor-embed'

[rails.git] / app / assets / javascripts / user.js

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index e5620b0a30dc6048b6009f26dd8657639266c573..25456d04ebb080b46564fb359b5801fac551c163 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -11,10 +11,11 @@ $(document).ready(function () {
   }
 
   if ($("#map").hasClass("set_location")) {
   }
 
   if ($("#map").hasClass("set_location")) {

-    var marker;
+    var marker = L.marker([0, 0], {icon: getUserIcon()});

 
     if (OSM.home) {
 
     if (OSM.home) {

-      marker = addMarkerToMap([OSM.home.lat, OSM.home.lon]);
+      marker.setLatLng([OSM.home.lat, OSM.home.lon]);
+      marker.addTo(map);

     }
 
     map.on("click", function (e) {
     }
 
     map.on("click", function (e) {


@@ -23,18 +24,16 @@ $(document).ready(function () {
         $('#home_lat').val(e.latlng.lat);
         $('#home_lon').val(e.latlng.lng);
 
         $('#home_lat').val(e.latlng.lat);
         $('#home_lon').val(e.latlng.lng);
 

-        if (marker) {
-          removeMarkerFromMap(marker);
-        }
-
-        marker = addMarkerToMap(e.latlng);
+        marker.setLatLng(e.latlng);
+        marker.addTo(map);

       }
     });
   } else {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {
       }
     });
   } else {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {

-        addMarkerToMap([user.lat, user.lon], L.icon({iconUrl: user.icon}), user.description);
+        L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map)
+          .bindPopup(user.description);

       }
     });
   }
       }
     });
   }