X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6f444fc99e6247bc0300402c87f7d08470a9c8f9..8fe5dbb92cec25467f1f1c23f65113c5e956a7ff:/app/assets/javascripts/index/note.js.erb diff --git a/app/assets/javascripts/index/note.js.erb b/app/assets/javascripts/index/note.js.erb index 6458626f4..09044bf0e 100644 --- a/app/assets/javascripts/index/note.js.erb +++ b/app/assets/javascripts/index/note.js.erb @@ -38,7 +38,7 @@ OSM.Note = function (map) { } else if (marker) { marker.setIcon(noteIcons[feature.properties.status]); } - page.load(); + OSM.loadSidebarContent(window.location.pathname, page.load); } }); } @@ -70,15 +70,20 @@ OSM.Note = function (map) { var data = $('.details').data(); if (!noteState) map.addLayer(noteLayer); - if (window.location.hash == "") { + if (!window.location.hash) { var coords = data.coordinates.split(','); + OSM.route.moveListenerOff(); + map.once('moveend', OSM.route.moveListenerOn); + map.getZoom() > 15 ? map.panTo(coords) : map.setView(coords, 16); } if (!map.hasLayer(halo)) { halo = L.circleMarker(data.coordinates.split(','), { weight: 2.5, - radius: 20 + radius: 20, + fillOpacity: 0.5, + color: "#FF6200" }); map.addLayer(halo); }