X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/30ad58c01ff8acae377cfd974fcc94d6898722da..e96a64ca9c2ea068dd9167e074ee26c8d28744b4:/app/assets/javascripts/diary_entry.js?ds=inline diff --git a/app/assets/javascripts/diary_entry.js b/app/assets/javascripts/diary_entry.js index 30038a0af..e17f59ad2 100644 --- a/app/assets/javascripts/diary_entry.js +++ b/app/assets/javascripts/diary_entry.js @@ -1,15 +1,16 @@ $(document).ready(function () { - var marker; + var marker, map; 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: getUserIcon()}).addTo(map) + .bindPopup(I18n.t('diary_entry.edit.marker_text')); } $("#usemap").click(function (e) { @@ -20,12 +21,24 @@ $(document).ready(function () { var params = $("#map").data(); var centre = [params.lat, params.lon]; - var map = createMap("map"); + + map = L.map("map", { + attributionControl: false, + zoomControl: false + }).addLayer(new L.OSM.Mapnik()); + + L.control.zoom({position: 'topright'}) + .addTo(map); + + $("#map").on("resized", function () { + map.invalidateSize(); + }); 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: getUserIcon()}).addTo(map) + .bindPopup(I18n.t('diary_entry.edit.marker_text')); } map.on("click", setLocation);