Merge remote-tracking branch 'upstream/master' into routing

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

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 97827fb8d3474b230c2fa7c6828cc4c4211ef913..fb4aa030036e4b145028785a35a9b12f9f45b60f 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,45 +1,59 @@
-function init(){
-  var params = $("#map").data();
-  var map = createMap("map");
+//= require leaflet.locate
 
-  setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+$(document).ready(function () {
+  var map = L.map("map", {
+    attributionControl: false,
+    zoomControl: false
+  }).addLayer(new L.OSM.Mapnik());
 
-  if ($("#map").hasClass("set_location")) {
-    var marker;
+  var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+  L.OSM.zoom({position: position})
+    .addTo(map);
 
-    if (params.marker) {
-      marker = addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat));
+  L.control.locate({
+    position: position,
+    strings: {
+      title: I18n.t('javascripts.map.locate.title'),
+      popup: I18n.t('javascripts.map.locate.popup')
     }
+  }).addTo(map);
 
-    map.events.register("click", map, function (e) {
-      closeMapPopup();
+  if (OSM.home) {
+    map.setView([OSM.home.lat, OSM.home.lon], 12);
+  } else {
+    map.setView([0, 0], 0);
+  }
 
-      if (document.getElementById('updatehome').checked) {
-        var lonlat = getEventPosition(e);
+  if ($("#map").hasClass("set_location")) {
+    var marker = L.marker([0, 0], {icon: getUserIcon()});
 
-        document.getElementById('homerow').className = '';
-        document.getElementById('home_lat').value = lonlat.lat;
-        document.getElementById('home_lon').value = lonlat.lon;
+    if (OSM.home) {
+      marker.setLatLng([OSM.home.lat, OSM.home.lon]);
+      marker.addTo(map);
+    }
+
+    map.on("click", function (e) {
+      if ($('#updatehome').is(':checked')) {
+        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(lonlat);
+        marker.setLatLng(e.latlng);
+        marker.addTo(map);
       }
     });
   } else {
-    addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat), null, params.marker.description);
-
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {
-        var icon = OpenLayers.Marker.defaultIcon();
-        icon.url = OpenLayers.Util.getImageLocation(user.icon);
-        addMarkerToMap(new OpenLayers.LonLat(user.lon, user.lat), icon, user.description);
+        L.marker([user.lat, user.lon], {icon: getUserIcon(user.icon)}).addTo(map)
+          .bindPopup(user.description);
       }
     });
   }
-}
-
-window.onload = init;
+});