Skip to content

FIX LeafletTrait cleanup and rendering selections #746

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
kabachello merged 2 commits into from
Apr 15, 2026
+20 −15
Merged

FIX LeafletTrait cleanup and rendering selections #746

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d339ae
FIX LeafletTrait cleanup and rendering selections
hail-cookies Apr 14, 2026
55ac8ef
FIX LeafletTrait fixed null ref
hail-cookies Apr 14, 2026
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
35 changes: 20 additions & 15 deletions Facades/AbstractAjaxFacade/Elements/LeafletTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ function() {

oLayer.clearLayers();
oLayer.addData(aGeoJson);
if (oClusterLayer !== null) {
if ('{$isClusteringMarkers}') {
oClusterLayer.clearLayers().addLayer(oLayer);
}
{$this->buildJsAutoZoom('oLayer', $layer->getAutoZoom())}
Expand Down Expand Up @@ -1038,17 +1038,17 @@ function visit(value, depth) {
}

// create markers for eacht top coordinate of every geometry within our geoJSON
const markerCoords = topMostCoordinates(feature);
oClusterLayer?.clearLayers();
for (const [lng, lat] of markerCoords) {
const oMarker = L.marker([lat, lng], {
icon: {$this->buildJsMarkerIcon($layer, 'feature.properties.data')},
draggable: false,
autoPan: false,
$markerProps
});

if (oClusterLayer) {
if (oClusterLayer) {
oClusterLayer.clearLayers();
const markerCoords = topMostCoordinates(feature);
for (const [lng, lat] of markerCoords) {
const oMarker = L.marker([lat, lng], {
icon: {$this->buildJsMarkerIcon($layer, 'feature.properties.data')},
draggable: false,
autoPan: false,
$markerProps
});

oClusterLayer.addLayer(oMarker);
}
}
Expand All @@ -1058,7 +1058,6 @@ function visit(value, depth) {
$clusterInitJs = <<<JS

oClusterLayer = L.layerGroup();
oClusterLayer.addLayer(oLayer);
JS;

}
Expand Down Expand Up @@ -1106,6 +1105,8 @@ function visit(value, depth) {
}
});

// If we are displaying markers, especially if we cluster them, the cluster layer will serve as
// a wrapper for rendering all map markers.
var oClusterLayer = {$clusterInitJs};

{$initEditingJs}
Expand All @@ -1116,11 +1117,15 @@ function visit(value, depth) {
return;
}
oLayer._exfRefresh(oEvent);
// If we have a clustering wrapper, we have to ensure the marker layer is added to it,
// after refreshes or else it won't render.
if (oClusterLayer) {
oClusterLayer.addLayer(oLayer);
}
});

oLayer._exfRefresh();

return oClusterLayer ? oClusterLayer : oLayer;
return oClusterLayer ?? oLayer;
})({$this->buildJsLeafletVar()})
JS;
}
Expand Down