Merge remote-tracking branch 'upstream/pull/5461'

[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 73a179ba9e00bc9f3edad12da9241180d300cdbc..bd5fd4dd62f359ecd0b163e555c87bd6420bd0f3 100644 (file)
--- a/app/assets/javascripts/diary_entry.js
+++ b/app/assets/javascripts/diary_entry.js
@@ -2,14 +2,16 @@ $(document).ready(function () {
   var marker, map;
 
   function setLocation(e) {
-    $("#latitude").val(e.latlng.lat);
-    $("#longitude").val(e.latlng.lng);
+    const latlng = e.latlng.wrap();
+
+    $("#latitude").val(latlng.lat);
+    $("#longitude").val(latlng.lng);
 
     if (marker) {
       map.removeLayer(marker);
     }
 
-    marker = L.marker(e.latlng, {icon: OSM.getUserIcon()}).addTo(map)
+    marker = L.marker(e.latlng, { icon: OSM.getUserIcon() }).addTo(map)
       .bindPopup(I18n.t("diary_entries.edit.marker_text"));
   }
 
@@ -28,13 +30,13 @@ $(document).ready(function () {
       zoomControl: false
     }).addLayer(new L.OSM.Mapnik());
 
-    L.OSM.zoom({position: position})
+    L.OSM.zoom({ position: position })
       .addTo(map);
 
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {
-      marker = L.marker(centre, {icon: OSM.getUserIcon()}).addTo(map)
+      marker = L.marker(centre, { icon: OSM.getUserIcon() }).addTo(map)
         .bindPopup(I18n.t("diary_entries.edit.marker_text"));
     }