Merge branch '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 80b5059157ac40b40e4e155cbd1ccf7fc43b3b1e..fb4aa030036e4b145028785a35a9b12f9f45b60f 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -6,10 +6,13 @@ $(document).ready(function () {
     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);
 
   L.control.locate({
+    position: position,
     strings: {
       title: I18n.t('javascripts.map.locate.title'),
       popup: I18n.t('javascripts.map.locate.popup')
@@ -33,7 +36,7 @@ $(document).ready(function () {
     map.on("click", function (e) {
       if ($('#updatehome').is(':checked')) {
         var zoom = map.getZoom(),
-            precision = zoomPrecision(zoom),
+            precision = OSM.zoomPrecision(zoom),
             location = e.latlng.wrap();
 
         $('#homerow').removeClass();