Merge remote-tracking branch 'openstreetmap/pull/1437'

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

diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js
index 291c8652382a85ab4cee1414eb6ce5d962a8bfef..b513057c148d8908fc167b05b271034c7c8a7c54 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -1,5 +1,5 @@
 $(document).ready(function () {
-  var marker;
+  var marker, map;
 
   function setLocation(e) {
     $("#latitude").val(e.latlng.lat);
@@ -9,7 +9,7 @@ $(document).ready(function () {
       map.removeLayer(marker);
     }
 
-    marker = L.marker(e.latlng, {icon: getUserIcon()}).addTo(map)
+    marker = L.marker(e.latlng, {icon: OSM.getUserIcon()}).addTo(map)
       .bindPopup(I18n.t('diary_entry.edit.marker_text'));
   }
 
@@ -21,12 +21,20 @@ $(document).ready(function () {
 
     var params = $("#map").data();
     var centre = [params.lat, params.lon];
-    var map = createMap("map");
+    var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
+
+    map = L.map("map", {
+      attributionControl: false,
+      zoomControl: false
+    }).addLayer(new L.OSM.Mapnik());
+
+    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)
+      marker = L.marker(centre, {icon: OSM.getUserIcon()}).addTo(map)
         .bindPopup(I18n.t('diary_entry.edit.marker_text'));
     }