X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/648f23259680f55d233656413679c58eec98c985..baf10cd39289cd7e94a819305e46f43e85a136c6:/app/assets/javascripts/user.js

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 674204d7b..fb4aa0300 100644
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,8 +1,23 @@
+//= require leaflet.locate
+
 $(document).ready(function () {
-  var map = createMap("map", {
-    zoomControl: true,
-    panZoomControl: false
-  });
+  var map = L.map("map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
+
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+  L.OSM.zoom({position: position})
+    .addTo(map);
+
+  L.control.locate({
+    position: position,
+    strings: {
+      title: I18n.t('javascripts.map.locate.title'),
+      popup: I18n.t('javascripts.map.locate.popup')
+    }
+  }).addTo(map);
 
   if (OSM.home) {
     map.setView([OSM.home.lat, OSM.home.lon], 12);
@@ -11,30 +26,32 @@ $(document).ready(function () {
   }
 
   if ($("#map").hasClass("set_location")) {
-    var marker;
+    var marker = L.marker([0, 0], {icon: getUserIcon()});
 
     if (OSM.home) {
-      marker = L.marker([OSM.home.lat, OSM.home.lon]).addTo(map);
+      marker.setLatLng([OSM.home.lat, OSM.home.lon]);
+      marker.addTo(map);
     }
 
     map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
-        $('#homerow').removeClass();
-        $('#home_lat').val(e.latlng.lat);
-        $('#home_lon').val(e.latlng.lng);
+        var zoom = map.getZoom(),
+            precision = OSM.zoomPrecision(zoom),
+            location = e.latlng.wrap();
 
-        if (marker) {
-          map.removeLayer(marker);
-        }
+        $('#homerow').removeClass();
+        $('#home_lat').val(location.lat.toFixed(precision));
+        $('#home_lon').val(location.lng.toFixed(precision));
 
-        marker = L.marker(e.latlng).addTo(map);
+        marker.setLatLng(e.latlng);
+        marker.addTo(map);
       }
     });
   } else {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {
-        L.marker([user.lat, user.lon], {icon: L.icon({iconUrl: user.icon})}).addTo(map)
+        L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map)
           .bindPopup(user.description);
       }
     });