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

Fixed marker

Browse Source
This commit is contained in:
PxlLoewe
2025-04-29 19:38:44 -07:00
parent 53e837cbc8
commit 8d41bdc938
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,7 @@ const AircraftMarker = ({ aircraft }: { aircraft: Aircraft }) => {
>("topleft");
const handleConflict = useCallback(() => {
const newAnchor = calculateAnchor(aircraft.id, "marker");
const newAnchor = calculateAnchor(`aircraft-${aircraft.id}`, "marker");
setAnchor(newAnchor);
}, [aircraft.id]);
@@ -296,7 +296,7 @@ const AircraftMarker = ({ aircraft }: { aircraft: Aircraft }) => {
anchor: "topleft" | "topright" | "bottomleft" | "bottomright",
) => {
return `<div
id="marker-${aircraft.id}"
id="marker-aircraft-${aircraft.id}"
class="${cn(
"relative w-auto transform inline-flex items-center gap-2 px-2 z-100",
anchor.includes("right") && "-translate-x-full",
@@ -332,7 +332,7 @@ const AircraftMarker = ({ aircraft }: { aircraft: Aircraft }) => {
data-id="${aircraft.id}"
data-anchor-lat="${aircraft.location.lat}"
data-anchor-lng="${aircraft.location.lng}"
id="marker-domain-${aircraft.id}"
id="marker-domain-aircraft-${aircraft.id}"
class="${cn(
"map-collision absolute w-[200%] h-[200%] top-0 left-0 transform pointer-events-none",
anchor.includes("left") && "-translate-x-1/2",

11
apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx
View File

@@ -258,7 +258,10 @@ const MissionMarker = ({ mission }: { mission: Mission }) => {
>("topleft");
const handleConflict = useCallback(() => {
const newAnchor = calculateAnchor(mission.id.toString(), "marker");
const newAnchor = calculateAnchor(
`mission-${mission.id.toString()}`,
"marker",
);
setAnchor(newAnchor);
}, [mission.id]);
@@ -288,7 +291,7 @@ const MissionMarker = ({ mission }: { mission: Mission }) => {
anchor: "topleft" | "topright" | "bottomleft" | "bottomright",
) => {
return `<div
id="marker-${mission.id}"
id="marker-mission-${mission.id}"
class="${cn(
"relative w-auto transform inline-flex items-center gap-2 px-2 z-100",
anchor.includes("right") && "-translate-x-full",
@@ -318,7 +321,7 @@ const MissionMarker = ({ mission }: { mission: Mission }) => {
data-anchor-lat="${mission.addressLat}"
data-anchor-lng="${mission.addressLng}"
data-id="${mission.id}"
id="marker-domain-${mission.id}"
id="marker-domain-mission-${mission.id}"
class="${cn(
"map-collision absolute w-[200%] h-[200%] top-0 left-0 transform pointer-events-none",
anchor.includes("left") && "-translate-x-1/2",
@@ -345,7 +348,7 @@ const MissionMarker = ({ mission }: { mission: Mission }) => {
options={{
ignoreCluster: true,
}}
id={`cluster-${mission.id.toString()}`}
id={`mission-${mission.id.toString()}`}
ref={popupRef}
position={[mission.addressLat, mission.addressLng]}
autoClose={false}