Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop duplicate of region loading

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-12-29 09:10:13 +01:00
parent 848ad4d73c
commit db72d005b1
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
assets/js/sections/qso_map.js
View File

@@ -101,7 +101,7 @@ function initMap() {
});
});
function filterAndDisplayMarkers(qsos, showOnlyOutside = false) {
async function filterAndDisplayMarkers(qsos, showOnlyOutside = false) {
// Clear existing markers and layers
clearMap();
@@ -192,21 +192,7 @@ function initMap() {
}).addTo(map);
geojsonLayers.push(geojsonlayer);
info = L.control();
info.onAdd = function (map) {
this._div = L.DomUtil.create('div', 'info'); // create a div with a class "info"
this.update();
return this._div;
};
// method that we will use to update the control based on feature properties passed
info.update = function (props) {
this._div.innerHTML = '<h4>Region</h4>' + (props ?
'<b>' + props.code + ' - ' + props.name + '</b><br />' : 'Hover over a region');
};
info.addTo(map);
// Fit map to show both GeoJSON and markers
setTimeout(function() {
@@ -246,8 +232,25 @@ function initMap() {
// Add legend to the map only once
if (!legendAdded) {
addLegend(insideCount, outsideCount, qsos.length, showOnlyOutside);
legendAdded = true;
await addLegend(insideCount, outsideCount, qsos.length, showOnlyOutside).then(() => {
legendAdded = true;
info = L.control();
info.onAdd = function (map) {
this._div = L.DomUtil.create('div', 'info'); // create a div with a class "info"
this.update();
return this._div;
};
// method that we will use to update the control based on feature properties passed
info.update = function (props) {
this._div.innerHTML = '<h4>Region</h4>' + (props ?
'<b>' + props.code + ' - ' + props.name + '</b><br />' : 'Hover over a region');
};
info.addTo(map);
});
} else {
// Update existing legend counts
updateLegend(insideCount, outsideCount, qsos.length, showOnlyOutside);
@@ -303,7 +306,7 @@ function initMap() {
info.update();
}
function addLegend(insideCount, outsideCount, totalCount, showOnlyOutside) {
async function addLegend(insideCount, outsideCount, totalCount, showOnlyOutside) {
const legend = L.control({ position: 'topright' });
legend.onAdd = function(map) {