PxlLoewe/var-monorepo
1
0
Fork 0
Code Issues 22 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fixed marker-cluster position

Browse Source
This commit is contained in:
PxlLoewe
2025-04-29 21:22:02 -07:00
parent 8d41bdc938
commit 8e79c27444
4 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/dispatch/app/dispatch/_components/map/AircraftMarker.tsx
View File

@@ -224,7 +224,6 @@ const AircraftPopupContent = ({ aircraft }: { aircraft: Aircraft }) => {
};
const AircraftMarker = ({ aircraft }: { aircraft: Aircraft }) => {
const aircrafts = useAircraftsStore((state) => state.aircrafts);
const [hideMarker, setHideMarker] = useState(false);
const map = useMap();
const markerRef = useRef<LMarker>(null);

44
apps/dispatch/app/dispatch/_components/map/_components/MarkerCluster.tsx
View File

@@ -216,36 +216,34 @@ export const MarkerCluster = () => {
}
});
setCluster((prev) => {
return prev.map((c) => {
const aircraftPos = c.aircrafts.map((a) => [
a.location.lat,
a.location.lng,
]);
const missionPos = c.missions.map((m) => [
m.addressLat,
m.addressLng,
]);
const allPos = [...aircraftPos, ...missionPos];
const clusterWithAvgPos = newCluster.map((c) => {
const aircraftPos = c.aircrafts.map((a) => [
a.location.lat,
a.location.lng,
]);
const missionPos = c.missions.map((m) => [m.addressLat, m.addressLng]);
const allPos = [...aircraftPos, ...missionPos];
// Calculate the average position of all markers in the cluster
const avgLat =
allPos.reduce((sum, pos) => sum + pos[0]!, 0) / allPos.length;
const avgLng =
allPos.reduce((sum, pos) => sum + pos[1]!, 0) / allPos.length;
// Calculate the average position of all markers in the cluster
return {
...c,
lat: avgLat,
lng: avgLng,
};
});
const avgLat =
allPos.reduce((sum, pos) => sum + pos[0]!, 0) / allPos.length;
const avgLng =
allPos.reduce((sum, pos) => sum + pos[1]!, 0) / allPos.length;
console.log(allPos, { avgLat, avgLng });
return {
...c,
lat: avgLat,
lng: avgLng,
};
});
if (zoom >= 9) {
setCluster([]);
} else {
setCluster(newCluster);
setCluster(clusterWithAvgPos);
}
};
handleZoom();