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.

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

페이지 기능: 지도 페이지 마커 추가 #201

Merged
merged 5 commits into from
Feb 21, 2024
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
Binary file added public/assets/marker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 22 additions & 2 deletions src/app/map/page.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,39 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */

'use client';

import { useState } from 'react';

import classNames from 'classnames/bind';

import Markers from '@/components/map/markers/Markers';
import KakaoMap from '@components/map/kakao-map/KakaoMap';
import useMarkers from '@remote/queries/map/useMarkers';
import BottomNav from '@shared/bottom-nav/BottomNav';
import KakaoMap from '@shared/map/KakaoMap';
import SearchBar from '@shared/search-bar/SearchBar';

import styles from './page.module.scss';

const cx = classNames.bind(styles);
function MapPage() {
// eslint-disable-next-line @typescript-eslint/naming-convention
const { data: carWashMarkers } = useMarkers({
minX: 36.12,
maxX: 36.88,
minY: 127.1,
maxY: 127.8,
level: 2,
});
const [map, setMap] = useState<any>(null);

return (
<div className={cx('layout')}>
<div className={cx('searchWrapper')}>
<SearchBar isShadow />
</div>
<KakaoMap />
<KakaoMap map={map} setMap={setMap} />
<Markers map={map} carwashs={carWashMarkers!} />
<BottomNav />
</div>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.button {
position: absolute;
z-index: var(--header-zindex);
right: 7%;
bottom: 13%;
box-sizing: border-box;
margin-left: 24px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

'use client';

import { useState } from 'react';
import { SetStateAction, useState } from 'react';

import Script from 'next/script';

Expand All @@ -25,10 +25,12 @@ interface ILocation {
lng: number;
}

function KakaoMap() {
// eslint-disable-next-line @typescript-eslint/naming-convention
const [map, setMap] = useState<any>(null);
interface IKakaoProps {
map: any
setMap: React.Dispatch<SetStateAction<any>>
}

function KakaoMap({ map, setMap }: IKakaoProps) {
const loadKakaoMap = () => {
window.kakao.maps.load(() => {
const mapContainer = document.getElementById('map');
Expand Down
67 changes: 67 additions & 0 deletions src/components/map/markers/Markers.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/* eslint-disable array-callback-return */
/* eslint-disable max-len */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-explicit-any */

import { useCallback, useEffect } from 'react';

import { MarkersType } from '@remote/api/types/map';

interface MarkerProps {
map: any
carwashs: MarkersType
}

declare global {
interface Window {
kakao: any
}
}

function Markers({ map, carwashs }: MarkerProps) {
const loadKakoMarkers = useCallback(() => {
if (map) {
// 식당 데이터 마커 띄우기
carwashs?.value.map((carwash) => {
const imageSrc = '/assets/marker.png';
const imageSize = new window.kakao.maps.Size(40, 40); // 마커이미지의 크기입니다
const imageOption = { offset: new window.kakao.maps.Point(27, 69) }; // 마커이미지의 옵션입니다. 마커의 좌표와 일치시킬 이미지 안에서의 좌표를 설정합니다.

// 마커의 이미지정보를 가지고 있는 마커이미지를 생성합니다
const markerImage = new window.kakao.maps.MarkerImage(
imageSrc,
imageSize,
imageOption,
);

// 마커가 표시될 위치입니다
const markerPosition = new window.kakao.maps.LatLng(
carwash.latitude,
carwash.longitude,
);

// 마커를 생성합니다
const marker = new window.kakao.maps.Marker({
position: markerPosition,
image: markerImage, // 마커이미지 설정
});

// 마커가 지도 위에 표시되도록 설정합니다
marker.setMap(map);
});
}
}, [map, carwashs]);

useEffect(() => {
loadKakoMarkers();
}, [loadKakoMarkers, map]);

return (
// eslint-disable-next-line react/jsx-no-useless-fragment
<></>
);
}

export default Markers;
12 changes: 12 additions & 0 deletions src/remote/api/requests/map/map.get.api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { IMarkersParameter, MarkersType } from '../../types/map';
import { getRequest } from '../requests.api';

// 세차장 위치 마커

export const getMarkers = async ({
minX, maxX, minY, maxY, level,
}: IMarkersParameter) => {
const response = await getRequest<MarkersType>(`/washzones?minX=${minX}&maxX=${maxX}&minY=${minY}&maxY=${maxY}&&level=${level}`);

return response;
};
20 changes: 20 additions & 0 deletions src/remote/api/types/map.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { ICommon } from './common';

export interface IMarkersParameter {
minX: number
maxX: number
minY: number
maxY: number
level: number
}

export interface IMarkers {
name: string
address: string
latitude: number
longitude: number
type: '실내' | '개러지' | null
remarks: null
}

export type MarkersType = ICommon<IMarkers[]>;
19 changes: 19 additions & 0 deletions src/remote/queries/map/useMarkers.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { useQuery } from '@tanstack/react-query';

import { getMarkers } from '@/remote/api/requests/map/map.get.api';
import { IMarkersParameter, MarkersType } from '@/remote/api/types/map';

function useMarkers({
minX, maxX, minY, maxY, level,
}: IMarkersParameter) {
return useQuery<MarkersType>({
queryKey: ['MarkerType', minX, minY, maxX, maxY, level],
queryFn: () => {
return getMarkers({
minX, maxX, minY, maxY, level,
});
},
});
}

export default useMarkers;
Loading