X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4563244fd1cb43dca00b427e1f13ac890b7f00a0..16da03aacb264c1703d8bd4fab5c58c78745be00:/app/assets/javascripts/user.js?ds=sidebyside

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 4e6467712..22c2ad829 100644
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,15 +1,23 @@
+//= require leaflet.locate
+
 $(document).ready(function () {
   var map = L.map("map", {
     attributionControl: false,
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
-  L.control.zoom({position: 'topright'})
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+  L.OSM.zoom({position: position})
     .addTo(map);
 
-  $("#map").on("resized", function () {
-    map.invalidateSize();
-  });
+  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);
@@ -18,7 +26,7 @@ $(document).ready(function () {
   }
 
   if ($("#map").hasClass("set_location")) {
-    var marker = L.marker([0, 0], {icon: getUserIcon()});
+    var marker = L.marker([0, 0], {icon: OSM.getUserIcon()});
 
     if (OSM.home) {
       marker.setLatLng([OSM.home.lat, OSM.home.lon]);
@@ -27,9 +35,13 @@ $(document).ready(function () {
 
     map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
+        var zoom = map.getZoom(),
+            precision = OSM.zoomPrecision(zoom),
+            location = e.latlng.wrap();
+
         $('#homerow').removeClass();
-        $('#home_lat').val(e.latlng.lat);
-        $('#home_lon').val(e.latlng.lng);
+        $('#home_lat').val(location.lat.toFixed(precision));
+        $('#home_lon').val(location.lng.toFixed(precision));
 
         marker.setLatLng(e.latlng);
         marker.addTo(map);
@@ -39,7 +51,7 @@ $(document).ready(function () {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {
-        L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map)
+        L.marker([user.lat, user.lon], {icon: OSM.getUserIcon(user.icon)}).addTo(map)
           .bindPopup(user.description);
       }
     });