Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion src/features/map/collaboration/CollabPinsOverlay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
import { useEffect, useRef } from 'react';
import styled from '@emotion/styled';
import { HugeiconsIcon } from '@hugeicons/react';
import { Location01Icon, Cancel01Icon, UserMultiple02Icon } from '@hugeicons/core-free-icons';
import { Location01Icon, Cancel01Icon, UserMultiple02Icon, Login01Icon } from '@hugeicons/core-free-icons';
import { toast } from 'sonner';
import { useSelf } from '@liveblocks/react';
import { useAuth } from '@/features/auth';
import { useMapStore } from '../hooks/useMapStore';
import { useCollabPins } from './useCollabPins';
import { ringShadow, palette } from '@/design-system/tokens';
Expand Down Expand Up @@ -152,6 +153,7 @@ export function CollabPinsOverlay() {
const viewportItems = useMapStore((s) => s.viewportItems);
const detailId = useMapStore((s) => s.detailId);
const me = useSelf();
const { isLoggedIn, loginWithKakao } = useAuth();
const { pins, addPin, removePin } = useCollabPins();

// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand Down Expand Up @@ -280,6 +282,15 @@ export function CollabPinsOverlay() {

function handleAddPin() {
if (!selectedPlace) return;
if (!isLoggedIn) {
toast('둜그인이 ν•„μš”ν•΄μš”', {
icon: <HugeiconsIcon icon={Login01Icon} size={16} strokeWidth={1.8} />,
description: 'ν•€ κ³΅μœ λŠ” 둜그인 ν›„ μ‚¬μš©ν•  수 μžˆμ–΄μš”.',
duration: 5000,
action: { label: 'λ‘œκ·ΈμΈν•˜κΈ°', onClick: loginWithKakao },
});
return;
}
const pin: CollabPin = {
placeId: selectedPlace.id,
placeName: selectedPlace.name,
Expand Down
4 changes: 4 additions & 0 deletions src/features/map/components/InfoPlaceList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,14 @@ export default function InfoPlaceList() {
const requestSnapshotId = store.listSnapshotId;
store.setIsListLoading(true);

const requestUserLocation = store.userLocation;
listInfoPlaces({
category: requestCategory,
regionCode: requestRegionCode,
cursor,
...(requestUserLocation
? { sort: 'DISTANCE', lat: requestUserLocation.lat, lng: requestUserLocation.lng }
: {}),
signal: ctrl.signal,
})
.then((page) => {
Expand Down
4 changes: 3 additions & 1 deletion src/features/map/hooks/useInfoMapData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export function useInfoMapData(enabled = true) {
const mode = useMapStore((s) => s.mode);
const infoCategory = useMapStore((s) => s.infoCategory);
const infoRegionCode = useMapStore((s) => s.infoRegionCode);
const userLocation = useMapStore((s) => s.userLocation);
const committedViewport = useMapStore((s) => s.committedViewport);
const infoListReloadNonce = useMapStore((s) => s.infoListReloadNonce);
const infoViewportReloadNonce = useMapStore((s) => s.infoViewportReloadNonce);
Expand Down Expand Up @@ -98,6 +99,7 @@ export function useInfoMapData(enabled = true) {
listInfoPlaces({
category: infoCategory,
regionCode: infoRegionCode,
...(userLocation ? { sort: 'DISTANCE', lat: userLocation.lat, lng: userLocation.lng } : {}),
signal: ctrl.signal,
timeoutMs,
})
Expand Down Expand Up @@ -141,7 +143,7 @@ export function useInfoMapData(enabled = true) {
});

return () => ctrl.abort();
}, [enabled, mode, infoCategory, infoRegionCode, infoListReloadNonce]);
}, [enabled, mode, infoCategory, infoRegionCode, userLocation?.lat, userLocation?.lng, infoListReloadNonce]);

// ── Viewport ───────────────────────────────────────────────────────────────
useEffect(() => {
Expand Down
8 changes: 8 additions & 0 deletions src/features/map/services/infoMap.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export interface ListInfoPlacesInput {
regionCode?: string | null;
cursor?: string | null;
limit?: number;
sort?: 'REGION_NAME' | 'NAME' | 'DISTANCE';
lat?: number | null;
lng?: number | null;
signal?: AbortSignal;
timeoutMs?: number;
}
Expand Down Expand Up @@ -58,6 +61,11 @@ export async function listInfoPlaces(input: ListInfoPlacesInput): Promise<InfoPl
};
if (input.regionCode) params.regionCode = input.regionCode;
if (input.cursor) params.cursor = input.cursor;
if (input.sort === 'DISTANCE' && input.lat != null && input.lng != null) {
params.sort = 'DISTANCE';
params.lat = String(input.lat);
params.lng = String(input.lng);
}

const page = await apiRequest<InfoPlacePage>('/map/info/places', {
method: 'GET',
Expand Down
Loading