Merge pull request #15 from danstowell/jsrouting-highlightsegments

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 95137bd120012df3cdf35f380920253689b61951..fb4aa030036e4b145028785a35a9b12f9f45b60f 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,5 +1,23 @@
+//= require leaflet.locate
+

 $(document).ready(function () {
 $(document).ready(function () {

-  var map = createMap("map");
+  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);
 
   if (OSM.home) {
     map.setView([OSM.home.lat, OSM.home.lon], 12);


@@ -8,30 +26,33 @@ $(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) {
       if ($('#updatehome').is(':checked')) {
     }
 
     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) {
-          removeMarkerFromMap(marker);
-        }
+        $('#homerow').removeClass();
+        $('#home_lat').val(location.lat.toFixed(precision));
+        $('#home_lon').val(location.lng.toFixed(precision));

 
 

-        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);

       }
     });
   }
       }
     });
   }