Skip to content

Map fix 1 #2778

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 11 commits into from
Jun 9, 2025
Merged

Map fix 1 #2778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6817923
Merge pull request #2771 from codeeu/new-404-error-page-from-dev
Siroumi Jun 6, 2025
bf8372c
Fix: map markers not showing on initial load (global cluster group)
bernardhanna Jun 9, 2025
47cb31f
Merge pull request #2773 from codeeu/mapfix
bernardhanna Jun 9, 2025
b28f9c2
Fix: map markers not showing on initial load (global cluster group)
bernardhanna Jun 9, 2025
2d5c775
Merge pull request #2774 from codeeu/mapfix
bernardhanna Jun 9, 2025
2260f08
Fix: map markers not showing on initial load (global cluster group) 3
bernardhanna Jun 9, 2025
393b53e
Merge pull request #2775 from codeeu/mapfix
bernardhanna Jun 9, 2025
23ffc3c
Fix: map markers not showing on initial load (global cluster group) 4
bernardhanna Jun 9, 2025
1b3c8e3
Merge pull request #2776 from codeeu/mapfix
bernardhanna Jun 9, 2025
d0321a0
Fix: map markers not showing on initial load (global cluster group) 5
bernardhanna Jun 9, 2025
db608c9
Merge pull request #2777 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
2 changes: 1 addition & 1 deletion public/build/assets/app-F8GDFh2T.css → public/build/assets/app-DsJ8rwW1.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/build/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"resources/assets/sass/app.scss": {
"file": "assets/app-F8GDFh2T.css",
"file": "assets/app-DsJ8rwW1.css",
"src": "resources/assets/sass/app.scss",
"isEntry": true
},
Expand Down
96 changes: 55 additions & 41 deletions public/js/customMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
L.custom = {
init: function(obj, params){ // this method is run as soon as the core loading process is loaded
init: function (obj, params) { // this method is run as soon as the core loading process is loaded

window.map = L.map(obj, {
center: [48, 4],
Expand All @@ -15,7 +15,7 @@ L.custom = {

var success = function (data) {

var markerOnClick = function(e){
var markerOnClick = function (e) {
var id = e.target.options.id;
$.ajax({
dataType: "json",
Expand All @@ -27,60 +27,74 @@ L.custom = {
'<img src="' + event.picture + '" class="img-polaroid marker-buble-img" style="width:100px;height:100px;">' +
'<p style="overflow:hidden;">' + event.description + '</p>';

var popup = L.popup({maxWidth:600})
var popup = L.popup({ maxWidth: 600 })
.setContent(content)

e.target.bindPopup(popup).openPopup();
}
});
}

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

// NEW: Build single master cluster
var allMarkers = [];

$.each(data, function (key, country) {
var markersListPerCountry = [];
$.each(country, function (key, val) {
var coordinates = val.geoposition.split(',');
var marker = L.marker(L.latLng(coordinates[0], coordinates[1]), {id: val.id});
marker.on('click', markerOnClick);
markersListPerCountry.push(marker);
});
var markers = 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";
if (val.geoposition) {
var coordinates = val.geoposition.split(',');
var lat = parseFloat(coordinates[0]);
var lng = parseFloat(coordinates[1]);

if (!isNaN(lat) && !isNaN(lng)) {
var marker = L.marker(L.latLng(lat, lng), { id: val.id });
marker.on('click', markerOnClick);
allMarkers.push(marker);
}
return L.divIcon({ html: '<div>'+total+'</div>', className: className, iconSize: iconSize });
}
});
markers.addLayers(markersListPerCountry);
markersCountryLayers.push(markers);
map.addLayer(markers);
});

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";
}
return L.divIcon({ html: '<div>' + total + '</div>', className: className, iconSize: iconSize });
}
});

masterCluster.addLayers(allMarkers);
markersCountryLayers.push(masterCluster);
map.addLayer(masterCluster);

// process next components
$wt._queue("next");
}
Expand All @@ -97,13 +111,13 @@ L.custom = {
function getEvents(year) {
$.ajax({
dataType: "json",
url: "api/event/list?year="+ year,
url: "api/event/list?year=" + year,
success: success
});
}

var year = param('year') ? param('year') : 2019;
var year = param('year') ? param('year') : new Date().getFullYear();
getEvents(year);

}
}
}
Loading