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

[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 bd5fd4dd62f359ecd0b163e555c87bd6420bd0f3..041e49f7e3976f793767dadc2e9466c7e90eec32 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, map;
+$(function () {
+  let marker, map;
 
   function setLocation(e) {
     const latlng = e.latlng.wrap();
@@ -11,8 +11,8 @@ $(document).ready(function () {
       map.removeLayer(marker);
     }
 
-    marker = L.marker(e.latlng, { icon: OSM.getUserIcon() }).addTo(map)
-      .bindPopup(I18n.t("diary_entries.edit.marker_text"));
+    marker = L.marker(e.latlng, { icon: OSM.getMarker({}) }).addTo(map)
+      .bindPopup(OSM.i18n.t("diary_entries.edit.marker_text"));
   }
 
   $("#usemap").click(function (e) {
@@ -21,23 +21,22 @@ $(document).ready(function () {
     $("#map").show();
     $("#usemap").hide();
 
-    var params = $("#map").data();
-    var centre = [params.lat, params.lon];
-    var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
+    const params = $("#map").data();
+    const centre = [params.lat, params.lon];
+    const 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);
+    L.OSM.zoom({ position }).addTo(map);
 
     map.setView(centre, params.zoom);
 
     if ($("#latitude").val() && $("#longitude").val()) {
-      marker = L.marker(centre, { icon: OSM.getUserIcon() }).addTo(map)
-        .bindPopup(I18n.t("diary_entries.edit.marker_text"));
+      marker = L.marker(centre, { icon: OSM.getMarker({}) }).addTo(map)
+        .bindPopup(OSM.i18n.t("diary_entries.edit.marker_text"));
     }
 
     map.on("click", setLocation);