Fix remaining JSHint issues

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index b4dbb7de2e178b19a6505c15a61c7bb9cf30232b..22c2ad829ed345d5016e433b306d8f2e80f4beaf 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 {


@@ -14,7 +26,7 @@ $(document).ready(function () {
   }
 
   if ($("#map").hasClass("set_location")) {
   }
 
   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]);
 
     if (OSM.home) {
       marker.setLatLng([OSM.home.lat, OSM.home.lon]);


@@ -24,11 +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();
 
         $('#homerow').removeClass();

-        $('#home_lat').val(toZoom(e.latlng.lat));
-        $('#home_lon').val(toZoom(e.latlng.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);


@@ -38,7 +51,7 @@ $(document).ready(function () {
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {
     $("[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);
       }
     });
           .bindPopup(user.description);
       }
     });