cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert newHalo() to addHalo() and removeHalo()

Browse source 
newHalo() wasn't always creating new halos. It had an event type argument that was checked against drag event. Depending on this check, newHalo() could remove the halo.
This commit is contained in:
Anton Khorev 2024-12-25 04:38:23 +03:00
parent f1835c914c
commit 4ea6077ddb
1 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/assets/javascripts/index/new_note.js
View file

@ -59,23 +59,22 @@ OSM.NewNote = function (map) {
marker.addTo(noteLayer);
}
function newHalo(loc, a) {
var hasHalo = halo && map.hasLayer(halo);
function addHalo(latlng) {
if (halo) map.removeLayer(halo);
if (a === "dragstart" && hasHalo) {
map.removeLayer(halo);
} else {
if (hasHalo) map.removeLayer(halo);
halo = L.circleMarker(latlng, {
weight: 2.5,
radius: 20,
fillOpacity: 0.5,
color: "#FF6200"
});
halo = L.circleMarker(loc, {
weight: 2.5,
radius: 20,
fillOpacity: 0.5,
color: "#FF6200"
});
map.addLayer(halo);
}
map.addLayer(halo);
}
function removeHalo() {
if (halo) map.removeLayer(halo);
halo = null;
}
page.pushstate = page.popstate = function (path) {
@ -112,11 +111,14 @@ OSM.NewNote = function (map) {
});
newNoteMarker.on("dragstart dragend", function (a) {
newHalo(newNoteMarker.getLatLng(), a.type);
removeHalo();
if (a.type !== "dragstart") {
addHalo(newNoteMarker.getLatLng());
}
});
newNoteMarker.addTo(map);
newHalo(newNoteMarker.getLatLng());
addHalo(newNoteMarker.getLatLng());
newNoteMarker.on("remove", function () {
addNoteButton.removeClass("active");
@ -156,7 +158,7 @@ OSM.NewNote = function (map) {
page.unload = function () {
if (newNoteMarker) map.removeLayer(newNoteMarker);
if (halo) map.removeLayer(halo);
removeHalo();
addNoteButton.removeClass("active");
};