Skip to content

Dev #2780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bernardhanna merged 2 commits into from
Jun 9, 2025
Merged

Dev #2780

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1155ce
Fix: map markers not showing on initial load (global cluster group) 6
bernardhanna Jun 9, 2025
c927ae5
Merge pull request #2779 from codeeu/mapfix
bernardhanna Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 43 additions & 44 deletions public/js/customMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ L.custom = {

map.menu.remove("print");

var markersCountryLayers = [];
var markersCountryLayers = {};

var success = function (data) {

Expand All @@ -36,19 +36,19 @@ L.custom = {
}

// Clear old layers
if (markersCountryLayers.length > 0) {
$.each(markersCountryLayers, function (key, countryLayer) {
countryLayer.clearLayers();
map.removeLayer(countryLayer);
});
markersCountryLayers = [];
}
$.each(markersCountryLayers, function (countryKey, layer) {
layer.clearLayers();
map.removeLayer(layer);
});
markersCountryLayers = {};

// NEW: Build single master cluster
var allMarkers = [];
// Now process new data
$.each(data, function (key, countryEvents) {
// SAFE normalization:
var countryKey = key.toUpperCase();

$.each(data, function (key, country) {
$.each(country, function (key, val) {
var markersListPerCountry = [];
$.each(countryEvents, function (key, val) {
if (val.geoposition) {
var coordinates = val.geoposition.split(',');
var lat = parseFloat(coordinates[0]);
Expand All @@ -57,50 +57,49 @@ L.custom = {
if (!isNaN(lat) && !isNaN(lng)) {
var marker = L.marker(L.latLng(lat, lng), { id: val.id });
marker.on('click', markerOnClick);
allMarkers.push(marker);
markersListPerCountry.push(marker);
}
}
});
});

var masterCluster = L.markerClusterGroup({
showCoverageOnHover: false,
maxClusterRadius: 120,
chunkedLoading: true,
iconCreateFunction: function (cluster) {
var total = cluster.getAllChildMarkers().length;
var iconSize;
var className = "mycluster ";
if (total <= 10) {
iconSize = L.point(30, 30);
className += "size1";
} else if (total <= 100) {
iconSize = L.point(35, 35);
className += "size2";
} else if (total <= 1000) {
iconSize = L.point(40, 40);
className += "size3";
} else if (total <= 10000) {
iconSize = L.point(45, 45);
className += "size4";
} else {
iconSize = L.point(50, 50);
className += "size5";
var countryCluster = L.markerClusterGroup({
showCoverageOnHover: false,
maxClusterRadius: 120,
chunkedLoading: true,
iconCreateFunction: function (cluster) {
var total = cluster.getAllChildMarkers().length;
var iconSize;
var className = "mycluster ";
if (total <= 10) {
iconSize = L.point(30, 30);
className += "size1";
} else if (total <= 100) {
iconSize = L.point(35, 35);
className += "size2";
} else if (total <= 1000) {
iconSize = L.point(40, 40);
className += "size3";
} else if (total <= 10000) {
iconSize = L.point(45, 45);
className += "size4";
} else {
iconSize = L.point(50, 50);
className += "size5";
}
return L.divIcon({ html: '<div>' + total + '</div>', className: className, iconSize: iconSize });
}
return L.divIcon({ html: '<div>' + total + '</div>', className: className, iconSize: iconSize });
}
});
});

masterCluster.addLayers(allMarkers);
markersCountryLayers.push(masterCluster);
map.addLayer(masterCluster);
countryCluster.addLayers(markersListPerCountry);
markersCountryLayers[countryKey] = countryCluster;
map.addLayer(countryCluster);
});

// process next components
$wt._queue("next");
}

$('#id_year').on('change', function () {
//window.location = window.App.url + '/events?year=' + this.value;
getEvents(this.value);
});

Expand Down
Loading