Merge pull request #3935 from Hufkratzer/rename-horse-riding-label

[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 30038a0afdbc51894930ca11b2600c4cbfd063bd..625d43a5228f0b07a391f988a43cae3327364e67 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -1,15 +1,16 @@
 $(document).ready(function () {
 $(document).ready(function () {

-  var marker;
+  var marker, map;

 
   function setLocation(e) {
     $("#latitude").val(e.latlng.lat);
     $("#longitude").val(e.latlng.lng);
 
     if (marker) {
 
   function setLocation(e) {
     $("#latitude").val(e.latlng.lat);
     $("#longitude").val(e.latlng.lng);
 
     if (marker) {

-      removeMarkerFromMap(marker);
+      map.removeLayer(marker);

     }
 
     }
 

-    marker = addMarkerToMap(e.latlng, null, 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) {
   }
 
   $("#usemap").click(function (e) {


@@ -20,12 +21,21 @@ $(document).ready(function () {
 
     var params = $("#map").data();
     var centre = [params.lat, params.lon];
 
     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()) {
 
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {

-      marker = addMarkerToMap(centre, null, 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);
     }
 
     map.on("click", setLocation);