Skip to content
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

[FE][Feat] 사용자 마커 및 패스 위로 올림, 방향 수정 #452

Merged
merged 2 commits into from
Dec 5, 2024
Merged

[FE][Feat] 사용자 마커 및 패스 위로 올림, 방향 수정 #452

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c97e7c2
[FE][Feat] 사용자 마커 및 패스 위로 올림, 방향 수정
leedongyull Dec 5, 2024
5f3cd66
Merge pull request #451 from boostcampwm-2024/fix/fe/channelName
leedongyull Dec 5, 2024
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
79 changes: 40 additions & 39 deletions frontend/src/hooks/useRedraw.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,45 @@ export const useRedrawCanvas = ({
clusteredMarkerSet.add(`${marker.lat.toFixed(6)}_${marker.lng.toFixed(6)}`),
);
});

const zoom = map.getZoom();

if (guests) {
guests.forEach(({ startPoint, endPoint, paths, markerStyle }) => {
const startLocationKey = `${startPoint.lat.toFixed(6)}_${startPoint.lng.toFixed(6)}`;
const endLocationKey = `${endPoint.lat.toFixed(6)}_${endPoint.lng.toFixed(6)}`;
if (!clusteredMarkerSet.has(startLocationKey)) {
const startLocation = latLngToCanvasPoint(startPoint);
drawMarker(
ctx,
startLocation,
startImageRef.current,
zoom,
0,
markerStyle.color,
MARKER_TYPE.START_MARKER,
);
}

if (!clusteredMarkerSet.has(endLocationKey)) {
const endLocation = latLngToCanvasPoint(endPoint);
drawMarker(
ctx,
endLocation,
endImageRef.current,
zoom,
0,
markerStyle.color,
MARKER_TYPE.END_MARKER,
);
}

// 경로는 두 포인트 중 하나라도 클러스터에 포함되지 않으면 그리기
if (!clusteredMarkerSet.has(startLocationKey) || !clusteredMarkerSet.has(endLocationKey)) {
drawPath(ctx, paths, markerStyle.color);
}
});
}

if (startMarker) {
const startPoint = latLngToCanvasPoint(startMarker);
const markerKey = `${startMarker.lat.toFixed(6)}_${startMarker.lng.toFixed(6)}`;
Expand Down Expand Up @@ -366,7 +403,7 @@ export const useRedrawCanvas = ({
const currentLocation = latLngToCanvasPoint({ lat, lng });
if (alpha) {
const normalizedAlpha = (alpha + 360) % 360;
const correctedAlpha = ((normalizedAlpha - 90 + 180) % 360) * (Math.PI / 180);
const correctedAlpha = ((90 - normalizedAlpha + 360) % 360) * (Math.PI / 180);
drawMarker(
ctx,
currentLocation,
Expand Down Expand Up @@ -396,7 +433,7 @@ export const useRedrawCanvas = ({
lng: location.lng ? location.lng : 0,
});
const normalizedAlpha = (location.alpha + 360) % 360;
const correctedAlpha = ((normalizedAlpha - 90 + 180) % 360) * (Math.PI / 180);
const correctedAlpha = ((90 - normalizedAlpha + 360) % 360) * (Math.PI / 180);

drawNeonCircleAndDirection(ctx, locationPoint, zoom, color);
drawMarker(
Expand All @@ -411,42 +448,6 @@ export const useRedrawCanvas = ({
});
}

if (guests) {
guests.forEach(({ startPoint, endPoint, paths, markerStyle }) => {
const startLocationKey = `${startPoint.lat.toFixed(6)}_${startPoint.lng.toFixed(6)}`;
const endLocationKey = `${endPoint.lat.toFixed(6)}_${endPoint.lng.toFixed(6)}`;
if (!clusteredMarkerSet.has(startLocationKey)) {
const startLocation = latLngToCanvasPoint(startPoint);
drawMarker(
ctx,
startLocation,
startImageRef.current,
zoom,
0,
markerStyle.color,
MARKER_TYPE.START_MARKER,
);
}

if (!clusteredMarkerSet.has(endLocationKey)) {
const endLocation = latLngToCanvasPoint(endPoint);
drawMarker(
ctx,
endLocation,
endImageRef.current,
zoom,
0,
markerStyle.color,
MARKER_TYPE.END_MARKER,
);
}

// 경로는 두 포인트 중 하나라도 클러스터에 포함되지 않으면 그리기
if (!clusteredMarkerSet.has(startLocationKey) || !clusteredMarkerSet.has(endLocationKey)) {
drawPath(ctx, paths, markerStyle.color);
}
});
}
if (clusters) {
clusters.forEach(cluster => {
drawCluster(ctx, cluster, startImageRef.current, zoom, cluster.color.color);
Expand Down
Loading