Refactor

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 7de408b20506eb545ce0b359c3768ef7af828e0c..fb4aa030036e4b145028785a35a9b12f9f45b60f 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,12 +1,24 @@
+//= require leaflet.locate
+

 $(document).ready(function () {
   var map = L.map("map", {
     attributionControl: false,
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 
 $(document).ready(function () {
   var map = L.map("map", {
     attributionControl: false,
     zoomControl: false
   }).addLayer(new L.OSM.Mapnik());
 

-  L.OSM.zoom()
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+  L.OSM.zoom({position: position})

     .addTo(map);
 
     .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);
   } else {
   if (OSM.home) {
     map.setView([OSM.home.lat, OSM.home.lon], 12);
   } else {


@@ -24,12 +36,12 @@ $(document).ready(function () {
     map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
         var zoom = map.getZoom(),
     map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
         var zoom = map.getZoom(),

-            toZoom = zoomPrecision(zoom),
+            precision = OSM.zoomPrecision(zoom),

             location = e.latlng.wrap();
 
         $('#homerow').removeClass();
             location = e.latlng.wrap();
 
         $('#homerow').removeClass();

-        $('#home_lat').val(toZoom(location.lat));
-        $('#home_lon').val(toZoom(location.lng));
+        $('#home_lat').val(location.lat.toFixed(precision));
+        $('#home_lon').val(location.lng.toFixed(precision));

 
         marker.setLatLng(e.latlng);
         marker.addTo(map);
 
         marker.setLatLng(e.latlng);
         marker.addTo(map);