gc/wing-ops
8
0
포크 0
코드 이슈 풀 리퀘스트 Actions 위키 활동

release: 2026-04-20 (346�� Ŀ��) #197

병합
jhkang develop 에서 main 로 19 commits 를 머지했습니다 2026-04-20 16:50:25 +09:00
대화 0 커밋 19 파일 변경됨 34 +20 -18
3개의 변경된 파일과 20개의 추가작업 그리고 18개의 파일을 삭제
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c39594ca14 - Show all commits

4
frontend/src/components/common/map/BaseMap.tsx
파일 보기

@ -139,8 +139,8 @@ function MapOverlayControls({
return (
<>
{/* 우측 컨트롤 컬럼 */}
<div className="absolute top-[10px] right-[10px] z-10 flex flex-col gap-1">
{/* 좌측 컨트롤 컬럼 */}
<div className="absolute top-[10px] left-[10px] z-10 flex flex-col gap-1">
{/* 줌 */}
<button title="줌 인" onClick={() => map?.zoomIn()} className={btn}>
+

30
frontend/src/components/incidents/components/IncidentsView.tsx
파일 보기

@ -183,6 +183,7 @@ export function IncidentsView() {
// Analysis view mode
const [viewMode, setViewMode] = useState<ViewMode>('overlay');
const [analysisActive, setAnalysisActive] = useState(true);
const isOverlayMode = !analysisActive || viewMode === 'overlay';
// 분할 뷰에서 사용할 체크된 원본 아이템들 (우측 패널에서 주입)
const [checkedPredItems, setCheckedPredItems] = useState<PredictionAnalysis[]>([]);
@ -797,6 +798,7 @@ export function IncidentsView() {
<BaseMap
center={[35.0, 127.8]}
zoom={7}
showOverlays={isOverlayMode}
cursor={measureMode !== null || dischargeMode ? 'crosshair' : undefined}
onMapClick={(lon, lat) => {
if (dischargeMode) {
@ -845,7 +847,7 @@ export function IncidentsView() {
</BaseMap>
{/* 선박 검색 */}
{(allRealVessels.length > 0 || realVessels.length > 0) && !dischargeMode && measureMode === null && (
{isOverlayMode && (allRealVessels.length > 0 || realVessels.length > 0) && !dischargeMode && measureMode === null && (
<VesselSearchBar
vessels={allRealVessels.length > 0 ? allRealVessels : realVessels}
onFlyTo={(v) => {
@ -856,7 +858,7 @@ export function IncidentsView() {
)}
{/* 호버 툴팁 */}
{hoverInfo && (
{isOverlayMode && hoverInfo && (
<div
className="absolute z-[1000] pointer-events-none rounded-md"
style={{
@ -878,7 +880,7 @@ export function IncidentsView() {
)}
{/* 오염물 배출 규정 토글 */}
<button
{isOverlayMode && <button
onClick={() => {
setDischargeMode(!dischargeMode);
if (dischargeMode) setDischargeInfo(null);
@ -886,7 +888,7 @@ export function IncidentsView() {
className="absolute z-[500] cursor-pointer rounded-md text-caption font-bold font-korean"
style={{
top: 10,
right: 180,
right: 230,
padding: '6px 10px',
background: 'var(--bg-base)',
border: '1px solid var(--stroke-default)',
@ -896,10 +898,10 @@ export function IncidentsView() {
}}
>
배출규정 {dischargeMode ? 'ON' : 'OFF'}
</button>
</button>}
{/* 오염물 배출 규정 패널 */}
{dischargeMode && dischargeInfo && (
{isOverlayMode && dischargeMode && dischargeInfo && (
<DischargeZonePanel
lat={dischargeInfo.lat}
lon={dischargeInfo.lon}
@ -910,7 +912,7 @@ export function IncidentsView() {
)}
{/* 배출규정 모드 안내 */}
{dischargeMode && !dischargeInfo && (
{isOverlayMode && dischargeMode && !dischargeInfo && (
<div
className="absolute z-[500] rounded-md text-label-2 font-korean font-semibold"
style={{
@ -930,7 +932,7 @@ export function IncidentsView() {
)}
{/* AIS Live Badge */}
<div
{isOverlayMode && <div
className="absolute top-[10px] right-[10px] z-[500] rounded-md"
style={{
background: 'var(--bg-base)',
@ -956,11 +958,11 @@ export function IncidentsView() {
<div className="text-fg-sub">사고 {filteredIncidents.length}</div>
<div className="text-fg-sub">방제선 {vesselStatus?.bangjeCount ?? 0}</div>
</div>
</div>
</div>}
{/* Legend */}
<div
className="absolute bottom-[10px] left-[10px] z-[500] rounded-md flex flex-col gap-1.5"
{isOverlayMode && <div
className="absolute bottom-[10px] right-[10px] z-[500] rounded-md flex flex-col gap-1.5"
style={{
background: 'var(--bg-base)',
border: '1px solid var(--stroke-default)',
@ -998,10 +1000,10 @@ export function IncidentsView() {
</div>
))}
</div>
</div>
</div>}
{/* 선박 팝업 패널 */}
{vesselPopup && selectedVessel && !detailVessel && (
{isOverlayMode && vesselPopup && selectedVessel && !detailVessel && (
<VesselPopupPanel
vessel={selectedVessel}
onClose={() => {
@ -1015,7 +1017,7 @@ export function IncidentsView() {
}}
/>
)}
{detailVessel && (
{isOverlayMode && detailVessel && (
<VesselDetailModal vessel={detailVessel} onClose={() => setDetailVessel(null)} />
)}
</div>

4
frontend/src/components/weather/components/WeatherView.tsx
파일 보기

@ -324,7 +324,7 @@ export function WeatherView() {
</BaseMap>
{/* 레이어 컨트롤 */}
<div className="absolute top-4 left-4 bg-bg-surface border border-stroke rounded-md shadow-md z-10 px-2.5 py-1.5">
<div className="absolute top-4 right-4 bg-bg-surface border border-stroke rounded-md shadow-md z-10 px-2.5 py-1.5">
<div className="text-caption font-semibold text-fg mb-1.5 font-korean">기상 레이어</div>
<div className="flex flex-col gap-1">
<label className="flex items-center gap-1.5 cursor-pointer">
@ -385,7 +385,7 @@ export function WeatherView() {
</div>
{/* 범례 */}
<div className="absolute bottom-4 left-4 bg-bg-surface border border-stroke rounded-md shadow-md z-10 px-2.5 py-1.5 max-w-[180px]">
<div className="absolute bottom-4 right-4 bg-bg-surface border border-stroke rounded-md shadow-md z-10 px-2.5 py-1.5 max-w-[180px]">
<div className="text-caption text-fg mb-1.5 font-korean">기상 범례</div>
<div className="flex flex-col gap-1.5 text-[8px]">
{/* 바람 */}