X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aff23d4b4bc9e9fecd5c1caa7e4d38087e002396..73214da35de30b3466cf8d0ab751955ec9292ec4:/app/assets/javascripts/diary_entry.js

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index 1aa728ea0..f13706971 100644
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -9,8 +9,8 @@ $(document).ready(function () {
       map.removeLayer(marker);
     }
 
-    marker = L.marker(e.latlng, {icon: getUserIcon()}).addTo(map)
-      .bindPopup(I18n.t('diary_entry.edit.marker_text'));
+    marker = L.marker(e.latlng, {icon: OSM.getUserIcon()}).addTo(map)
+      .bindPopup(I18n.t('diary_entries.edit.marker_text'));
   }
 
   $("#usemap").click(function (e) {
@@ -21,20 +21,21 @@ $(document).ready(function () {
 
     var params = $("#map").data();
     var centre = [params.lat, params.lon];
+    var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
     map = L.map("map", {
       attributionControl: false,
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 
-    L.OSM.zoom()
+    L.OSM.zoom({position: position})
       .addTo(map);
 
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {
-      marker = L.marker(centre, {icon: getUserIcon()}).addTo(map)
-        .bindPopup(I18n.t('diary_entry.edit.marker_text'));
+      marker = L.marker(centre, {icon: OSM.getUserIcon()}).addTo(map)
+        .bindPopup(I18n.t('diary_entries.edit.marker_text'));
     }
 
     map.on("click", setLocation);